diff -r 37acdf027ae2 -r 8a17c541177f mercurial/policy.py --- a/mercurial/policy.py Sun Mar 12 11:47:02 2017 -0700 +++ b/mercurial/policy.py Mon Mar 13 04:06:36 2017 +0900 @@ -19,9 +19,9 @@ # py - only load pure Python modules # # By default, require the C extensions for performance reasons. -policy = 'c' -policynoc = ('cffi', 'cffi-allow', 'py') -policynocffi = ('c', 'py') +policy = b'c' +policynoc = (b'cffi', b'cffi-allow', b'py') +policynocffi = (b'c', b'py') try: from . import __modulepolicy__ @@ -42,4 +42,8 @@ policy = b'py' # Environment variable can always force settings. -policy = os.environ.get('HGMODULEPOLICY', policy) +if sys.version_info[0] >= 3: + if 'HGMODULEPOLICY' in os.environ: + policy = os.environ['HGMODULEPOLICY'].encode('utf-8') +else: + policy = os.environ.get('HGMODULEPOLICY', policy)