summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/authorization
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-03-14 15:05:04 -0700
committerChris McDonough <chrism@plope.com>2012-03-14 15:05:04 -0700
commit03f59aca72636b637ddaeb958e6a6db0dc3998c1 (patch)
tree5c1be20a112ddf0a94dd014b3c31ee59be5e61f6 /docs/tutorials/wiki2/src/authorization
parent4d22adc0ea7a53158c1e7e5489cac8d63db80a06 (diff)
parent8fac09d9eff38b74db4afe5c007cdc8f9f9b8c31 (diff)
downloadpyramid-03f59aca72636b637ddaeb958e6a6db0dc3998c1.tar.gz
pyramid-03f59aca72636b637ddaeb958e6a6db0dc3998c1.tar.bz2
pyramid-03f59aca72636b637ddaeb958e6a6db0dc3998c1.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki2/src/authorization')
-rw-r--r--docs/tutorials/wiki2/src/authorization/setup.py2
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/scripts/initializedb.py (renamed from docs/tutorials/wiki2/src/authorization/tutorial/scripts/populate.py)2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/src/authorization/setup.py b/docs/tutorials/wiki2/src/authorization/setup.py
index 964e39010..2fd051927 100644
--- a/docs/tutorials/wiki2/src/authorization/setup.py
+++ b/docs/tutorials/wiki2/src/authorization/setup.py
@@ -40,6 +40,6 @@ setup(name='tutorial',
[paste.app_factory]
main = tutorial:main
[console_scripts]
- populate_tutorial = tutorial.scripts.populate:main
+ initialize_tutorial_db = tutorial.scripts.initializedb:main
""",
)
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/scripts/populate.py b/docs/tutorials/wiki2/src/authorization/tutorial/scripts/initializedb.py
index 981adff38..03188e8ad 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/scripts/populate.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/scripts/initializedb.py
@@ -21,7 +21,7 @@ def usage(argv):
'(example: "%s development.ini")' % (cmd, cmd))
sys.exit(1)
-def main(argv=sys.argv, settings=None):
+def main(argv=sys.argv):
if len(argv) != 2:
usage(argv)
config_uri = argv[1]