diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pyramid/httpexceptions.py | 1 | ||||
| -rw-r--r-- | src/pyramid/resource.py | 1 | ||||
| -rw-r--r-- | src/pyramid/scripts/pshell.py | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/pyramid/httpexceptions.py b/src/pyramid/httpexceptions.py index 9d61acd8f..46589b1ec 100644 --- a/src/pyramid/httpexceptions.py +++ b/src/pyramid/httpexceptions.py @@ -129,6 +129,7 @@ redirections that require a ``Location`` field. Reflecting this, these subclasses have one additional keyword argument: ``location``, which indicates the location to which to redirect. """ + import json from string import Template from webob import html_escape as _html_escape diff --git a/src/pyramid/resource.py b/src/pyramid/resource.py index 8ddf4c447..a89395f18 100644 --- a/src/pyramid/resource.py +++ b/src/pyramid/resource.py @@ -1,4 +1,5 @@ """ Backwards compatibility shim module (forever). """ + from pyramid.asset import * # noqa b/w compat resolve_resource_spec = resolve_asset_spec # noqa diff --git a/src/pyramid/scripts/pshell.py b/src/pyramid/scripts/pshell.py index 09baf1736..f80509fa8 100644 --- a/src/pyramid/scripts/pshell.py +++ b/src/pyramid/scripts/pshell.py @@ -162,9 +162,9 @@ class PShellCommand: env_help['root'] = 'Root of the default resource tree.' env_help['registry'] = 'Active Pyramid registry.' env_help['request'] = 'Active request object.' - env_help[ - 'root_factory' - ] = 'Default root factory used to create `root`.' + env_help['root_factory'] = ( + 'Default root factory used to create `root`.' + ) # load the pshell section of the ini file env.update(self.loaded_objects) |