use multiline imports

11 files changed, 154 insertions, 86 deletions

diff --git a/docs/_themes b/docs/_themes
-Subproject d0c25c1398f7c975db6fc174ef957764242ccb8
+Subproject 03e5e5aaaeddc4c9aea887478c7e7b379a127b6
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 40c3c037b..67269954c 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -8,28 +8,49 @@ import venusian
 
 from webob.exc import WSGIHTTPException as WebobWSGIHTTPException
 
-from pyramid.interfaces import IDebugLogger
-from pyramid.interfaces import IExceptionResponse
+from pyramid.interfaces import (
+    IDebugLogger,
+    IExceptionResponse,
+    )
 
 from pyramid.asset import resolve_asset_spec
+
 from pyramid.authorization import ACLAuthorizationPolicy
-from pyramid.compat import text_
-from pyramid.compat import reraise
-from pyramid.compat import string_types
-from pyramid.compat import PY3
+
+from pyramid.compat import (
+    text_,
+    reraise,
+    string_types,
+    PY3,
+    )
+
 from pyramid.events import ApplicationCreated
-from pyramid.exceptions import ConfigurationConflictError
-from pyramid.exceptions import ConfigurationError
-from pyramid.exceptions import ConfigurationExecutionError
+
+from pyramid.exceptions import (
+    ConfigurationConflictError,
+    ConfigurationError,
+    ConfigurationExecutionError,
+    )
+
 from pyramid.httpexceptions import default_exceptionresponse_view
-from pyramid.path import caller_package
-from pyramid.path import package_of
+
+from pyramid.path import (
+    caller_package,
+    package_of,
+    )
+
 from pyramid.registry import Registry
+
 from pyramid.router import Router
+
 from pyramid.settings import aslist
+
 from pyramid.threadlocal import manager
-from pyramid.util import DottedNameResolver
-from pyramid.util import WeakOrderedSet
+
+from pyramid.util import (
+    DottedNameResolver,
+    WeakOrderedSet,
+    )
 
 from pyramid.config.adapters import AdaptersConfiguratorMixin
 from pyramid.config.assets import AssetsConfiguratorMixin
diff --git a/pyramid/config/factories.py b/pyramid/config/factories.py
index 0e59f9286..a5a797a47 100644
--- a/pyramid/config/factories.py
+++ b/pyramid/config/factories.py
@@ -1,9 +1,11 @@
 from pyramid.config.util import action_method
 
-from pyramid.interfaces import IDefaultRootFactory
-from pyramid.interfaces import IRequestFactory
-from pyramid.interfaces import IRootFactory
-from pyramid.interfaces import ISessionFactory
+from pyramid.interfaces import (
+    IDefaultRootFactory,
+    IRequestFactory,
+    IRootFactory,
+    ISessionFactory,
+    )
 
 from pyramid.traversal import DefaultRootFactory
 
diff --git a/pyramid/config/i18n.py b/pyramid/config/i18n.py
index 6eed99191..34df1bb47 100644
--- a/pyramid/config/i18n.py
+++ b/pyramid/config/i18n.py
@@ -3,9 +3,11 @@ import sys
 
 from translationstring import ChameleonTranslate
 
-from pyramid.interfaces import IChameleonTranslate
-from pyramid.interfaces import ILocaleNegotiator
-from pyramid.interfaces import ITranslationDirectories
+from pyramid.interfaces import (
+    IChameleonTranslate,
+    ILocaleNegotiator,
+    ITranslationDirectories,
+    )
 
 from pyramid.exceptions import ConfigurationError
 from pyramid.i18n import get_localizer
diff --git a/pyramid/config/rendering.py b/pyramid/config/rendering.py
index f70dea118..a18a9b196 100644
--- a/pyramid/config/rendering.py
+++ b/pyramid/config/rendering.py
@@ -1,14 +1,19 @@
 import warnings
 
-from pyramid.interfaces import IRendererFactory
-from pyramid.interfaces import IRendererGlobalsFactory
-from pyramid.interfaces import PHASE1_CONFIG
+from pyramid.interfaces import (
+    IRendererFactory,
+    IRendererGlobalsFactory,
+    PHASE1_CONFIG,
+    )
 
 from pyramid.config.util import action_method
 
-from pyramid import renderers
-from pyramid import chameleon_text
-from pyramid import chameleon_zpt
+from pyramid import (
+    renderers,
+    chameleon_text,
+    chameleon_zpt,
+    )
+
 from pyramid.mako_templating import renderer_factory as mako_renderer_factory
 
 DEFAULT_RENDERERS = (
diff --git a/pyramid/config/routes.py b/pyramid/config/routes.py
index 4008a2e08..e190e56ee 100644
--- a/pyramid/config/routes.py
+++ b/pyramid/config/routes.py
@@ -1,16 +1,20 @@
 import warnings
 
-from pyramid.interfaces import IRequest
-from pyramid.interfaces import IRouteRequest
-from pyramid.interfaces import IRoutesMapper
-from pyramid.interfaces import PHASE2_CONFIG
+from pyramid.interfaces import (
+    IRequest,
+    IRouteRequest,
+    IRoutesMapper,
+    PHASE2_CONFIG,
+    )
 
 from pyramid.exceptions import ConfigurationError
 from pyramid.request import route_request_iface
 from pyramid.urldispatch import RoutesMapper
 
-from pyramid.config.util import action_method
-from pyramid.config.util import make_predicates
+from pyramid.config.util import (
+    action_method,
+    make_predicates,
+    )
 
 class RoutesConfiguratorMixin(object):
     @action_method
diff --git a/pyramid/config/security.py b/pyramid/config/security.py
index 935e2fd95..23cd5f27f 100644
--- a/pyramid/config/security.py
+++ b/pyramid/config/security.py
@@ -1,8 +1,10 @@
-from pyramid.interfaces import IAuthorizationPolicy
-from pyramid.interfaces import IAuthenticationPolicy
-from pyramid.interfaces import IDefaultPermission
-from pyramid.interfaces import PHASE1_CONFIG
-from pyramid.interfaces import PHASE2_CONFIG
+from pyramid.interfaces import (
+    IAuthorizationPolicy,
+    IAuthenticationPolicy,
+    IDefaultPermission,
+    PHASE1_CONFIG,
+    PHASE2_CONFIG,
+    )
 
 from pyramid.exceptions import ConfigurationError
 from pyramid.config.util import action_method
diff --git a/pyramid/config/testing.py b/pyramid/config/testing.py
index 36729acdf..3cdc1aa24 100644
--- a/pyramid/config/testing.py
+++ b/pyramid/config/testing.py
@@ -1,9 +1,11 @@
 from zope.interface import Interface
 
-from pyramid.interfaces import ITraverser
-from pyramid.interfaces import IAuthorizationPolicy
-from pyramid.interfaces import IAuthenticationPolicy
-from pyramid.interfaces import IRendererFactory
+from pyramid.interfaces import (
+    ITraverser,
+    IAuthorizationPolicy,
+    IAuthenticationPolicy,
+    IRendererFactory,
+    )
 
 from pyramid.renderers import RendererHelper
 from pyramid.traversal import traversal_path_info
diff --git a/pyramid/config/tweens.py b/pyramid/config/tweens.py
index 048309451..76efe4af5 100644
--- a/pyramid/config/tweens.py
+++ b/pyramid/config/tweens.py
@@ -2,12 +2,19 @@ from zope.interface import implementer
 
 from pyramid.interfaces import ITweens
 
-from pyramid.compat import string_types
-from pyramid.compat import is_nonstr_iter
-from pyramid.compat import string_types
+from pyramid.compat import (
+    string_types,
+    is_nonstr_iter,
+    )
+
 from pyramid.exceptions import ConfigurationError
-from pyramid.tweens import excview_tween_factory
-from pyramid.tweens import MAIN, INGRESS, EXCVIEW
+
+from pyramid.tweens import (
+    excview_tween_factory,
+    MAIN,
+    INGRESS,
+    EXCVIEW,
+    )
 
 from pyramid.config.util import action_method
 
diff --git a/pyramid/config/util.py b/pyramid/config/util.py
index 0336b103d..cbec2e0c2 100644
--- a/pyramid/config/util.py
+++ b/pyramid/config/util.py
@@ -1,12 +1,18 @@
 import re
 import traceback
 
-from pyramid.compat import string_types
-from pyramid.compat import bytes_
-from pyramid.compat import is_nonstr_iter
+from pyramid.compat import (
+    string_types,
+    bytes_,
+    is_nonstr_iter,
+    )
+
 from pyramid.exceptions import ConfigurationError
-from pyramid.traversal import find_interface
-from pyramid.traversal import traversal_path_info
+
+from pyramid.traversal import (
+    find_interface,
+    traversal_path_info,
+    )
 
 from hashlib import md5
 
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index cf27c3514..2a6157ffb 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -1,50 +1,67 @@
 import inspect
 import operator
 
-from zope.interface import Interface
-from zope.interface import classProvides
-from zope.interface import implementedBy
-from zope.interface import implementer
+from zope.interface import (
+    Interface,
+    classProvides,
+    implementedBy,
+    implementer,
+    )
+
 from zope.interface.interfaces import IInterface
 
-from pyramid.interfaces import IAuthenticationPolicy
-from pyramid.interfaces import IAuthorizationPolicy
-from pyramid.interfaces import IDebugLogger
-from pyramid.interfaces import IDefaultPermission
-from pyramid.interfaces import IException
-from pyramid.interfaces import IExceptionViewClassifier
-from pyramid.interfaces import IMultiView
-from pyramid.interfaces import IRendererFactory
-from pyramid.interfaces import IRequest
-from pyramid.interfaces import IResponse
-from pyramid.interfaces import IRouteRequest
-from pyramid.interfaces import ISecuredView
-from pyramid.interfaces import IStaticURLInfo
-from pyramid.interfaces import IView
-from pyramid.interfaces import IViewClassifier
-from pyramid.interfaces import IViewMapper
-from pyramid.interfaces import IViewMapperFactory
-from pyramid.interfaces import PHASE1_CONFIG
+from pyramid.interfaces import (
+    IAuthenticationPolicy,
+    IAuthorizationPolicy,
+    IDebugLogger,
+    IDefaultPermission,
+    IException,
+    IExceptionViewClassifier,
+    IMultiView,
+    IRendererFactory,
+    IRequest,
+    IResponse,
+    IRouteRequest,
+    ISecuredView,
+    IStaticURLInfo,
+    IView,
+    IViewClassifier,
+    IViewMapper,
+    IViewMapperFactory,
+    PHASE1_CONFIG,
+    )
 
 from pyramid import renderers
-from pyramid.compat import string_types
-from pyramid.compat import urlparse
-from pyramid.compat import im_func
-from pyramid.compat import url_quote
-from pyramid.exceptions import ConfigurationError
-from pyramid.exceptions import PredicateMismatch
-from pyramid.httpexceptions import HTTPForbidden
-from pyramid.httpexceptions import HTTPNotFound
+
+from pyramid.compat import (
+    string_types,
+    urlparse,
+    im_func,
+    url_quote,
+    )
+
+from pyramid.exceptions import (
+    ConfigurationError,
+    PredicateMismatch,
+    )
+
+from pyramid.httpexceptions import (
+    HTTPForbidden,
+    HTTPNotFound,
+    )
+
 from pyramid.security import NO_PERMISSION_REQUIRED
 from pyramid.static import static_view
 from pyramid.threadlocal import get_current_registry
 from pyramid.view import render_view_to_response
 
-from pyramid.config.util import DEFAULT_PHASH
-from pyramid.config.util import MAX_ORDER
-from pyramid.config.util import action_method
-from pyramid.config.util import as_sorted_tuple
-from pyramid.config.util import make_predicates
+from pyramid.config.util import (
+    DEFAULT_PHASH,
+    MAX_ORDER,
+    action_method,
+    as_sorted_tuple,
+    make_predicates,
+    )
 
 urljoin = urlparse.urljoin
 url_parse = urlparse.urlparse