Mercurial > hg-stable

changeset 15064:1f581a8b1948 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
encoding: use getattr isntead of hasattr
author Augie Fackler <durin42@gmail.com>
date Mon, 25 Jul 2011 15:19:43 -0500
parents c20688b7c061
children 24a6c3f903bb
files mercurial/encoding.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/encoding.py	Thu Aug 25 21:25:14 2011 +0200
+++ 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):