@@ -40,22 +40,23 @@
class _demandmod(object):
"""module demand-loader and proxy"""
- def __init__(self, name, globals, locals):
+ def __init__(self, name, globals, locals, level=-1):
if '.' in name:
head, rest = name.split('.', 1)
after = [rest]
else:
head = name
after = []
- object.__setattr__(self, "_data", (head, globals, locals, after))
+ object.__setattr__(self, "_data",
+ (head, globals, locals, after, level))
object.__setattr__(self, "_module", None)
def _extend(self, name):
"""add to the list of submodules to load"""
self._data[3].append(name)
def _load(self):
if not self._module:
- head, globals, locals, after = self._data
- mod = _origimport(head, globals, locals)
+ head, globals, locals, after, level = self._data
+ mod = _import(head, globals, locals, None, level)
# load submodules
def subload(mod, p):
h, t = p, None
@@ -105,7 +106,7 @@
if isinstance(locals[base], _demandmod):
locals[base]._extend(rest)
return locals[base]
- return _demandmod(name, globals, locals)
+ return _demandmod(name, globals, locals, level)
else:
if level != -1:
# from . import b,c,d or from .a import b,c,d
@@ -129,6 +129,36 @@
$ echo 'foo = !' >> $HGRCPATH
$ echo 'bar = !' >> $HGRCPATH
+Check "from __future__ import absolute_import" support for external libraries
+
+#if absimport
+ $ mkdir $TESTTMP/libroot
+ $ echo "s = 'libroot/ambig.py'" > $TESTTMP/libroot/ambig.py
+ $ mkdir $TESTTMP/libroot/mod
+ $ touch $TESTTMP/libroot/mod/__init__.py
+ $ echo "s = 'libroot/mod/ambig.py'" > $TESTTMP/libroot/mod/ambig.py
+ $ cat > $TESTTMP/libroot/mod/ambigabs.py <<EOF
+ > from __future__ import absolute_import
+ > import ambig # shoud load "libroot/ambig.py"
+ > s = ambig.s
+ > EOF
+ $ cat > $TESTTMP/libroot/mod/ambigrel.py <<EOF
+ > import ambig # should load "libroot/mod/ambig.py"
+ > s = ambig.s
+ > EOF
+ $ cat > absload.py <<EOF
+ > import mod.ambigabs as ambigabs
+ > import mod.ambigrel as ambigrel
+ > def extsetup():
+ > print 'ambigabs.s=%s' % ambigabs.s
+ > print 'ambigrel.s=%s' % ambigrel.s
+ > EOF
+ $ (PYTHONPATH=$PYTHONPATH:$TESTTMP/libroot; hg --config extensions.absload=absload.py id --id)
+ ambigabs.s=libroot/ambig.py
+ ambigrel.s=libroot/mod/ambig.py
+ c24b9ac61126
+#endif
+
$ cd ..
hide outer repo