summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/basiclayout/setup.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-11-20 22:47:52 -0500
committerChris McDonough <chrism@plope.com>2012-11-20 22:47:52 -0500
commitc6a575052ae14e515c288e77a452440030c1cdcd (patch)
tree7bf6dc6f2b929e5a206aae6d751b0cda5d96aefd /docs/tutorials/wiki2/src/basiclayout/setup.py
parent8f4fcc47c9405f20cfed3a40931f12534b3b7193 (diff)
parentb5e4443dd28f3d4ed6e767e06d658838575d159e (diff)
downloadpyramid-c6a575052ae14e515c288e77a452440030c1cdcd.tar.gz
pyramid-c6a575052ae14e515c288e77a452440030c1cdcd.tar.bz2
pyramid-c6a575052ae14e515c288e77a452440030c1cdcd.zip
Merge branch 'master' into sontek-fix_commands
Diffstat (limited to 'docs/tutorials/wiki2/src/basiclayout/setup.py')
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/setup.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py
index 050de7299..1a1ad78aa 100644
--- a/docs/tutorials/wiki2/src/basiclayout/setup.py
+++ b/docs/tutorials/wiki2/src/basiclayout/setup.py
@@ -22,7 +22,7 @@ setup(name='tutorial',
long_description=README + '\n\n' + CHANGES,
classifiers=[
"Programming Language :: Python",
- "Framework :: Pylons",
+ "Framework :: Pyramid",
"Topic :: Internet :: WWW/HTTP",
"Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
],
@@ -34,8 +34,8 @@ setup(name='tutorial',
include_package_data=True,
zip_safe=False,
test_suite='tutorial',
- install_requires = requires,
- entry_points = """\
+ install_requires=requires,
+ entry_points="""\
[paste.app_factory]
main = tutorial:main
[console_scripts]