summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst2
-rw-r--r--docs/tutorials/wiki2/src/authorization/setup.py4
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/setup.py4
-rw-r--r--docs/tutorials/wiki2/src/models/setup.py4
-rw-r--r--docs/tutorials/wiki2/src/tests/setup.py4
-rw-r--r--docs/tutorials/wiki2/src/views/setup.py4
-rw-r--r--docs/tutorials/wiki2/tests.rst2
7 files changed, 2 insertions, 22 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index 77658970d..e4200ae0f 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -145,7 +145,7 @@ package.
As the result of this view configuration, when the pattern associated with
the view named ``home`` is matched during a request, the function named
-``my_view`` will be executed. The the function named ``my_view`` returns a
+``my_view`` will be executed. The function named ``my_view`` returns a
dictionary; the renderer will use the ``templates/mytemplate.pt`` template to
create a response based on the values in the dictionary.
diff --git a/docs/tutorials/wiki2/src/authorization/setup.py b/docs/tutorials/wiki2/src/authorization/setup.py
index 7f1ae10b1..964e39010 100644
--- a/docs/tutorials/wiki2/src/authorization/setup.py
+++ b/docs/tutorials/wiki2/src/authorization/setup.py
@@ -1,5 +1,4 @@
import os
-import sys
from setuptools import setup, find_packages
@@ -18,9 +17,6 @@ requires = [
'waitress',
]
-if sys.version_info[:3] < (2,5,0):
- requires.append('pysqlite')
-
setup(name='tutorial',
version='0.0',
description='tutorial',
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py
index 44796d4ad..fae1c25a8 100644
--- a/docs/tutorials/wiki2/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki2/src/basiclayout/setup.py
@@ -1,5 +1,4 @@
import os
-import sys
from setuptools import setup, find_packages
@@ -17,9 +16,6 @@ requires = [
'waitress',
]
-if sys.version_info[:3] < (2,5,0):
- requires.append('pysqlite')
-
setup(name='tutorial',
version='0.0',
description='tutorial',
diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py
index 44796d4ad..fae1c25a8 100644
--- a/docs/tutorials/wiki2/src/models/setup.py
+++ b/docs/tutorials/wiki2/src/models/setup.py
@@ -1,5 +1,4 @@
import os
-import sys
from setuptools import setup, find_packages
@@ -17,9 +16,6 @@ requires = [
'waitress',
]
-if sys.version_info[:3] < (2,5,0):
- requires.append('pysqlite')
-
setup(name='tutorial',
version='0.0',
description='tutorial',
diff --git a/docs/tutorials/wiki2/src/tests/setup.py b/docs/tutorials/wiki2/src/tests/setup.py
index d8be7539b..d05495fbd 100644
--- a/docs/tutorials/wiki2/src/tests/setup.py
+++ b/docs/tutorials/wiki2/src/tests/setup.py
@@ -1,5 +1,4 @@
import os
-import sys
from setuptools import setup, find_packages
@@ -19,9 +18,6 @@ requires = [
'WebTest', # add this
]
-if sys.version_info[:3] < (2,5,0):
- requires.append('pysqlite')
-
setup(name='tutorial',
version='0.0',
description='tutorial',
diff --git a/docs/tutorials/wiki2/src/views/setup.py b/docs/tutorials/wiki2/src/views/setup.py
index 05c7be2d7..834280118 100644
--- a/docs/tutorials/wiki2/src/views/setup.py
+++ b/docs/tutorials/wiki2/src/views/setup.py
@@ -1,5 +1,4 @@
import os
-import sys
from setuptools import setup, find_packages
@@ -18,9 +17,6 @@ requires = [
'docutils',
]
-if sys.version_info[:3] < (2,5,0):
- requires.append('pysqlite')
-
setup(name='tutorial',
version='0.0',
description='tutorial',
diff --git a/docs/tutorials/wiki2/tests.rst b/docs/tutorials/wiki2/tests.rst
index 25cf2c25e..92544404c 100644
--- a/docs/tutorials/wiki2/tests.rst
+++ b/docs/tutorials/wiki2/tests.rst
@@ -55,7 +55,7 @@ Change the ``requires`` list in ``setup.py`` to include ``WebTest``.
.. literalinclude:: src/tests/setup.py
:linenos:
:language: python
- :lines: 10-19
+ :lines: 9-20
After we've added a dependency on WebTest in ``setup.py``, we need to rerun
``setup.py develop`` to get WebTest installed into our virtualenv. Assuming