##// END OF EJS Templates
py3: use system strings when calling __import__...
Gregory Szorc -
r36125:c4146cf4 default
parent child Browse files
Show More
@@ -49,12 +49,12 b' def _pythonhook(ui, repo, htype, hname, '
49 modname = modfile
49 modname = modfile
50 with demandimport.deactivated():
50 with demandimport.deactivated():
51 try:
51 try:
52 obj = __import__(modname)
52 obj = __import__(pycompat.sysstr(modname))
53 except (ImportError, SyntaxError):
53 except (ImportError, SyntaxError):
54 e1 = sys.exc_info()
54 e1 = sys.exc_info()
55 try:
55 try:
56 # extensions are loaded with hgext_ prefix
56 # extensions are loaded with hgext_ prefix
57 obj = __import__("hgext_%s" % modname)
57 obj = __import__(r"hgext_%s" % pycompat.sysstr(modname))
58 except (ImportError, SyntaxError):
58 except (ImportError, SyntaxError):
59 e2 = sys.exc_info()
59 e2 = sys.exc_info()
60 if ui.tracebackflag:
60 if ui.tracebackflag:
General Comments 0
You need to be logged in to leave comments. Login now