This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2980

zope: force module import by importing symbols
ClosedPublic

Authored by indygreg on Mar 30 2018, 4:53 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGb9dd8403d8ff: zope: force module import by importing symbols
Summary

Previously, we tried to import a module and handle the ImportError.
Our lazy module importer doesn't verify the module exists and returns
a dummy object representing the module. Only once we attempt to load
a symbol in the module does the ImportError get raises.

This means that simple imports inside try..except ImportError don't
detect missing modules.

This commit changes imports in zope.interface to access symbols, thus
forcing module load and triggering ImportError.

This fixes zope.interface for pure builds.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 30 2018, 4:53 PM
martinvonz accepted this revision.Mar 30 2018, 4:57 PM
This revision is now accepted and ready to land.Mar 30 2018, 4:57 PM
Closed by commit rHGb9dd8403d8ff: zope: force module import by importing symbols (authored by indygreg). · Explain WhyMar 30 2018, 4:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 7443

mercurial/thirdparty/zope/interface/declarations.py

raise AttributeError('__provides__') raise AttributeError('__provides__')
ClassProvidesBasePy = ClassProvidesBaseFallback # BBB ClassProvidesBasePy = ClassProvidesBaseFallback # BBB
ClassProvidesBase = ClassProvidesBaseFallback ClassProvidesBase = ClassProvidesBaseFallback
# Try to get C base: # Try to get C base:
try: try:
from . import _zope_interface_coptimizations from ._zope_interface_coptimizations import ClassProvidesBase
except ImportError: except ImportError:
pass pass
else:
from ._zope_interface_coptimizations import ClassProvidesBase
class ClassProvides(Declaration, ClassProvidesBase): class ClassProvides(Declaration, ClassProvidesBase):
"""Special descriptor for class __provides__ """Special descriptor for class __provides__
The descriptor caches the implementedBy info, so that The descriptor caches the implementedBy info, so that
we can get declarations for objects without instance-specific we can get declarations for objects without instance-specific
interfaces a bit quicker. interfaces a bit quicker.
""" """
for v in sequence: for v in sequence:
_normalizeargs(v, output) _normalizeargs(v, output)
return output return output
_empty = Declaration() _empty = Declaration()
try: try:
from . import _zope_interface_coptimizations from ._zope_interface_coptimizations import (
getObjectSpecification,
implementedBy,
ObjectSpecificationDescriptor,
providedBy,
)
except ImportError: except ImportError:
pass pass
else:
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() objectSpecificationDescriptor = ObjectSpecificationDescriptor()