# HG changeset patch # User Augie Fackler # Date 1311625183 18000 # Node ID 61807854004e1ef55edff18955710061e8d3c79b # Parent 144e97421f6bfafbe641291a5deca38bf7997e28 encoding: use getattr isntead of hasattr diff -r 144e97421f6b -r 61807854004e mercurial/encoding.py --- a/mercurial/encoding.py Mon Jul 25 15:17:47 2011 -0500 +++ b/mercurial/encoding.py Mon Jul 25 15:19:43 2011 -0500 @@ -140,12 +140,12 @@ def colwidth(s): "Find the column width of a UTF-8 string for display" d = s.decode(encoding, 'replace') - if hasattr(unicodedata, 'east_asian_width'): + eaw = getattr(unicodedata, 'east_asian_width', None) + if eaw is not None: wide = "WF" if ambiguous == "wide": wide = "WFA" - w = unicodedata.east_asian_width - return sum([w(c) in wide and 2 or 1 for c in d]) + return sum([eaw(c) in wide and 2 or 1 for c in d]) return len(d) def lower(s):