diff options
Diffstat (limited to 'src/zope')
| -rw-r--r-- | src/zope/proxy/__init__.py | 13 | ||||
| -rw-r--r-- | src/zope/proxy/_compat.py | 1 | ||||
| -rw-r--r-- | src/zope/proxy/decorator.py | 8 | ||||
| -rw-r--r-- | src/zope/proxy/tests/test_decorator.py | 2 | ||||
| -rw-r--r-- | src/zope/proxy/tests/test_proxy.py | 6 |
5 files changed, 19 insertions, 11 deletions
diff --git a/src/zope/proxy/__init__.py b/src/zope/proxy/__init__.py index d17187a..3fc4b53 100644 --- a/src/zope/proxy/__init__.py +++ b/src/zope/proxy/__init__.py @@ -18,8 +18,10 @@ import os import pickle from zope.interface import moduleProvides + from zope.proxy.interfaces import IProxyIntrospection + moduleProvides(IProxyIntrospection) __all__ = tuple(IProxyIntrospection) @@ -544,17 +546,16 @@ class PyNonOverridable(object): if _c_available: # pragma: no cover # Python API: not used in this module + # API for proxy-using C extensions. + from zope.proxy._zope_proxy_proxy import _CAPI # noqa: F401 unused from zope.proxy._zope_proxy_proxy import ProxyBase from zope.proxy._zope_proxy_proxy import getProxiedObject - from zope.proxy._zope_proxy_proxy import setProxiedObject from zope.proxy._zope_proxy_proxy import isProxy - from zope.proxy._zope_proxy_proxy import sameProxiedObjects - from zope.proxy._zope_proxy_proxy import queryProxy from zope.proxy._zope_proxy_proxy import queryInnerProxy + from zope.proxy._zope_proxy_proxy import queryProxy from zope.proxy._zope_proxy_proxy import removeAllProxies - - # API for proxy-using C extensions. - from zope.proxy._zope_proxy_proxy import _CAPI # noqa: F401 unused + from zope.proxy._zope_proxy_proxy import sameProxiedObjects + from zope.proxy._zope_proxy_proxy import setProxiedObject else: # no C extension available, fall back diff --git a/src/zope/proxy/_compat.py b/src/zope/proxy/_compat.py index bbd91c3..4f0b0e3 100644 --- a/src/zope/proxy/_compat.py +++ b/src/zope/proxy/_compat.py @@ -1,3 +1,4 @@ import sys + PY3 = sys.version_info[0] >= 3 diff --git a/src/zope/proxy/decorator.py b/src/zope/proxy/decorator.py index 9a53dfb..178687e 100644 --- a/src/zope/proxy/decorator.py +++ b/src/zope/proxy/decorator.py @@ -18,11 +18,13 @@ additional features. """ __docformat__ = "reStructuredText" -from zope.proxy import getProxiedObject, ProxyBase +from zope.interface import providedBy +from zope.interface.declarations import ObjectSpecification from zope.interface.declarations import ObjectSpecificationDescriptor from zope.interface.declarations import getObjectSpecification -from zope.interface.declarations import ObjectSpecification -from zope.interface import providedBy + +from zope.proxy import ProxyBase +from zope.proxy import getProxiedObject class DecoratorSpecificationDescriptor(ObjectSpecificationDescriptor): diff --git a/src/zope/proxy/tests/test_decorator.py b/src/zope/proxy/tests/test_decorator.py index a2a27ee..6d6c8f9 100644 --- a/src/zope/proxy/tests/test_decorator.py +++ b/src/zope/proxy/tests/test_decorator.py @@ -65,6 +65,7 @@ class DecoratorSpecificationDescriptorTests(unittest.TestCase): from zope.interface import Interface from zope.interface import implementer from zope.interface import provider + from zope.proxy import ProxyBase class IContextFactory(Interface): @@ -86,6 +87,7 @@ class DecoratorSpecificationDescriptorTests(unittest.TestCase): from zope.interface import Interface from zope.interface import implementer from zope.interface import provider + from zope.proxy import ProxyBase class IContextFactory(Interface): diff --git a/src/zope/proxy/tests/test_proxy.py b/src/zope/proxy/tests/test_proxy.py index 9d21d3a..973cb2c 100644 --- a/src/zope/proxy/tests/test_proxy.py +++ b/src/zope/proxy/tests/test_proxy.py @@ -15,6 +15,7 @@ """ import unittest + try: import zope.security except ImportError: # pragma: no cover @@ -30,6 +31,7 @@ class ModuleConformanceCase(unittest.TestCase): def test_module_conforms_to_IProxyIntrospection(self): from zope.interface.verify import verifyObject + import zope.proxy from zope.proxy.interfaces import IProxyIntrospection verifyObject(IProxyIntrospection, zope.proxy) @@ -1133,8 +1135,8 @@ class Test_py_sameProxiedObjects(unittest.TestCase): return PyProxyBase(obj) def _makeSecurityProxy(self, obj): - from zope.security.proxy import ProxyPy from zope.security.checker import CheckerPy + from zope.security.proxy import ProxyPy checker = CheckerPy({}) return ProxyPy(obj, checker) @@ -1231,8 +1233,8 @@ class Test_sameProxiedObjects(Test_py_sameProxiedObjects): return ProxyBase(obj) def _makeSecurityProxy(self, obj): - from zope.security.proxy import Proxy from zope.security.checker import Checker + from zope.security.proxy import Proxy checker = Checker({}) return Proxy(obj, checker) |