From 423b85a4866b8b1e32da06cc6cb13ce40672022f Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 18 Sep 2009 21:50:33 +0000 Subject: Compulsive import reorderings. --- repoze/bfg/authentication.py | 9 +++++---- repoze/bfg/authorization.py | 4 ++-- repoze/bfg/chameleon_text.py | 6 +++--- repoze/bfg/chameleon_zpt.py | 4 ++-- repoze/bfg/paster.py | 5 +---- repoze/bfg/path.py | 2 +- repoze/bfg/registry.py | 7 ++----- repoze/bfg/renderers.py | 7 +++---- repoze/bfg/request.py | 6 ++---- repoze/bfg/resource.py | 2 +- repoze/bfg/router.py | 28 +++++++++------------------- repoze/bfg/security.py | 2 +- repoze/bfg/static.py | 4 ++-- repoze/bfg/testing.py | 2 +- repoze/bfg/traversal.py | 4 ++-- repoze/bfg/url.py | 3 ++- repoze/bfg/urldispatch.py | 2 +- repoze/bfg/view.py | 20 +++++++++----------- repoze/bfg/zcml.py | 42 +++++++++++++++++------------------------- 19 files changed, 66 insertions(+), 93 deletions(-) diff --git a/repoze/bfg/authentication.py b/repoze/bfg/authentication.py index 90c6ca90b..5bd3e9c4b 100644 --- a/repoze/bfg/authentication.py +++ b/repoze/bfg/authentication.py @@ -1,16 +1,17 @@ +from codecs import utf_8_decode +from codecs import utf_8_encode import datetime import time -from codecs import utf_8_decode -from codecs import utf_8_encode -from paste.request import get_cookies from paste.auth import auth_tkt +from paste.request import get_cookies from zope.interface import implements from repoze.bfg.interfaces import IAuthenticationPolicy -from repoze.bfg.security import Everyone + from repoze.bfg.security import Authenticated +from repoze.bfg.security import Everyone class CallbackAuthenticationPolicy(object): """ Abstract class """ diff --git a/repoze/bfg/authorization.py b/repoze/bfg/authorization.py index bfaa733ff..743e9cb64 100644 --- a/repoze/bfg/authorization.py +++ b/repoze/bfg/authorization.py @@ -2,10 +2,10 @@ from zope.interface import implements from repoze.bfg.interfaces import IAuthorizationPolicy from repoze.bfg.location import lineage -from repoze.bfg.security import Allow -from repoze.bfg.security import Deny from repoze.bfg.security import ACLAllowed from repoze.bfg.security import ACLDenied +from repoze.bfg.security import Allow +from repoze.bfg.security import Deny from repoze.bfg.security import Everyone class ACLAuthorizationPolicy(object): diff --git a/repoze/bfg/chameleon_text.py b/repoze/bfg/chameleon_text.py index 1c9518b88..7910746ac 100644 --- a/repoze/bfg/chameleon_text.py +++ b/repoze/bfg/chameleon_text.py @@ -3,12 +3,12 @@ from webob import Response from zope.component import queryUtility from zope.interface import implements -from repoze.bfg.interfaces import IResponseFactory -from repoze.bfg.interfaces import ITemplateRenderer - from chameleon.core.template import TemplateFile from chameleon.zpt.language import Parser +from repoze.bfg.interfaces import IResponseFactory +from repoze.bfg.interfaces import ITemplateRenderer + from repoze.bfg.renderers import template_renderer_factory from repoze.bfg.settings import get_settings diff --git a/repoze/bfg/chameleon_zpt.py b/repoze/bfg/chameleon_zpt.py index 9f6012b19..6fcdd9dad 100644 --- a/repoze/bfg/chameleon_zpt.py +++ b/repoze/bfg/chameleon_zpt.py @@ -3,11 +3,11 @@ from webob import Response from zope.component import queryUtility from zope.interface import implements +from chameleon.zpt.template import PageTemplateFile + from repoze.bfg.interfaces import IResponseFactory from repoze.bfg.interfaces import ITemplateRenderer -from chameleon.zpt.template import PageTemplateFile - from repoze.bfg.renderers import template_renderer_factory from repoze.bfg.settings import get_settings diff --git a/repoze/bfg/paster.py b/repoze/bfg/paster.py index 6ba1391e3..c60d0b437 100644 --- a/repoze/bfg/paster.py +++ b/repoze/bfg/paster.py @@ -1,13 +1,10 @@ import os import sys - from code import interact from paste.deploy import loadapp - -from paste.script.templates import Template from paste.script.command import Command - +from paste.script.templates import Template from paste.util.template import paste_script_template_renderer from repoze.bfg.scripting import get_root diff --git a/repoze/bfg/path.py b/repoze/bfg/path.py index db9efbf8d..a578d488b 100644 --- a/repoze/bfg/path.py +++ b/repoze/bfg/path.py @@ -1,6 +1,6 @@ import os -import sys import pkg_resources +import sys def caller_path(path, level=2): """ Return an absolute path """ diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py index 50aa1b268..06cd1b804 100644 --- a/repoze/bfg/registry.py +++ b/repoze/bfg/registry.py @@ -1,16 +1,13 @@ import threading -import zope.component - from zope.component import getGlobalSiteManager from zope.component import getSiteManager as original_getSiteManager from zope.component.registry import Components - from zope.deprecation import deprecated +import zope.component -from repoze.bfg.threadlocal import manager from repoze.bfg.threadlocal import get_current_registry - +from repoze.bfg.threadlocal import manager from repoze.bfg.zcml import zcml_configure class Registry(Components): diff --git a/repoze/bfg/renderers.py b/repoze/bfg/renderers.py index 840896f0e..0d14279b0 100644 --- a/repoze/bfg/renderers.py +++ b/repoze/bfg/renderers.py @@ -1,16 +1,15 @@ import os import pkg_resources -from zope.component import queryUtility from zope.component import getSiteManager - -from repoze.bfg.path import caller_package -from repoze.bfg.settings import get_settings +from zope.component import queryUtility from repoze.bfg.interfaces import IRendererFactory from repoze.bfg.interfaces import ITemplateRenderer +from repoze.bfg.path import caller_package from repoze.bfg.resource import resource_spec +from repoze.bfg.settings import get_settings try: import json diff --git a/repoze/bfg/request.py b/repoze/bfg/request.py index 9b29d3e1f..1c6bae1da 100644 --- a/repoze/bfg/request.py +++ b/repoze/bfg/request.py @@ -1,12 +1,10 @@ +from zope.component import queryUtility +from zope.deprecation import deprecated from zope.interface import implements from zope.interface.interface import InterfaceClass -from zope.component import queryUtility - from webob import Request as WebobRequest -from zope.deprecation import deprecated - from repoze.bfg.interfaces import IRequest from repoze.bfg.interfaces import IRouteRequest diff --git a/repoze/bfg/resource.py b/repoze/bfg/resource.py index 2b3101511..c597ad712 100644 --- a/repoze/bfg/resource.py +++ b/repoze/bfg/resource.py @@ -1,6 +1,6 @@ import os - import pkg_resources + from zope.component import queryUtility from zope.interface import implements diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py index e8497331b..49ffcbf6d 100644 --- a/repoze/bfg/router.py +++ b/repoze/bfg/router.py @@ -1,19 +1,13 @@ import os import sys -from zope.interface import providedBy -from zope.component.event import dispatch - from zope.interface import implements +from zope.interface import providedBy -from repoze.bfg.authorization import ACLAuthorizationPolicy - -from repoze.bfg.events import NewRequest -from repoze.bfg.events import NewResponse -from repoze.bfg.events import WSGIApplicationCreatedEvent +from zope.component.event import dispatch -from repoze.bfg.interfaces import IAuthorizationPolicy from repoze.bfg.interfaces import IAuthenticationPolicy +from repoze.bfg.interfaces import IAuthorizationPolicy from repoze.bfg.interfaces import IDefaultRootFactory from repoze.bfg.interfaces import IForbiddenView from repoze.bfg.interfaces import ILogger @@ -24,27 +18,23 @@ from repoze.bfg.interfaces import IRoutesMapper from repoze.bfg.interfaces import ISettings from repoze.bfg.interfaces import IView +from repoze.bfg.authorization import ACLAuthorizationPolicy +from repoze.bfg.events import NewRequest +from repoze.bfg.events import NewResponse +from repoze.bfg.events import WSGIApplicationCreatedEvent from repoze.bfg.log import make_stream_logger - from repoze.bfg.registry import Registry from repoze.bfg.registry import populateRegistry - from repoze.bfg.request import request_factory - from repoze.bfg.security import Unauthorized - from repoze.bfg.settings import Settings from repoze.bfg.settings import get_options - from repoze.bfg.threadlocal import manager - from repoze.bfg.traversal import _traverse - from repoze.bfg.urldispatch import RoutesRootFactory - -from repoze.bfg.view import default_notfound_view -from repoze.bfg.view import default_forbidden_view from repoze.bfg.view import NotFound +from repoze.bfg.view import default_forbidden_view +from repoze.bfg.view import default_notfound_view _marker = object() diff --git a/repoze/bfg/security.py b/repoze/bfg/security.py index 09f146ded..466c33da3 100644 --- a/repoze/bfg/security.py +++ b/repoze/bfg/security.py @@ -1,6 +1,6 @@ from zope.component import getSiteManager -from zope.component import queryUtility from zope.component import providedBy +from zope.component import queryUtility from repoze.bfg.interfaces import IAuthenticationPolicy from repoze.bfg.interfaces import IAuthorizationPolicy diff --git a/repoze/bfg/static.py b/repoze/bfg/static.py index ef893875f..6261a1fb3 100644 --- a/repoze/bfg/static.py +++ b/repoze/bfg/static.py @@ -1,10 +1,10 @@ import os import pkg_resources -from paste.httpheaders import ETAG -from paste.urlparser import StaticURLParser from paste import httpexceptions from paste import request +from paste.httpheaders import ETAG +from paste.urlparser import StaticURLParser class PackageURLParser(StaticURLParser): """ This probably won't work with zipimported resources """ diff --git a/repoze/bfg/testing.py b/repoze/bfg/testing.py index 7b694b242..d4aafa083 100644 --- a/repoze/bfg/testing.py +++ b/repoze/bfg/testing.py @@ -2,8 +2,8 @@ import copy from zope.deprecation import deprecated -from zope.interface import Interface from zope.interface import implements +from zope.interface import Interface from repoze.bfg.interfaces import IRequest diff --git a/repoze/bfg/traversal.py b/repoze/bfg/traversal.py index cbd3b2750..dbc9ae709 100644 --- a/repoze/bfg/traversal.py +++ b/repoze/bfg/traversal.py @@ -9,13 +9,13 @@ from zope.interface.interfaces import IInterface from repoze.lru import lru_cache -from repoze.bfg.location import lineage - from repoze.bfg.interfaces import IContextURL from repoze.bfg.interfaces import ITraverser from repoze.bfg.interfaces import ITraverserFactory from repoze.bfg.interfaces import VH_ROOT_KEY +from repoze.bfg.location import lineage + def find_root(model): """ Find the root node in the graph to which ``model`` belongs. Note that ``model`` should be :term:`location`-aware. diff --git a/repoze/bfg/url.py b/repoze/bfg/url.py index f21334191..b507e9432 100644 --- a/repoze/bfg/url.py +++ b/repoze/bfg/url.py @@ -3,8 +3,9 @@ import os import urllib -from zope.component import queryMultiAdapter from zope.component import getUtility +from zope.component import queryMultiAdapter + from repoze.bfg.interfaces import IContextURL from repoze.bfg.interfaces import IRoutesMapper diff --git a/repoze/bfg/urldispatch.py b/repoze/bfg/urldispatch.py index dfb7c9979..7aba027e9 100644 --- a/repoze/bfg/urldispatch.py +++ b/repoze/bfg/urldispatch.py @@ -2,8 +2,8 @@ import re from urllib import unquote from repoze.bfg.traversal import _url_quote -from repoze.bfg.traversal import traversal_path from repoze.bfg.traversal import quote_path_segment +from repoze.bfg.traversal import traversal_path _marker = object() diff --git a/repoze/bfg/view.py b/repoze/bfg/view.py index aa164f432..1e25755b4 100644 --- a/repoze/bfg/view.py +++ b/repoze/bfg/view.py @@ -1,7 +1,7 @@ import cgi -import os import inspect import mimetypes +import os # See http://bugs.python.org/issue5853 which is a recursion bug # that seems to effect Python 2.6, Python 2.6.1, and 2.6.2 (a fix @@ -17,29 +17,27 @@ from webob import Response from paste.urlparser import StaticURLParser -from zope.component import queryUtility -from zope.component import providedBy from zope.component import getSiteManager - -from zope.interface import implements - +from zope.component import providedBy +from zope.component import queryUtility from zope.deprecation import deprecated +from zope.interface import implements from repoze.bfg.interfaces import IAuthenticationPolicy from repoze.bfg.interfaces import IAuthorizationPolicy from repoze.bfg.interfaces import ILogger -from repoze.bfg.interfaces import IResponseFactory -from repoze.bfg.interfaces import IRendererFactory -from repoze.bfg.interfaces import IView from repoze.bfg.interfaces import IMultiView +from repoze.bfg.interfaces import IRendererFactory +from repoze.bfg.interfaces import IResponseFactory from repoze.bfg.interfaces import ITemplateRenderer +from repoze.bfg.interfaces import IView from repoze.bfg.path import caller_package +from repoze.bfg.renderers import renderer_from_name +from repoze.bfg.resource import resource_spec from repoze.bfg.security import Unauthorized from repoze.bfg.settings import get_settings from repoze.bfg.static import PackageURLParser -from repoze.bfg.renderers import renderer_from_name -from repoze.bfg.resource import resource_spec try: all = all diff --git a/repoze/bfg/zcml.py b/repoze/bfg/zcml.py index 29e54df28..5acf5b791 100644 --- a/repoze/bfg/zcml.py +++ b/repoze/bfg/zcml.py @@ -1,61 +1,53 @@ -import os import sys import types from zope.configuration import xmlconfig +import zope.configuration.config from zope.component import getSiteManager from zope.component import getUtility from zope.component import queryUtility -import zope.configuration.config - from zope.configuration.exceptions import ConfigurationError from zope.configuration.fields import GlobalObject from zope.interface import Interface -from zope.interface.interfaces import IInterface from zope.interface import implementedBy +from zope.interface.interfaces import IInterface -from zope.schema import TextLine from zope.schema import Bool from zope.schema import Int +from zope.schema import TextLine -from repoze.bfg.authentication import RepozeWho1AuthenticationPolicy -from repoze.bfg.authentication import RemoteUserAuthenticationPolicy -from repoze.bfg.authentication import AuthTktAuthenticationPolicy -from repoze.bfg.authorization import ACLAuthorizationPolicy +import martian -from repoze.bfg.interfaces import IRoutesMapper -from repoze.bfg.interfaces import IViewPermission -from repoze.bfg.interfaces import INotFoundView -from repoze.bfg.interfaces import IForbiddenView from repoze.bfg.interfaces import IAuthenticationPolicy from repoze.bfg.interfaces import IAuthorizationPolicy -from repoze.bfg.interfaces import ISecuredView +from repoze.bfg.interfaces import IForbiddenView from repoze.bfg.interfaces import IMultiView -from repoze.bfg.interfaces import IView +from repoze.bfg.interfaces import INotFoundView from repoze.bfg.interfaces import IPackageOverrides +from repoze.bfg.interfaces import IRendererFactory from repoze.bfg.interfaces import IRequest from repoze.bfg.interfaces import IRouteRequest -from repoze.bfg.interfaces import IRendererFactory +from repoze.bfg.interfaces import IRoutesMapper +from repoze.bfg.interfaces import ISecuredView +from repoze.bfg.interfaces import IView +from repoze.bfg.interfaces import IViewPermission +from repoze.bfg.authentication import RepozeWho1AuthenticationPolicy +from repoze.bfg.authentication import RemoteUserAuthenticationPolicy +from repoze.bfg.authentication import AuthTktAuthenticationPolicy +from repoze.bfg.authorization import ACLAuthorizationPolicy from repoze.bfg.path import package_name - +from repoze.bfg.request import create_route_request_factory from repoze.bfg.resource import PackageOverrides from repoze.bfg.resource import resource_spec - -from repoze.bfg.request import create_route_request_factory - from repoze.bfg.static import StaticRootFactory - from repoze.bfg.traversal import find_interface - -from repoze.bfg.view import static as static_view from repoze.bfg.view import MultiView from repoze.bfg.view import derive_view - -import martian +from repoze.bfg.view import static as static_view def view( _context, -- cgit v1.2.3