This is an archive of the discontinued Mercurial Phabricator instance.

Differential D445

demandimport: move HGDEMANDIMPORT test to __init__.py
ClosedPublic

Authored by quark on Aug 18 2017, 2:11 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8fb5212652ec: demandimport: move HGDEMANDIMPORT test to __init__.py
Summary

The logic is now shared between demandimport{2,3}.

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

quark created this revision.Aug 18 2017, 2:11 PM
Closed by commit rHG8fb5212652ec: demandimport: move HGDEMANDIMPORT test to __init__.py (authored by quark). · Explain WhyAug 19 2017, 2:57 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1086

hgdemandimport/__init__.py

# hgdemandimport - global demand-loading of modules for Mercurial # hgdemandimport - global demand-loading of modules for Mercurial
# #
# Copyright 2017 Facebook Inc. # Copyright 2017 Facebook Inc.
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
'''demandimport - automatic demand-loading of modules''' '''demandimport - automatic demand-loading of modules'''
# This is in a separate package from mercurial because in Python 3, # This is in a separate package from mercurial because in Python 3,
# demand loading is per-package. Keeping demandimport in the mercurial package # demand loading is per-package. Keeping demandimport in the mercurial package
# would disable demand loading for any modules in mercurial. # would disable demand loading for any modules in mercurial.
from __future__ import absolute_import from __future__ import absolute_import
import os
import sys import sys
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
from . import demandimportpy3 as demandimport from . import demandimportpy3 as demandimport
else: else:
from . import demandimportpy2 as demandimport from . import demandimportpy2 as demandimport
# Extensions can add to this list if necessary. # Extensions can add to this list if necessary.
# _ctypes.pointer is shadowed by "from ... import pointer" (PyPy 5) # _ctypes.pointer is shadowed by "from ... import pointer" (PyPy 5)
'_ctypes.pointer', '_ctypes.pointer',
]) ])
demandimport.init(ignore) demandimport.init(ignore)
# Re-export. # Re-export.
isenabled = demandimport.isenabled isenabled = demandimport.isenabled
enable = demandimport.enable
disable = demandimport.disable disable = demandimport.disable
deactivated = demandimport.deactivated deactivated = demandimport.deactivated
def enable():
if os.environ.get('HGDEMANDIMPORT') != 'disable':
demandimport.enable()

hgdemandimport/demandimportpy2.py

from a import * from a import *
b = __import__(a) b = __import__(a)
''' '''
from __future__ import absolute_import from __future__ import absolute_import
import __builtin__ as builtins import __builtin__ as builtins
import contextlib import contextlib
import os
import sys import sys
contextmanager = contextlib.contextmanager contextmanager = contextlib.contextmanager
_origimport = __import__ _origimport = __import__
nothing = object() nothing = object()
global ignore global ignore
ignore = ignorelist ignore = ignorelist
def isenabled(): def isenabled():
return builtins.__import__ == _demandimport return builtins.__import__ == _demandimport
def enable(): def enable():
"enable global demand-loading of modules" "enable global demand-loading of modules"
if os.environ.get('HGDEMANDIMPORT') != 'disable':
builtins.__import__ = _demandimport builtins.__import__ = _demandimport
def disable(): def disable():
"disable global demand-loading of modules" "disable global demand-loading of modules"
builtins.__import__ = _origimport builtins.__import__ = _origimport
@contextmanager @contextmanager
def deactivated(): def deactivated():
"context manager for disabling demandimport in 'with' blocks" "context manager for disabling demandimport in 'with' blocks"

hgdemandimport/demandimportpy3.py

practice, we only expect builtins to be loaded before demandimport is practice, we only expect builtins to be loaded before demandimport is
enabled. enabled.
""" """
# This line is unnecessary, but it satisfies test-check-py3-compat.t. # This line is unnecessary, but it satisfies test-check-py3-compat.t.
from __future__ import absolute_import from __future__ import absolute_import
import contextlib import contextlib
import os
import sys import sys
import importlib.abc import importlib.abc
import importlib.machinery import importlib.machinery
import importlib.util import importlib.util
_deactivated = False _deactivated = False
def disable(): def disable():
try: try:
while True: while True:
sys.path_hooks.remove(_makefinder) sys.path_hooks.remove(_makefinder)
except ValueError: except ValueError:
pass pass
def enable(): def enable():
if os.environ.get('HGDEMANDIMPORT') != 'disable':
sys.path_hooks.insert(0, _makefinder) sys.path_hooks.insert(0, _makefinder)
@contextlib.contextmanager @contextlib.contextmanager
def deactivated(): def deactivated():
# This implementation is a bit different from Python 2's. Python 3 # This implementation is a bit different from Python 2's. Python 3
# maintains a per-package finder cache in sys.path_importer_cache (see # maintains a per-package finder cache in sys.path_importer_cache (see
# PEP 302). This means that we can't just call disable + enable. # PEP 302). This means that we can't just call disable + enable.
# If we do that, in situations like: # If we do that, in situations like:
# #