( )⚙ D2154 py3: use system strings when calling __import__

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2154

py3: use system strings when calling __import__
ClosedPublic

Authored by indygreg on Feb 11 2018, 9:35 PM.

Details

Reviewers
pulkit
durin42
Group Reviewers
hg-reviewers
Commits
rHGc4146cf4dd20: py3: use system strings when calling __import__
Summary

We must pass the native str type when importing.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 11 2018, 9:35 PM
pulkit accepted this revision.Feb 12 2018, 2:18 AM
durin42 accepted this revision.Feb 12 2018, 9:26 PM
This revision is now accepted and ready to land.Feb 12 2018, 9:26 PM
Closed by commit rHGc4146cf4dd20: py3: use system strings when calling __import__ (authored by indygreg). · Explain WhyFeb 12 2018, 9:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hook.py (4 lines)

Diff 5455

mercurial/hook.py

if util.mainfrozen(): if util.mainfrozen():
# binary installs require sys.path manipulation # binary installs require sys.path manipulation
modpath, modfile = os.path.split(modname) modpath, modfile = os.path.split(modname)
if modpath and modfile: if modpath and modfile:
sys.path = sys.path[:] + [modpath] sys.path = sys.path[:] + [modpath]
modname = modfile modname = modfile
with demandimport.deactivated(): with demandimport.deactivated():
try: try:
obj = __import__(modname) obj = __import__(pycompat.sysstr(modname))
except (ImportError, SyntaxError): except (ImportError, SyntaxError):
e1 = sys.exc_info() e1 = sys.exc_info()
try: try:
# extensions are loaded with hgext_ prefix # extensions are loaded with hgext_ prefix
obj = __import__("hgext_%s" % modname) obj = __import__(r"hgext_%s" % pycompat.sysstr(modname))
except (ImportError, SyntaxError): except (ImportError, SyntaxError):
e2 = sys.exc_info() e2 = sys.exc_info()
if ui.tracebackflag: if ui.tracebackflag:
ui.warn(_('exception from first failed import ' ui.warn(_('exception from first failed import '
'attempt:\n')) 'attempt:\n'))
ui.traceback(e1) ui.traceback(e1)
if ui.tracebackflag: if ui.tracebackflag:
ui.warn(_('exception from second failed import ' ui.warn(_('exception from second failed import '