( )⚙ D5798 py3: account for demand import difference between Python versions

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5798

py3: account for demand import difference between Python versions
ClosedPublic

Authored by indygreg on Feb 1 2019, 8:17 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb0865b5919c6: py3: account for demand import difference between Python versions
rHGf5377e08d25c: py3: account for demand import difference between Python versions
rHG4764e2e699ea: py3: account for demand import difference between Python versions
rHGb9ce967358eb: py3: account for demand import difference between Python versions
Summary

Our lazy importer for Python 3 will validate that modules are
loadable before returning a stub module object. This is different
from Python 2, which will always return a stub module object.

While we could change behavior of the Python 3 demand importer,
that seems like a problem for another day.

This commit teaches test-extension.t about that difference in
behavior.

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.Feb 1 2019, 8:17 PM
Closed by commit rHGb9ce967358eb: py3: account for demand import difference between Python versions (authored by indygreg). · Explain WhyFeb 1 2019, 8:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-extension.t (11 lines)

Diff 13689

tests/test-extension.t

> text = 'notexist.py at root is loaded unintentionally\n' > text = 'notexist.py at root is loaded unintentionally\n'
> NO_CHECK_EOF > NO_CHECK_EOF
$ cat > $TESTTMP/checkrelativity.py <<NO_CHECK_EOF $ cat > $TESTTMP/checkrelativity.py <<NO_CHECK_EOF
> from mercurial import registrar > from mercurial import registrar
> cmdtable = {} > cmdtable = {}
> command = registrar.command(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 > import extlibroot.lsub1.lsub2.notexist
> >
> @command(b'checkrelativity', [], norepo=True) > @command(b'checkrelativity', [], norepo=True)
> def checkrelativity(ui, *args, **opts): > def checkrelativity(ui, *args, **opts):
> try: > try:
> ui.write(extlibroot.lsub1.lsub2.notexist.text) > ui.write(extlibroot.lsub1.lsub2.notexist.text)
> return 1 # unintentional success > return 1 # unintentional success
> except ImportError: > except ImportError:
> pass # intentional failure > pass # intentional failure
> NO_CHECK_EOF > 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 #endif
(Here, module importing tests are finished. Therefore, use other than (Here, module importing tests are finished. Therefore, use other than
NO_CHECK_* limit mark for heredoc python files, in order to apply NO_CHECK_* limit mark for heredoc python files, in order to apply
import-checker.py or so on their contents) import-checker.py or so on their contents)
Make sure a broken uisetup doesn't globally break hg: Make sure a broken uisetup doesn't globally break hg: