Patchwork [8,of,8,py3,v3] policy: try and always have a bytes for module policy

login
register
mail settings
Submitter Augie Fackler
Date March 8, 2017, 11:22 p.m.
Message ID <51474edf0b672b9152d5.1489015367@augie-macbookair2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/19038/
State Accepted
Headers show

Comments

Augie Fackler - March 8, 2017, 11:22 p.m.
# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1489014701 18000
#      Wed Mar 08 18:11:41 2017 -0500
# Node ID 51474edf0b672b9152d51a042df8b1161ef41fb1
# Parent  eefc1048d292cda28d4493ac5a6ea56c68fed1e2
policy: try and always have a bytes for module policy

debuginstall now runs cleanly in Python 3.

Patch

diff --git a/mercurial/policy.py b/mercurial/policy.py
--- a/mercurial/policy.py
+++ b/mercurial/policy.py
@@ -39,7 +39,7 @@  if '__pypy__' in sys.builtin_module_name
 # Our C extensions aren't yet compatible with Python 3. So use pure Python
 # on Python 3 for now.
 if sys.version_info[0] >= 3:
-    policy = 'py'
+    policy = b'py'
 
 # Environment variable can always force settings.
 policy = os.environ.get('HGMODULEPOLICY', policy)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -367,7 +367,7 @@  class hgbuildpy(build_py):
             modulepolicy = 'c'
         with open("mercurial/__modulepolicy__.py", "w") as f:
             f.write('# this file is autogenerated by setup.py\n')
-            f.write('modulepolicy = "%s"\n' % modulepolicy)
+            f.write('modulepolicy = b"%s"\n' % modulepolicy)
 
         build_py.run(self)
 
diff --git a/tests/test-check-py3-commands.t b/tests/test-check-py3-commands.t
--- a/tests/test-check-py3-commands.t
+++ b/tests/test-check-py3-commands.t
@@ -11,7 +11,7 @@  The full traceback is hidden to have a s
   version
   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   debuginstall
-  TypeError: Can't convert 'bytes' object to str implicitly
+  no problems detected
 
   $ cat > included-hgrc <<EOF
   > [extensions]