Patchwork D6614: py3: don't run source transformer on hgext3rd (extensions)

login
register
mail settings
Submitter phabricator
Date July 8, 2019, 4:52 p.m.
Message ID <differential-rev-PHID-DREV-zlue5afovvxscpp745hi-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/40812/
State Superseded
Headers show

Comments

phabricator - July 8, 2019, 4:52 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  It's unclear why the source transformer runs on hgext3rd. It's been
  like that since it was introduced in 1c22400db72d <https://phab.mercurial-scm.org/rHG1c22400db72de4bbeb992fde534c0abbe1367b03> (mercurial:
  implement a source transforming module loader on Python 3,
  2016-07-04), and that commit didn't say anything about it (but it says
  that it doesn't have "support [...] for extensions").
  
  I find that the current handling of hgext3rd just makes it harder to
  convert extensions to Python 3. It makes you convert a bunch of
  strings passed to getattr() and kwargs[] to r'' that could otherwise
  have been left alone. It's also really confusing that the source
  transformer runs when you import the extension as "extensions.foo=",
  but not as "extension.foo=/some/path".
  
  I suppose there is small number of (very simple) extensions that would
  have worked without this patch that would now be broken. It seems okay
  to me to break those.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/__init__.py
  relnotes/next

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/relnotes/next b/relnotes/next
--- a/relnotes/next
+++ b/relnotes/next
@@ -73,3 +73,7 @@ 
    `addunfinished()` in `state` module.
 
  * `cmdutil.checkunfinished()` now includes detection for merge too.
+
+ * We used to automatically attempt to make extensions compatible with
+   Python 3 (by translating their source code while loading it). We no
+   longer do that.
diff --git a/mercurial/__init__.py b/mercurial/__init__.py
--- a/mercurial/__init__.py
+++ b/mercurial/__init__.py
@@ -29,7 +29,7 @@ 
         """A sys.meta_path finder that uses a custom module loader."""
         def find_spec(self, fullname, path, target=None):
             # Only handle Mercurial-related modules.
-            if not fullname.startswith(('mercurial.', 'hgext.', 'hgext3rd.')):
+            if not fullname.startswith(('mercurial.', 'hgext.')):
                 return None
             # don't try to parse binary
             if fullname.startswith('mercurial.cext.'):