# HG changeset patch # User Yuya Nishihara # Date 2017-07-16 08:47:10 # Node ID c384ac3ea147adbd590553efb65b453eecfa05ed # Parent 6a3e83781c6ed30ffd1e7ab84d6b95b8ac084ea1 tests: drop "absimport" conditionals which should be always true diff --git a/tests/hghave.py b/tests/hghave.py --- a/tests/hghave.py +++ b/tests/hghave.py @@ -585,12 +585,6 @@ def has_debhelper(): def has_demandimport(): return os.environ.get('HGDEMANDIMPORT') != 'disable' -@check("absimport", "absolute_import in __future__") -def has_absimport(): - import __future__ - from mercurial import util - return util.safehasattr(__future__, "absolute_import") - @check("py3k", "running with Python 3.x") def has_py3k(): return 3 == sys.version_info[0] diff --git a/tests/test-extension.t b/tests/test-extension.t --- a/tests/test-extension.t +++ b/tests/test-extension.t @@ -164,7 +164,6 @@ Check "from __future__ import absolute_i $ touch $TESTTMP/libroot/mod/__init__.py $ echo "s = 'libroot/mod/ambig.py'" > $TESTTMP/libroot/mod/ambig.py -#if absimport $ cat > $TESTTMP/libroot/mod/ambigabs.py < from __future__ import absolute_import > import ambig # should load "libroot/ambig.py" @@ -178,7 +177,6 @@ Check "from __future__ import absolute_i $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadabs=loadabs.py root) ambigabs.s=libroot/ambig.py $TESTTMP/a (glob) -#endif #if no-py3k $ cat > $TESTTMP/libroot/mod/ambigrel.py <