Mercurial > public > mercurial-scm > hg
diff mercurial/thirdparty/zope/interface/declarations.py @ 37178:68ee61822182
thirdparty: port zope.interface to relative imports
By using relative imports, we're guaranteed to get modules
vendored with Mercurial rather than other random modules
that might be in sys.path.
My editor strips trailing whitespace on save. So some minor
source code cleanup was also performed as part of this commit.
# no-check-commit because some modified lines have double newlines
Differential Revision: https://phab.mercurial-scm.org/D2930
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Wed, 21 Mar 2018 19:52:30 -0700 |
| parents | 943d77fc07a3 |
| children | 49630e75635d |
line wrap: on
line diff
--- a/mercurial/thirdparty/zope/interface/declarations.py Wed Mar 21 19:49:07 2018 -0700 +++ b/mercurial/thirdparty/zope/interface/declarations.py Wed Mar 21 19:52:30 2018 -0700 @@ -24,6 +24,8 @@ provided by objects. """ +from __future__ import absolute_import + __docformat__ = 'restructuredtext' import sys @@ -32,12 +34,12 @@ from types import ModuleType import weakref -from zope.interface.advice import addClassAdvisor -from zope.interface.interface import InterfaceClass -from zope.interface.interface import SpecificationBase -from zope.interface.interface import Specification -from zope.interface._compat import CLASS_TYPES as DescriptorAwareMetaClasses -from zope.interface._compat import PYTHON3 +from .advice import addClassAdvisor +from .interface import InterfaceClass +from .interface import SpecificationBase +from .interface import Specification +from ._compat import CLASS_TYPES as DescriptorAwareMetaClasses +from ._compat import PYTHON3 # Registry of class-implementation specifications BuiltinImplementationSpecifications = {} @@ -638,11 +640,11 @@ # Try to get C base: try: - import zope.interface._zope_interface_coptimizations + from . import _zope_interface_coptimizations except ImportError: pass else: - from zope.interface._zope_interface_coptimizations import ClassProvidesBase + from ._zope_interface_coptimizations import ClassProvidesBase class ClassProvides(Declaration, ClassProvidesBase): @@ -915,15 +917,15 @@ _empty = Declaration() try: - import zope.interface._zope_interface_coptimizations + from . import _zope_interface_coptimizations except ImportError: pass else: - from zope.interface._zope_interface_coptimizations import implementedBy - from zope.interface._zope_interface_coptimizations import providedBy - from zope.interface._zope_interface_coptimizations import ( + from ._zope_interface_coptimizations import implementedBy + from ._zope_interface_coptimizations import providedBy + from ._zope_interface_coptimizations import ( getObjectSpecification) - from zope.interface._zope_interface_coptimizations import ( + from ._zope_interface_coptimizations import ( ObjectSpecificationDescriptor) objectSpecificationDescriptor = ObjectSpecificationDescriptor()