D5798: py3: account for demand import difference between Python versions
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Fri Feb 1 20:33:28 EST 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb9ce967358eb: py3: account for demand import difference between Python versions (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5798?vs=13684&id=13689
REVISION DETAIL
https://phab.mercurial-scm.org/D5798
AFFECTED FILES
tests/test-extension.t
CHANGE DETAILS
diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -610,7 +610,8 @@
> cmdtable = {}
> command = registrar.command(cmdtable)
>
- > # demand import avoids failure of importing notexist here
+ > # demand import avoids failure of importing notexist here, but only on
+ > # Python 2.
> import extlibroot.lsub1.lsub2.notexist
>
> @command(b'checkrelativity', [], norepo=True)
@@ -622,7 +623,13 @@
> pass # intentional failure
> NO_CHECK_EOF
- $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity)
+Python 3's lazy importer verifies modules exist before returning the lazy
+module stub. Our custom lazy importer for Python 2 always returns a stub.
+
+ $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity) || true
+ *** failed to import extension checkrelativity from $TESTTMP/checkrelativity.py: No module named 'extlibroot.lsub1.lsub2.notexist' (py3 !)
+ hg: unknown command 'checkrelativity' (py3 !)
+ (use 'hg help' for a list of commands) (py3 !)
#endif
To: indygreg, #hg-reviewers
Cc: mjpieters, mercurial-devel
More information about the Mercurial-devel
mailing list