Patchwork [7,of,8,py3] encoding: make wide character class list a sysstr

login
register
mail settings
Submitter Augie Fackler
Date May 28, 2017, 8:59 p.m.
Message ID <99ca209bad39793fa60f.1496005143@imladris.local>
Download mbox | patch
Permalink /patch/21005/
State Accepted
Headers show

Comments

Augie Fackler - May 28, 2017, 8:59 p.m.
# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1495992449 14400
#      Sun May 28 13:27:29 2017 -0400
# Node ID 99ca209bad39793fa60f226ffe35a88ef7b0d004
# Parent  2faf46402f149abebd3e47f854185dc2d83f53b9
encoding: make wide character class list a sysstr

That's what east_asian_width returns, so just match it.

Patch

diff --git a/mercurial/encoding.py b/mercurial/encoding.py
--- a/mercurial/encoding.py
+++ b/mercurial/encoding.py
@@ -194,8 +194,8 @@  if not _nativeenviron:
                    for k, v in os.environ.items())  # re-exports
 
 # How to treat ambiguous-width characters. Set to 'wide' to treat as wide.
-wide = (environ.get("HGENCODINGAMBIGUOUS", "narrow") == "wide"
-        and "WFA" or "WF")
+wide = _sysstr(environ.get("HGENCODINGAMBIGUOUS", "narrow") == "wide"
+               and "WFA" or "WF")
 
 def colwidth(s):
     "Find the column width of a string for display in the local encoding"