diff options
| author | Chris McDonough <chrism@plope.com> | 2012-01-04 18:57:18 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-01-04 18:57:18 -0500 |
| commit | a21278872884809cfec7d5de8c64518c404f2b02 (patch) | |
| tree | bc02a2278d168f1654c0b61605d656dd3071adcd | |
| parent | ef4f39d31a74b875347fd7bd4fbce760915f05ce (diff) | |
| parent | 58d0c2d6de72dddda4dd85c7ab493cfb6e621e90 (diff) | |
| download | pyramid-a21278872884809cfec7d5de8c64518c404f2b02.tar.gz pyramid-a21278872884809cfec7d5de8c64518c404f2b02.tar.bz2 pyramid-a21278872884809cfec7d5de8c64518c404f2b02.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | docs/tutorials/wiki2/basiclayout.rst | 2 | ||||
| -rw-r--r-- | pyramid/scaffolds/alchemy/setup.py_tmpl | 3 |
2 files changed, 1 insertions, 4 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/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}}', |