Patchwork D7006: py3: stop implicitly importing unicode

login
register
mail settings
Submitter phabricator
Date Oct. 7, 2019, 2:37 p.m.
Message ID <c42df3936e5094efc7ed53c484aff0b5@localhost.localdomain>
Download mbox | patch
Permalink /patch/42056/
State Not Applicable
Headers show

Comments

phabricator - Oct. 7, 2019, 2:37 p.m.
Closed by commit rHGbbcbb82e3589: py3: stop implicitly importing unicode (authored by indygreg).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7006?vs=16921&id=16929

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7006/new/

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

AFFECTED FILES
  mercurial/__init__.py
  mercurial/templatefilters.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py
--- a/mercurial/templatefilters.py
+++ b/mercurial/templatefilters.py
@@ -367,7 +367,7 @@ 
     """Any text. Returns the input text rendered as a sequence of
     XML entities.
     """
-    text = unicode(text, pycompat.sysstr(encoding.encoding), r'replace')
+    text = pycompat.unicode(text, pycompat.sysstr(encoding.encoding), r'replace')
     return b''.join([b'&#%d;' % ord(c) for c in text])
 
 
diff --git a/mercurial/__init__.py b/mercurial/__init__.py
--- a/mercurial/__init__.py
+++ b/mercurial/__init__.py
@@ -171,8 +171,7 @@ 
                 r, c = t.start
                 l = (
                     b'; from mercurial.pycompat import '
-                    b'delattr, getattr, hasattr, setattr, '
-                    b'unicode\n'
+                    b'delattr, getattr, hasattr, setattr\n'
                 )
                 for u in tokenize.tokenize(io.BytesIO(l).readline):
                     if u.type in (tokenize.ENCODING, token.ENDMARKER):
@@ -221,7 +220,7 @@ 
     # ``replacetoken`` or any mechanism that changes semantics of module
     # loading is changed. Otherwise cached bytecode may get loaded without
     # the new transformation mechanisms applied.
-    BYTECODEHEADER = b'HG\x00\x0d'
+    BYTECODEHEADER = b'HG\x00\x0e'
 
     class hgloader(importlib.machinery.SourceFileLoader):
         """Custom module loader that transforms source code.