From 2e2a9ad30f228c93956067b3d0a1b2b43042aca6 Mon Sep 17 00:00:00 2001 From: Bruno Binet Date: Wed, 4 Jan 2012 18:02:27 +0100 Subject: remove dependencies related to python 2.5 in alchemy scaffold now that Pyramid requires python >= 2.6, these 2.5 dependencies are useless --- pyramid/scaffolds/alchemy/setup.py_tmpl | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyramid/scaffolds/alchemy/setup.py_tmpl b/pyramid/scaffolds/alchemy/setup.py_tmpl index a2766547d..d0a95ea4c 100644 --- a/pyramid/scaffolds/alchemy/setup.py_tmpl +++ b/pyramid/scaffolds/alchemy/setup.py_tmpl @@ -16,9 +16,6 @@ requires = [ 'zope.sqlalchemy', ] -if sys.version_info[:3] < (2,5,0): - requires.append('pysqlite') - setup(name='{{project}}', version='0.0', description='{{project}}', -- cgit v1.2.3 From 8794d59fea64095bdaf15968051c6d62efca79dc Mon Sep 17 00:00:00 2001 From: Mathieu Larose Date: Wed, 4 Jan 2012 15:03:58 -0500 Subject: Removed repetition of the word "the" in the Wiki Tutorial. --- docs/tutorials/wiki2/basiclayout.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- cgit v1.2.3