glue it up

12 files changed, 12 insertions, 12 deletions

diff --git a/pyramid/request.py b/pyramid/request.py
index eae83da6f..d98175feb 100644
--- a/pyramid/request.py
+++ b/pyramid/request.py
@@ -328,7 +328,7 @@ class Request(BaseRequest, DeprecatedRequestMethodsMixin, URLMethodsMixin,
         :class:`pyramid.exceptions.ConfigurationError` will be raised"""
         factory = self.registry.queryUtility(ISessionFactory)
         if factory is None:
-            raise ConfigurationError(
+            raise AttributeError(
                 'No session factory registered '
                 '(see the Sessions chapter of the Pyramid documentation)')
         return factory(self)
diff --git a/pyramid/scaffolds/alchemy/+package+/models.py b/pyramid/scaffolds/alchemy/+package+/models.py
index 4a93ecf8a..2685da5bb 100755
--- a/pyramid/scaffolds/alchemy/+package+/models.py
+++ b/pyramid/scaffolds/alchemy/+package+/models.py
@@ -64,7 +64,7 @@ def root_factory(request):
 
 def populate():
     session = DBSession()
-    model = MyModel(name=u'test name', value=55)
+    model = MyModel(name='test name', value=55)
     session.add(model)
     session.flush()
     transaction.commit()
diff --git a/pyramid/scaffolds/alchemy/development.ini_tmpl b/pyramid/scaffolds/alchemy/development.ini_tmpl
index 05e7ac296..b7c06aff3 100644
--- a/pyramid/scaffolds/alchemy/development.ini_tmpl
+++ b/pyramid/scaffolds/alchemy/development.ini_tmpl
@@ -13,7 +13,7 @@ pyramid.includes = pyramid_debugtoolbar
 sqlalchemy.url = sqlite:///%(here)s/{{project}}.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:glue#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/pyramid/scaffolds/alchemy/production.ini_tmpl b/pyramid/scaffolds/alchemy/production.ini_tmpl
index fad5baa30..dc17e8338 100644
--- a/pyramid/scaffolds/alchemy/production.ini_tmpl
+++ b/pyramid/scaffolds/alchemy/production.ini_tmpl
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_tm
 sqlalchemy.url = sqlite:///%(here)s/{{project}}.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:glue#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/pyramid/scaffolds/routesalchemy/+package+/models.py b/pyramid/scaffolds/routesalchemy/+package+/models.py
index cffb8f5ef..bef483d3a 100644
--- a/pyramid/scaffolds/routesalchemy/+package+/models.py
+++ b/pyramid/scaffolds/routesalchemy/+package+/models.py
@@ -27,7 +27,7 @@ class MyModel(Base):
 
 def populate():
     session = DBSession()
-    model = MyModel(name=u'root', value=55)
+    model = MyModel(name='root', value=55)
     session.add(model)
     session.flush()
     transaction.commit()
diff --git a/pyramid/scaffolds/routesalchemy/+package+/views.py_tmpl b/pyramid/scaffolds/routesalchemy/+package+/views.py_tmpl
index 86cc02e41..45532b47b 100644
--- a/pyramid/scaffolds/routesalchemy/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/routesalchemy/+package+/views.py_tmpl
@@ -3,5 +3,5 @@ from {{package}}.models import MyModel
 
 def my_view(request):
     dbsession = DBSession()
-    root = dbsession.query(MyModel).filter(MyModel.name==u'root').first()
+    root = dbsession.query(MyModel).filter(MyModel.name=='root').first()
     return {'root':root, 'project':'{{project}}'}
diff --git a/pyramid/scaffolds/routesalchemy/development.ini_tmpl b/pyramid/scaffolds/routesalchemy/development.ini_tmpl
index 05e7ac296..b7c06aff3 100644
--- a/pyramid/scaffolds/routesalchemy/development.ini_tmpl
+++ b/pyramid/scaffolds/routesalchemy/development.ini_tmpl
@@ -13,7 +13,7 @@ pyramid.includes = pyramid_debugtoolbar
 sqlalchemy.url = sqlite:///%(here)s/{{project}}.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:glue#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/pyramid/scaffolds/routesalchemy/production.ini_tmpl b/pyramid/scaffolds/routesalchemy/production.ini_tmpl
index fad5baa30..dc17e8338 100644
--- a/pyramid/scaffolds/routesalchemy/production.ini_tmpl
+++ b/pyramid/scaffolds/routesalchemy/production.ini_tmpl
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_tm
 sqlalchemy.url = sqlite:///%(here)s/{{project}}.db
 
 [server:main]
-use = egg:Paste#http
+use = egg:glue#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/pyramid/scaffolds/starter/development.ini_tmpl b/pyramid/scaffolds/starter/development.ini_tmpl
index 2d2f6e354..c47fcec22 100644
--- a/pyramid/scaffolds/starter/development.ini_tmpl
+++ b/pyramid/scaffolds/starter/development.ini_tmpl
@@ -10,7 +10,7 @@ pyramid.default_locale_name = en
 pyramid.includes = pyramid_debugtoolbar
 
 [server:main]
-use = egg:Paste#http
+use = egg:glue#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/pyramid/scaffolds/starter/production.ini_tmpl b/pyramid/scaffolds/starter/production.ini_tmpl
index b04f37ab3..0634072c0 100644
--- a/pyramid/scaffolds/starter/production.ini_tmpl
+++ b/pyramid/scaffolds/starter/production.ini_tmpl
@@ -9,7 +9,7 @@ pyramid.debug_templates = false
 pyramid.default_locale_name = en
 
 [server:main]
-use = egg:Paste#http
+use = egg:glue#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/pyramid/scaffolds/zodb/development.ini_tmpl b/pyramid/scaffolds/zodb/development.ini_tmpl
index 29da8ee38..661e042a2 100644
--- a/pyramid/scaffolds/zodb/development.ini_tmpl
+++ b/pyramid/scaffolds/zodb/development.ini_tmpl
@@ -14,7 +14,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:glue#wsgiref
 host = 0.0.0.0
 port = 6543
 
diff --git a/pyramid/scaffolds/zodb/production.ini_tmpl b/pyramid/scaffolds/zodb/production.ini_tmpl
index 0275a33a7..2378f9751 100644
--- a/pyramid/scaffolds/zodb/production.ini_tmpl
+++ b/pyramid/scaffolds/zodb/production.ini_tmpl
@@ -13,7 +13,7 @@ tm.attempts = 3
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
 
 [server:main]
-use = egg:Paste#http
+use = egg:glue#wsgiref
 host = 0.0.0.0
 port = 6543