[PATCH 6 of 6 py3 v4] policy: try and always have a bytes for module policy

Yuya Nishihara yuya at tcha.org
Sat Mar 11 15:24:50 EST 2017


On Sat, 11 Mar 2017 14:39:18 -0500, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <raf at durin42.com>
> # Date 1489014701 18000
> #      Wed Mar 08 18:11:41 2017 -0500
> # Node ID 8d5ff388fd05e57922214f3d6e9a80020ad34970
> # Parent  f4179c62dc3fee6dadd8451214ad565986c3b149
> policy: try and always have a bytes for module policy
> 
> debuginstall now runs cleanly in Python 3.

Great. Queued, thanks.

> --- 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'

Foozy noticed __init__.py should be eventually updated as well, but that isn't
a blocker.

Just for reference, __init__.py and policy.py are loaded before our custom
importer is enabled.


More information about the Mercurial-devel mailing list