diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-11-27 07:01:13 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-11-27 07:01:13 +0000 |
| commit | 57d4efbbd560a497b8c591f05605df00a61fc1e3 (patch) | |
| tree | 056c0b985101083a0d695254a179f8d441e1d6b9 /repoze | |
| parent | 19359b8dbed756c4f7802cb725632f28d7eb9b22 (diff) | |
| download | pyramid-57d4efbbd560a497b8c591f05605df00a61fc1e3.tar.gz pyramid-57d4efbbd560a497b8c591f05605df00a61fc1e3.tar.bz2 pyramid-57d4efbbd560a497b8c591f05605df00a61fc1e3.zip | |
Cleanup.
Diffstat (limited to 'repoze')
| -rw-r--r-- | repoze/bfg/authorization.py | 1 | ||||
| -rw-r--r-- | repoze/bfg/configuration.py | 8 | ||||
| -rw-r--r-- | repoze/bfg/resource.py | 1 | ||||
| -rw-r--r-- | repoze/bfg/router.py | 6 | ||||
| -rw-r--r-- | repoze/bfg/traversal.py | 2 | ||||
| -rw-r--r-- | repoze/bfg/url.py | 2 | ||||
| -rw-r--r-- | repoze/bfg/zcml.py | 14 |
7 files changed, 18 insertions, 16 deletions
diff --git a/repoze/bfg/authorization.py b/repoze/bfg/authorization.py index c7e8b1c96..7113ddd23 100644 --- a/repoze/bfg/authorization.py +++ b/repoze/bfg/authorization.py @@ -1,6 +1,7 @@ from zope.interface import implements from repoze.bfg.interfaces import IAuthorizationPolicy + from repoze.bfg.location import lineage from repoze.bfg.security import ACLAllowed from repoze.bfg.security import ACLDenied diff --git a/repoze/bfg/configuration.py b/repoze/bfg/configuration.py index 1dd41b0d1..e4ade41fe 100644 --- a/repoze/bfg/configuration.py +++ b/repoze/bfg/configuration.py @@ -16,9 +16,9 @@ from zope.interface import implements from repoze.bfg.interfaces import IAuthenticationPolicy from repoze.bfg.interfaces import IAuthorizationPolicy +from repoze.bfg.interfaces import IDebugLogger from repoze.bfg.interfaces import IDefaultRootFactory from repoze.bfg.interfaces import IForbiddenView -from repoze.bfg.interfaces import IDebugLogger from repoze.bfg.interfaces import IMultiView from repoze.bfg.interfaces import INotFoundView from repoze.bfg.interfaces import IPackageOverrides @@ -28,12 +28,12 @@ from repoze.bfg.interfaces import IResponseFactory from repoze.bfg.interfaces import IRootFactory from repoze.bfg.interfaces import IRouteRequest from repoze.bfg.interfaces import IRoutesMapper -from repoze.bfg.interfaces import ISettings from repoze.bfg.interfaces import ISecuredView +from repoze.bfg.interfaces import ISettings from repoze.bfg.interfaces import IView -from repoze.bfg import chameleon_zpt from repoze.bfg import chameleon_text +from repoze.bfg import chameleon_zpt from repoze.bfg import renderers from repoze.bfg.authorization import ACLAuthorizationPolicy from repoze.bfg.compat import all @@ -51,8 +51,8 @@ from repoze.bfg.settings import Settings from repoze.bfg.static import StaticRootFactory from repoze.bfg.threadlocal import get_current_registry from repoze.bfg.threadlocal import manager -from repoze.bfg.traversal import find_interface from repoze.bfg.traversal import DefaultRootFactory +from repoze.bfg.traversal import find_interface from repoze.bfg.urldispatch import RoutesMapper from repoze.bfg.view import render_view_to_response from repoze.bfg.view import static diff --git a/repoze/bfg/resource.py b/repoze/bfg/resource.py index d76dbcaac..25e6af4f7 100644 --- a/repoze/bfg/resource.py +++ b/repoze/bfg/resource.py @@ -4,6 +4,7 @@ import pkg_resources from zope.interface import implements from repoze.bfg.interfaces import IPackageOverrides + from repoze.bfg.threadlocal import get_current_registry class OverrideProvider(pkg_resources.DefaultProvider): diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py index a68ce3653..3d80a54f8 100644 --- a/repoze/bfg/router.py +++ b/repoze/bfg/router.py @@ -1,13 +1,13 @@ +from zope.interface import alsoProvides from zope.interface import implements from zope.interface import providedBy -from zope.interface import alsoProvides -from repoze.bfg.interfaces import IForbiddenView from repoze.bfg.interfaces import IDebugLogger +from repoze.bfg.interfaces import IForbiddenView from repoze.bfg.interfaces import INotFoundView from repoze.bfg.interfaces import IRootFactory -from repoze.bfg.interfaces import IRouter from repoze.bfg.interfaces import IRouteRequest +from repoze.bfg.interfaces import IRouter from repoze.bfg.interfaces import IRoutesMapper from repoze.bfg.interfaces import ISettings from repoze.bfg.interfaces import ITraverser diff --git a/repoze/bfg/traversal.py b/repoze/bfg/traversal.py index daf307c73..43680be0d 100644 --- a/repoze/bfg/traversal.py +++ b/repoze/bfg/traversal.py @@ -9,8 +9,8 @@ from repoze.bfg.interfaces import IContextURL from repoze.bfg.interfaces import ITraverser from repoze.bfg.interfaces import VH_ROOT_KEY -from repoze.bfg.location import lineage from repoze.bfg.encode import url_quote +from repoze.bfg.location import lineage from repoze.bfg.request import Request from repoze.bfg.threadlocal import get_current_registry diff --git a/repoze/bfg/url.py b/repoze/bfg/url.py index d94cd429c..961d9423c 100644 --- a/repoze/bfg/url.py +++ b/repoze/bfg/url.py @@ -11,8 +11,8 @@ from repoze.bfg.encode import urlencode from repoze.bfg.path import caller_package from repoze.bfg.static import StaticRootFactory from repoze.bfg.threadlocal import get_current_registry -from repoze.bfg.traversal import quote_path_segment from repoze.bfg.traversal import TraversalContextURL +from repoze.bfg.traversal import quote_path_segment def route_url(route_name, request, *elements, **kw): """Generates a fully qualified URL for a named BFG route. diff --git a/repoze/bfg/zcml.py b/repoze/bfg/zcml.py index f3d722461..c81c22d65 100644 --- a/repoze/bfg/zcml.py +++ b/repoze/bfg/zcml.py @@ -1,35 +1,35 @@ +from zope.configuration import xmlconfig +from zope.configuration.config import ConfigurationMachine from zope.configuration.exceptions import ConfigurationError from zope.configuration.fields import GlobalInterface from zope.configuration.fields import GlobalObject from zope.configuration.fields import Tokens -from zope.configuration.config import ConfigurationMachine -from zope.configuration import xmlconfig from zope.interface import Interface from zope.interface import implementedBy from zope.interface import providedBy +from zope.schema import ASCIILine from zope.schema import Bool from zope.schema import Int from zope.schema import TextLine -from zope.schema import ASCIILine from repoze.bfg.interfaces import IAuthenticationPolicy from repoze.bfg.interfaces import IAuthorizationPolicy from repoze.bfg.interfaces import IForbiddenView from repoze.bfg.interfaces import INotFoundView from repoze.bfg.interfaces import IRendererFactory -from repoze.bfg.interfaces import IView from repoze.bfg.interfaces import IRouteRequest +from repoze.bfg.interfaces import IView -from repoze.bfg.authentication import RepozeWho1AuthenticationPolicy -from repoze.bfg.authentication import RemoteUserAuthenticationPolicy from repoze.bfg.authentication import AuthTktAuthenticationPolicy +from repoze.bfg.authentication import RemoteUserAuthenticationPolicy +from repoze.bfg.authentication import RepozeWho1AuthenticationPolicy from repoze.bfg.authorization import ACLAuthorizationPolicy from repoze.bfg.configuration import Configurator from repoze.bfg.request import route_request_iface -from repoze.bfg.threadlocal import get_current_registry from repoze.bfg.static import StaticRootFactory +from repoze.bfg.threadlocal import get_current_registry ###################### directives ########################## |
