Skip to content

Commit

Permalink
Use relative imports
Browse files Browse the repository at this point in the history
see #60
  • Loading branch information
Brian Sutherland committed Nov 15, 2016
1 parent bcc55d4 commit 0a5748f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/zope/interface/adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ def subscriptions(self, required, provided):
LookupBasePy = LookupBaseFallback # BBB

try:
from _zope_interface_coptimizations import LookupBase
from ._zope_interface_coptimizations import LookupBase
except ImportError: #pragma NO COVER
LookupBase = LookupBaseFallback

Expand Down Expand Up @@ -434,7 +434,7 @@ def subscriptions(self, required, provided):
VerifyingBasePy = VerifyingBaseFallback #BBB

try:
from _zope_interface_coptimizations import VerifyingBase
from ._zope_interface_coptimizations import VerifyingBase
except ImportError: #pragma NO COVER
VerifyingBase = VerifyingBaseFallback

Expand Down
14 changes: 7 additions & 7 deletions src/zope/interface/declarations.py
Original file line number Diff line number Diff line change
Expand Up @@ -640,11 +640,11 @@ def __get__(self, inst, cls):

# Try to get C base:
try:
import _zope_interface_coptimizations
from . import _zope_interface_coptimizations
except ImportError: #pragma NO COVERAGE
pass
else: #pragma NO COVERAGE
from _zope_interface_coptimizations import ClassProvidesBase
from ._zope_interface_coptimizations import ClassProvidesBase


class ClassProvides(Declaration, ClassProvidesBase):
Expand Down Expand Up @@ -917,13 +917,13 @@ def _normalizeargs(sequence, output = None):
_empty = Declaration()

try:
import _zope_interface_coptimizations
from . import _zope_interface_coptimizations
except ImportError: #pragma NO COVER
pass
else: #pragma NO COVER PyPy
from _zope_interface_coptimizations import implementedBy
from _zope_interface_coptimizations import providedBy
from _zope_interface_coptimizations import getObjectSpecification
from _zope_interface_coptimizations import ObjectSpecificationDescriptor
from ._zope_interface_coptimizations import implementedBy
from ._zope_interface_coptimizations import providedBy
from ._zope_interface_coptimizations import getObjectSpecification
from ._zope_interface_coptimizations import ObjectSpecificationDescriptor

objectSpecificationDescriptor = ObjectSpecificationDescriptor()
6 changes: 3 additions & 3 deletions src/zope/interface/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def isOrExtends(self, interface):

SpecificationBase = SpecificationBasePy
try:
from _zope_interface_coptimizations import SpecificationBase
from ._zope_interface_coptimizations import SpecificationBase
except ImportError: #pragma NO COVER
pass

Expand Down Expand Up @@ -155,14 +155,14 @@ def __adapt__(self, obj):

InterfaceBase = InterfaceBasePy
try:
from _zope_interface_coptimizations import InterfaceBase
from ._zope_interface_coptimizations import InterfaceBase
except ImportError: #pragma NO COVER
pass


adapter_hooks = []
try:
from _zope_interface_coptimizations import adapter_hooks
from ._zope_interface_coptimizations import adapter_hooks
except ImportError: #pragma NO COVER
pass

Expand Down
12 changes: 12 additions & 0 deletions src/zope/interface/tests/test_optimizations.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from platform import python_implementation
import unittest

class TestOptimizations(unittest.TestCase):

def test_optimizations(self):
if python_implementation() != 'CPython':
return
from zope.interface import _zope_interface_coptimizations
from zope.interface.adapter import LookupBase
self.assertTrue(LookupBase is _zope_interface_coptimizations.LookupBase)

0 comments on commit 0a5748f

Please sign in to comment.