Patchwork D2154: py3: use system strings when calling __import__

login
register
mail settings
Submitter phabricator
Date Feb. 13, 2018, 2:47 a.m.
Message ID <ed66944e9aac36edea32f55eb7837f00@localhost.localdomain>
Download mbox | patch
Permalink /patch/27757/
State Not Applicable
Headers show

Comments

phabricator - Feb. 13, 2018, 2:47 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc4146cf4dd20: py3: use system strings when calling __import__ (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2154?vs=5455&id=5579

REVISION DETAIL
  https://phab.mercurial-scm.org/D2154

AFFECTED FILES
  mercurial/hook.py

CHANGE DETAILS




To: indygreg, #hg-reviewers, pulkit, durin42
Cc: mercurial-devel

Patch

diff --git a/mercurial/hook.py b/mercurial/hook.py
--- a/mercurial/hook.py
+++ b/mercurial/hook.py
@@ -49,12 +49,12 @@ 
                 modname = modfile
         with demandimport.deactivated():
             try:
-                obj = __import__(modname)
+                obj = __import__(pycompat.sysstr(modname))
             except (ImportError, SyntaxError):
                 e1 = sys.exc_info()
                 try:
                     # extensions are loaded with hgext_ prefix
-                    obj = __import__("hgext_%s" % modname)
+                    obj = __import__(r"hgext_%s" % pycompat.sysstr(modname))
                 except (ImportError, SyntaxError):
                     e2 = sys.exc_info()
                     if ui.tracebackflag: