Merge https://github.com/Pylons/pyramid

5 files changed, 9 insertions, 12 deletions

diff --git a/pyramid/configuration.py b/pyramid/configuration.py
index 29a322c7f..b85c81cee 100644
--- a/pyramid/configuration.py
+++ b/pyramid/configuration.py
@@ -48,7 +48,7 @@ try:
     from pyramid import chameleon_text
 except TypeError:  # pragma: no cover
     chameleon_text = None # pypy
-try: 
+try:
     from pyramid import chameleon_zpt
 except TypeError: # pragma: no cover
     chameleon_zpt = None # pypy
diff --git a/pyramid/registry.py b/pyramid/registry.py
index c772636aa..edb3190c5 100644
--- a/pyramid/registry.py
+++ b/pyramid/registry.py
@@ -26,7 +26,7 @@ class Registry(Components, dict):
         result = Components.registerSubscriptionAdapter(self, *arg, **kw)
         self.has_listeners = True
         return result
-        
+
     def registerHandler(self, *arg, **kw):
         result = Components.registerHandler(self, *arg, **kw)
         self.has_listeners = True
diff --git a/pyramid/renderers.py b/pyramid/renderers.py
index ba29f80d0..69c5f7275 100644
--- a/pyramid/renderers.py
+++ b/pyramid/renderers.py
@@ -158,7 +158,7 @@ class ChameleonRendererLookup(object):
         self.impl = impl
         self.registry = registry
         self.lock = threading.Lock()
-        
+
     def get_spec(self, name, package):
         spec = name
         isabs = os.path.isabs(name)
@@ -247,7 +247,7 @@ def template_renderer_factory(info, impl, lock=registry_lock):
     return lookup(info)
 
 # XXX deprecate
-def renderer_from_name(path, package=None): 
+def renderer_from_name(path, package=None):
     return RendererHelper(name=path, package=package).renderer
 
 class RendererHelper(object):
@@ -281,7 +281,7 @@ class RendererHelper(object):
 
     def get_renderer(self):
         return self.renderer
-    
+
     def render(self, value, system_values, request=None):
         renderer = self.renderer
         if system_values is None:
@@ -337,4 +337,3 @@ class RendererHelper(object):
                 response.cache_expires = cache_for
 
         return response
-
diff --git a/pyramid/threadlocal.py b/pyramid/threadlocal.py
index f08057453..d99b0b734 100644
--- a/pyramid/threadlocal.py
+++ b/pyramid/threadlocal.py
@@ -5,13 +5,13 @@ from pyramid.registry import global_registry
 class ThreadLocalManager(threading.local):
     def __init__(self, default=None):
         # http://code.google.com/p/google-app-engine-django/issues/detail?id=119
-        # we *must* use a keword argument for ``default`` here instead
+        # we *must* use a keyword argument for ``default`` here instead
         # of a positional argument to work around a bug in the
         # implementation of _threading_local.local in Python, which is
         # used by GAE instead of _thread.local
         self.stack = []
         self.default = default
-        
+
     def push(self, info):
         self.stack.append(info)
 
@@ -58,4 +58,3 @@ def get_current_registry(context=None): # context required by getSiteManager API
     tested nor scripted.
     """
     return manager.get()['registry']
-
diff --git a/pyramid/wsgi.py b/pyramid/wsgi.py
index 414526683..89fd120cb 100644
--- a/pyramid/wsgi.py
+++ b/pyramid/wsgi.py
@@ -34,7 +34,7 @@ def wsgiapp(wrapped):
     application to a :term:`Response` and return it to
     :app:`Pyramid` as if the WSGI app were a :mod:`pyramid`
     view.
-    
+
     """
     def decorator(context, request):
         return request.get_response(wrapped)
@@ -74,7 +74,7 @@ def wsgiapp2(wrapped):
     the WSGI app were a :app:`Pyramid` view.  The ``SCRIPT_NAME``
     and ``PATH_INFO`` values present in the WSGI environment are fixed
     up before the application is invoked.  """
-    
+
     def decorator(context, request):
         traversed = request.traversed
         vroot_path = request.virtual_root_path or ()
@@ -94,4 +94,3 @@ def wsgiapp2(wrapped):
         request.environ['SCRIPT_NAME'] = script_name
         return request.get_response(wrapped)
     return wraps(wrapped)(decorator) # grokkability
-