simplify colwidth a bit

mercurial/util.py

@@ -138,17 +138,13 b' def fromlocal(s):'
     except LookupError, k:
         raise Abort(_("%s, please check your locale settings") % k)
 
-_colwidth = None
 def colwidth(s):
-    """Find the column width of string to display."""
-    global _colwidth
-    if _colwidth is None:
-        if hasattr(unicodedata, 'east_asian_width'):
-            _colwidth = lambda s: sum([unicodedata.east_asian_width(c) in 'WF'
-                                       and 2 or 1 for c in s])
-        else:
-            _colwidth = len
-    return _colwidth(s.decode(_encoding, "replace"))
+    "Find the column width of a UTF-8 string for display"
+    d = s.decode(_encoding, 'replace')
+    if hasattr(unicodedata, 'east_asian_width'):
+        w = unicodedata.east_asian_width
+        return sum([w(c) in 'WF' and 2 or 1 for c in d])
+    return len(d)
 
 def version():
     """Return version information if available."""