Patchwork [4,of,4,foldmap-in-C] encoding: use parsers.asciiupper when available

login
register
mail settings
Submitter Siddharth Agarwal
Date April 1, 2015, 5:28 p.m.
Message ID <abee696f43573242ac2e.1427909287@devbig136.prn2.facebook.com>
Download mbox | patch
Permalink /patch/8416/
State Superseded
Commit ac08de78de7fe6c9710d428cb251f40e899657e3
Headers show

Comments

Siddharth Agarwal - April 1, 2015, 5:28 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1427840529 25200
#      Tue Mar 31 15:22:09 2015 -0700
# Node ID abee696f43573242ac2ec19f30fe009dbaffb26c
# Parent  3f8d0b236c26c00ccb0def72ea9e380ab0cbba82
encoding: use parsers.asciiupper when available

This is used on Windows and Cygwin, and the gains from this are expected to be
similar to what was seen in 80f2b63dd83a.

Patch

diff --git a/mercurial/encoding.py b/mercurial/encoding.py
--- a/mercurial/encoding.py
+++ b/mercurial/encoding.py
@@ -296,6 +296,22 @@ 
     asciilower = impl
     return impl(s)
 
+def _asciiupper(s):
+    '''convert a string to uppercase if ASCII
+
+    Raises UnicodeDecodeError if non-ASCII characters are found.'''
+    s.decode('ascii')
+    return s.upper()
+
+def asciiupper(s):
+    # delay importing avoids cyclic dependency around "parsers" in
+    # pure Python build (util => i18n => encoding => parsers => util)
+    import parsers
+    impl = getattr(parsers, 'asciiupper', _asciiupper)
+    global asciiupper
+    asciiupper = impl
+    return impl(s)
+
 def lower(s):
     "best-effort encoding-aware case-folding of local string s"
     try:
@@ -320,8 +336,7 @@ 
 def upper(s):
     "best-effort encoding-aware case-folding of local string s"
     try:
-        s.decode('ascii') # throw exception for non-ASCII character
-        return s.upper()
+        return asciiupper(s)
     except UnicodeDecodeError:
         pass
     try: