make scaffolds pep8 compliant

Conflicts:
	pyramid/scaffolds/alchemy/+package+/views.py_tmpl
	pyramid/scaffolds/alchemy/setup.py_tmpl

Solved the two conflicts

15 files changed, 27 insertions, 17 deletions

diff --git a/pyramid/scaffolds/alchemy/+package+/__init__.py b/pyramid/scaffolds/alchemy/+package+/__init__.py
index e39f619ed..aac7c5e69 100644
--- a/pyramid/scaffolds/alchemy/+package+/__init__.py
+++ b/pyramid/scaffolds/alchemy/+package+/__init__.py
@@ -6,6 +6,7 @@ from .models import (
     Base,
     )
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
@@ -17,4 +18,3 @@ def main(global_config, **settings):
     config.add_route('home', '/')
     config.scan()
     return config.make_wsgi_app()
-
diff --git a/pyramid/scaffolds/alchemy/+package+/models.py b/pyramid/scaffolds/alchemy/+package+/models.py
index b6ac15429..aeeb9df64 100644
--- a/pyramid/scaffolds/alchemy/+package+/models.py
+++ b/pyramid/scaffolds/alchemy/+package+/models.py
@@ -16,6 +16,7 @@ from zope.sqlalchemy import ZopeTransactionExtension
 DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
 Base = declarative_base()
 
+
 class MyModel(Base):
     __tablename__ = 'models'
     id = Column(Integer, primary_key=True)
@@ -25,4 +26,3 @@ class MyModel(Base):
     def __init__(self, name, value):
         self.name = name
         self.value = value
-
diff --git a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
index 0e828465f..66feb3008 100644
--- a/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
+++ b/pyramid/scaffolds/alchemy/+package+/scripts/initializedb.py
@@ -15,12 +15,14 @@ from ..models import (
     Base,
     )
 
+
 def usage(argv):
     cmd = os.path.basename(argv[0])
     print('usage: %s <config_uri>\n'
-          '(example: "%s development.ini")' % (cmd, cmd)) 
+          '(example: "%s development.ini")' % (cmd, cmd))
     sys.exit(1)
 
+
 def main(argv=sys.argv):
     if len(argv) != 2:
         usage(argv)
diff --git a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
index 729b337cb..a26cd9eeb 100644
--- a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
@@ -5,6 +5,7 @@ from pyramid import testing
 
 from .models import DBSession
 
+
 class TestMyView(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
diff --git a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
index 9ecda9110..be0b45b0d 100644
--- a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
@@ -8,13 +8,14 @@ from .models import (
     MyModel,
     )
 
+
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
     try:
-        one = DBSession.query(MyModel).filter(MyModel.name=='one').first()
+        one = DBSession.query(MyModel).filter(MyModel.name == 'one').first()
     except DBAPIError:
         return Response(conn_err_msg, content_type='text/plain', status_int=500)
-    return {'one':one, 'project':'{{project}}'}
+    return {'one': one, 'project': '{{project}}'}
 
 conn_err_msg = """\
 Pyramid is having a problem using your SQL database.  The problem
diff --git a/pyramid/scaffolds/alchemy/setup.py_tmpl b/pyramid/scaffolds/alchemy/setup.py_tmpl
index 2d8ed028f..b8c4c6ef1 100644
--- a/pyramid/scaffolds/alchemy/setup.py_tmpl
+++ b/pyramid/scaffolds/alchemy/setup.py_tmpl
@@ -19,7 +19,7 @@ requires = [
 setup(name='{{project}}',
       version='0.0',
       description='{{project}}',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -42,4 +42,3 @@ setup(name='{{project}}',
       initialize_{{project}}_db = {{package}}.scripts.initializedb:main
       """,
       )
-
diff --git a/pyramid/scaffolds/starter/+package+/__init__.py b/pyramid/scaffolds/starter/+package+/__init__.py
index 31b02cf02..6c512f52f 100644
--- a/pyramid/scaffolds/starter/+package+/__init__.py
+++ b/pyramid/scaffolds/starter/+package+/__init__.py
@@ -1,5 +1,6 @@
 from pyramid.config import Configurator
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
diff --git a/pyramid/scaffolds/starter/+package+/tests.py_tmpl b/pyramid/scaffolds/starter/+package+/tests.py_tmpl
index 401260efb..94912a850 100644
--- a/pyramid/scaffolds/starter/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/starter/+package+/tests.py_tmpl
@@ -2,6 +2,7 @@ import unittest
 
 from pyramid import testing
 
+
 class ViewTests(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
diff --git a/pyramid/scaffolds/starter/+package+/views.py_tmpl b/pyramid/scaffolds/starter/+package+/views.py_tmpl
index 7a0d2f386..ad9af7292 100644
--- a/pyramid/scaffolds/starter/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/starter/+package+/views.py_tmpl
@@ -1,5 +1,6 @@
 from pyramid.view import view_config
 
+
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
-    return {'project':'{{project}}'}
+    return {'project': '{{project}}'}
diff --git a/pyramid/scaffolds/starter/setup.py_tmpl b/pyramid/scaffolds/starter/setup.py_tmpl
index 58c0a79fc..db00ed2e6 100644
--- a/pyramid/scaffolds/starter/setup.py_tmpl
+++ b/pyramid/scaffolds/starter/setup.py_tmpl
@@ -15,7 +15,7 @@ requires = [
 setup(name='{{project}}',
       version='0.0',
       description='{{project}}',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -32,9 +32,8 @@ setup(name='{{project}}',
       install_requires=requires,
       tests_require=requires,
       test_suite="{{package}}",
-      entry_points = """\
+      entry_points="""\
       [paste.app_factory]
       main = {{package}}:main
       """,
       )
-
diff --git a/pyramid/scaffolds/zodb/+package+/__init__.py b/pyramid/scaffolds/zodb/+package+/__init__.py
index b63933fc5..c3bb87a62 100644
--- a/pyramid/scaffolds/zodb/+package+/__init__.py
+++ b/pyramid/scaffolds/zodb/+package+/__init__.py
@@ -2,10 +2,12 @@ from pyramid.config import Configurator
 from pyramid_zodbconn import get_connection
 from .models import appmaker
 
+
 def root_factory(request):
     conn = get_connection(request)
     return appmaker(conn.root())
 
+
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
diff --git a/pyramid/scaffolds/zodb/+package+/models.py b/pyramid/scaffolds/zodb/+package+/models.py
index 8dd0f5a49..a94b36ef4 100644
--- a/pyramid/scaffolds/zodb/+package+/models.py
+++ b/pyramid/scaffolds/zodb/+package+/models.py
@@ -1,8 +1,10 @@
 from persistent.mapping import PersistentMapping
 
+
 class MyModel(PersistentMapping):
     __parent__ = __name__ = None
 
+
 def appmaker(zodb_root):
     if not 'app_root' in zodb_root:
         app_root = MyModel()
diff --git a/pyramid/scaffolds/zodb/+package+/tests.py_tmpl b/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
index 401260efb..94912a850 100644
--- a/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
@@ -2,6 +2,7 @@ import unittest
 
 from pyramid import testing
 
+
 class ViewTests(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
diff --git a/pyramid/scaffolds/zodb/+package+/views.py_tmpl b/pyramid/scaffolds/zodb/+package+/views.py_tmpl
index 083798095..1e8a9b65a 100644
--- a/pyramid/scaffolds/zodb/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/views.py_tmpl
@@ -1,6 +1,7 @@
 from pyramid.view import view_config
 from .models import MyModel
 
+
 @view_config(context=MyModel, renderer='templates/mytemplate.pt')
 def my_view(request):
-    return {'project':'{{project}}'}
+    return {'project': '{{project}}'}
diff --git a/pyramid/scaffolds/zodb/setup.py_tmpl b/pyramid/scaffolds/zodb/setup.py_tmpl
index df239f5a7..b8610d004 100644
--- a/pyramid/scaffolds/zodb/setup.py_tmpl
+++ b/pyramid/scaffolds/zodb/setup.py_tmpl
@@ -19,7 +19,7 @@ requires = [
 setup(name='{{project}}',
       version='0.0',
       description='{{project}}',
-      long_description=README + '\n\n' +  CHANGES,
+      long_description=README + '\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pyramid",
@@ -33,12 +33,11 @@ setup(name='{{project}}',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
-      install_requires = requires,
-      tests_require= requires,
+      install_requires=requires,
+      tests_require=requires,
       test_suite="{{package}}",
-      entry_points = """\
+      entry_points="""\
       [paste.app_factory]
       main = {{package}}:main
       """,
       )
-