Mercurial > public > mercurial-scm > hg
diff mercurial/thirdparty/zope/interface/adapter.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 |
line wrap: on
line diff
--- a/mercurial/thirdparty/zope/interface/adapter.py Wed Mar 21 19:49:07 2018 -0700 +++ b/mercurial/thirdparty/zope/interface/adapter.py Wed Mar 21 19:52:30 2018 -0700 @@ -13,16 +13,18 @@ ############################################################################## """Adapter management """ +from __future__ import absolute_import + import weakref -from zope.interface import implementer -from zope.interface import providedBy -from zope.interface import Interface -from zope.interface import ro -from zope.interface.interfaces import IAdapterRegistry +from . import implementer +from . import providedBy +from . import Interface +from . import ro +from .interfaces import IAdapterRegistry -from zope.interface._compat import _normalize_name -from zope.interface._compat import STRING_TYPES +from ._compat import _normalize_name +from ._compat import STRING_TYPES _BLANK = u'' @@ -409,7 +411,7 @@ LookupBasePy = LookupBaseFallback # BBB try: - from zope.interface._zope_interface_coptimizations import LookupBase + from ._zope_interface_coptimizations import LookupBase except ImportError: LookupBase = LookupBaseFallback @@ -445,7 +447,7 @@ VerifyingBasePy = VerifyingBaseFallback #BBB try: - from zope.interface._zope_interface_coptimizations import VerifyingBase + from ._zope_interface_coptimizations import VerifyingBase except ImportError: VerifyingBase = VerifyingBaseFallback