From 815471bf42ab88c1524755735fbb84126bb65563 Mon Sep 17 00:00:00 2001 From: Danny Navarro Date: Thu, 2 Dec 2010 20:34:11 +0100 Subject: Fixed doc typo and removed unnecessary whitespaces --- pyramid/threadlocal.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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'] - -- cgit v1.2.3 From bfc1454695029d7d0e126db022c0b0d7a8986a1e Mon Sep 17 00:00:00 2001 From: Danny Navarro Date: Thu, 2 Dec 2010 20:35:43 +0100 Subject: Removed unnecessary whitespaces --- pyramid/wsgi.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 - -- cgit v1.2.3 From c9aece2fd143ae822f59c92b6619308fec96dc32 Mon Sep 17 00:00:00 2001 From: Danny Navarro Date: Thu, 2 Dec 2010 20:36:24 +0100 Subject: Removed unnecessary whitespaces --- pyramid/registry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 9632740cd669e9379e6556c38ca1cff1133ee9b7 Mon Sep 17 00:00:00 2001 From: Danny Navarro Date: Thu, 2 Dec 2010 20:40:12 +0100 Subject: Removed unnecessary whitespace --- pyramid/configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From ca9e7e05e46585ba2a5c6306487ae89b7dcb1dd2 Mon Sep 17 00:00:00 2001 From: Danny Navarro Date: Thu, 2 Dec 2010 20:44:35 +0100 Subject: Removed unnecessary whitespaces --- pyramid/renderers.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 - -- cgit v1.2.3