Patchwork [5,of,5,py3] extensions: fix extension module hunting on Python 3

login
register
mail settings
Submitter Augie Fackler
Date Nov. 10, 2016, 10:10 p.m.
Message ID <bfc0c8c65e9cfec70e0e.1478815843@arthedain.pit.corp.google.com>
Download mbox | patch
Permalink /patch/17466/
State Changes Requested
Headers show

Comments

Augie Fackler - Nov. 10, 2016, 10:10 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1476019688 14400
#      Sun Oct 09 09:28:08 2016 -0400
# Node ID bfc0c8c65e9cfec70e0e68e50fb4d1e7c6398a57
# Parent  61d6c1706d3246ea08a4176a5b3d286f498b8054
extensions: fix extension module hunting on Python 3

importlib is a firm believer that paths are really strings, not
bytes. Fortunately we have os.fsdecode to help us with that.

This also makes a few strings r-strings to make them bytes on Py2 and
str on py3. That might be too clever?
Pulkit Goyal - Nov. 11, 2016, 2:13 p.m.
> +    path = os.fsdecode(path)

Using os.fsdecode() will fail in Py2 as that don't exist back then. We
have pycompat.fsdecode to help out is such cases.

Patch

diff --git a/mercurial/extensions.py b/mercurial/extensions.py
--- a/mercurial/extensions.py
+++ b/mercurial/extensions.py
@@ -18,6 +18,7 @@  from .i18n import (
 from . import (
     cmdutil,
     error,
+    pycompat,
     util,
 )
 
@@ -57,8 +58,9 @@  def find(name):
     return mod
 
 def loadpath(path, module_name):
-    module_name = module_name.replace('.', '_')
+    module_name = module_name.replace(r'.', r'_')
     path = util.normpath(util.expandpath(path))
+    path = os.fsdecode(path)
     if os.path.isdir(path):
         # module/__init__.py style
         d, f = os.path.split(path)
@@ -85,7 +87,7 @@  def _importext(name, path=None, reportfu
         # the module will be loaded in sys.modules
         # choose an unique name so that it doesn't
         # conflicts with other modules
-        mod = loadpath(path, 'hgext.%s' % name)
+        mod = loadpath(path, pycompat.sysstr('hgext.%s' % name))
     else:
         try:
             mod = _importh("hgext.%s" % name)