Update authentication src files

11 files changed, 24 insertions, 14 deletions

diff --git a/docs/tutorials/wiki2/src/authentication/development.ini b/docs/tutorials/wiki2/src/authentication/development.ini
index 8fbb5fd38..7fda4cb7b 100644
--- a/docs/tutorials/wiki2/src/authentication/development.ini
+++ b/docs/tutorials/wiki2/src/authentication/development.ini
@@ -47,7 +47,7 @@ listen = localhost:6543
 ###
 
 [loggers]
-keys = root, tutorial, sqlalchemy
+keys = root, tutorial, sqlalchemy, alembic
 
 [handlers]
 keys = console
@@ -72,6 +72,11 @@ qualname = sqlalchemy.engine
 # "level = DEBUG" logs SQL queries and results.
 # "level = WARN" logs neither.  (Recommended for production systems.)
 
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
diff --git a/docs/tutorials/wiki2/src/authentication/production.ini b/docs/tutorials/wiki2/src/authentication/production.ini
index 9fef64f83..8e878a707 100644
--- a/docs/tutorials/wiki2/src/authentication/production.ini
+++ b/docs/tutorials/wiki2/src/authentication/production.ini
@@ -41,7 +41,7 @@ listen = *:6543
 ###
 
 [loggers]
-keys = root, tutorial, sqlalchemy
+keys = root, tutorial, sqlalchemy, alembic
 
 [handlers]
 keys = console
@@ -66,6 +66,11 @@ qualname = sqlalchemy.engine
 # "level = DEBUG" logs SQL queries and results.
 # "level = WARN" logs neither.  (Recommended for production systems.)
 
+[logger_alembic]
+level = WARN
+handlers =
+qualname = alembic
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
diff --git a/docs/tutorials/wiki2/src/authentication/setup.py b/docs/tutorials/wiki2/src/authentication/setup.py
index f71998afc..a99793c15 100644
--- a/docs/tutorials/wiki2/src/authentication/setup.py
+++ b/docs/tutorials/wiki2/src/authentication/setup.py
@@ -13,7 +13,7 @@ requires = [
     'bcrypt',
     'docutils',
     'plaster_pastedeploy',
-    'pyramid >= 1.9',
+    'pyramid',
     'pyramid_debugtoolbar',
     'pyramid_jinja2',
     'pyramid_retry',
@@ -57,7 +57,7 @@ setup(
             'main = tutorial:main',
         ],
         'console_scripts': [
-            'initialize_tutorial_db = tutorial.scripts.initialize_db:main',
+            'initialize_tutorial_db=tutorial.scripts.initialize_db:main',
         ],
     },
 )
diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/__init__.py b/docs/tutorials/wiki2/src/authentication/tutorial/__init__.py
index 5d4bae3d7..ce2e9f12a 100644
--- a/docs/tutorials/wiki2/src/authentication/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/authentication/tutorial/__init__.py
@@ -5,8 +5,8 @@ def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
     with Configurator(settings=settings) as config:
-        config.include('pyramid_jinja2')
         config.include('.models')
+        config.include('pyramid_jinja2')
         config.include('.routes')
         config.include('.security')
         config.scan()
diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/alembic/script.py.mako b/docs/tutorials/wiki2/src/authentication/tutorial/alembic/script.py.mako
index 2c0156303..535780d13 100644
--- a/docs/tutorials/wiki2/src/authentication/tutorial/alembic/script.py.mako
+++ b/docs/tutorials/wiki2/src/authentication/tutorial/alembic/script.py.mako
@@ -15,10 +15,8 @@ down_revision = ${repr(down_revision)}
 branch_labels = ${repr(branch_labels)}
 depends_on = ${repr(depends_on)}
 
-
 def upgrade():
     ${upgrades if upgrades else "pass"}
 
-
 def downgrade():
     ${downgrades if downgrades else "pass"}
diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/alembic/versions/README.txt b/docs/tutorials/wiki2/src/authentication/tutorial/alembic/versions/README.txt
index 09ed32c8d..b0d704d6a 100644
--- a/docs/tutorials/wiki2/src/authentication/tutorial/alembic/versions/README.txt
+++ b/docs/tutorials/wiki2/src/authentication/tutorial/alembic/versions/README.txt
@@ -1 +1 @@
-Placeholder for alembic versions
\ No newline at end of file
+Placeholder for alembic versions
diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/pshell.py b/docs/tutorials/wiki2/src/authentication/tutorial/pshell.py
index 108c04d5e..b0847ee90 100644
--- a/docs/tutorials/wiki2/src/authentication/tutorial/pshell.py
+++ b/docs/tutorials/wiki2/src/authentication/tutorial/pshell.py
@@ -1,5 +1,6 @@
 from . import models
 
+
 def setup(env):
     request = env['request']
 
diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/templates/404.jinja2 b/docs/tutorials/wiki2/src/authentication/tutorial/templates/404.jinja2
index 37b0a16b6..aaf12413f 100644
--- a/docs/tutorials/wiki2/src/authentication/tutorial/templates/404.jinja2
+++ b/docs/tutorials/wiki2/src/authentication/tutorial/templates/404.jinja2
@@ -2,7 +2,7 @@
 
 {% block content %}
 <div class="content">
-  <h1><span class="font-semi-bold">Pyramid tutorial wiki</span> <span class="smaller">(based on TurboGears 20-Minute Wiki)</span></h1>
+  <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">Starter project</span></h1>
   <p class="lead"><span class="font-semi-bold">404</span> Page Not Found</p>
 </div>
 {% endblock content %}
diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/tests.py b/docs/tutorials/wiki2/src/authentication/tutorial/tests.py
index ce650ca7c..47990669e 100644
--- a/docs/tutorials/wiki2/src/authentication/tutorial/tests.py
+++ b/docs/tutorials/wiki2/src/authentication/tutorial/tests.py
@@ -1,8 +1,9 @@
 import unittest
-import transaction
 
 from pyramid import testing
 
+import transaction
+
 
 def dummy_request(dbsession):
     return testing.DummyRequest(dbsession=dbsession)
diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/views/default.py b/docs/tutorials/wiki2/src/authentication/tutorial/views/default.py
index 2f0210255..d1c429950 100644
--- a/docs/tutorials/wiki2/src/authentication/tutorial/views/default.py
+++ b/docs/tutorials/wiki2/src/authentication/tutorial/views/default.py
@@ -20,7 +20,7 @@ def view_wiki(request):
     next_url = request.route_url('view_page', pagename='FrontPage')
     return HTTPFound(location=next_url)
 
-@view_config(route_name='view_page', renderer='../templates/view.jinja2')
+@view_config(route_name='view_page', renderer='tutorial:templates/view.jinja2')
 def view_page(request):
     pagename = request.matchdict['pagename']
     page = request.dbsession.query(models.Page).filter_by(name=pagename).first()
@@ -42,7 +42,7 @@ def view_page(request):
     edit_url = request.route_url('edit_page', pagename=page.name)
     return dict(page=page, content=content, edit_url=edit_url)
 
-@view_config(route_name='edit_page', renderer='../templates/edit.jinja2')
+@view_config(route_name='edit_page', renderer='tutorial:templates/edit.jinja2')
 def edit_page(request):
     pagename = request.matchdict['pagename']
     page = request.dbsession.query(models.Page).filter_by(name=pagename).one()
@@ -59,7 +59,7 @@ def edit_page(request):
         save_url=request.route_url('edit_page', pagename=page.name),
         )
 
-@view_config(route_name='add_page', renderer='../templates/edit.jinja2')
+@view_config(route_name='add_page', renderer='tutorial:templates/edit.jinja2')
 def add_page(request):
     user = request.user
     if user is None or user.role not in ('editor', 'basic'):
diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/views/notfound.py b/docs/tutorials/wiki2/src/authentication/tutorial/views/notfound.py
index 69d6e2804..740712d9f 100644
--- a/docs/tutorials/wiki2/src/authentication/tutorial/views/notfound.py
+++ b/docs/tutorials/wiki2/src/authentication/tutorial/views/notfound.py
@@ -1,7 +1,7 @@
 from pyramid.view import notfound_view_config
 
 
-@notfound_view_config(renderer='../templates/404.jinja2')
+@notfound_view_config(renderer='tutorial:templates/404.jinja2')
 def notfound_view(request):
     request.response.status = 404
     return {}