Issue python#13738: Simplify implementation of bytes.lower() and bytes.upper().

pitrou · pitrou · commit 94f6fa62bf11 · 2012-01-08T16:22:46.000+01:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,8 @@ What's New in Python 3.3 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #13738: Simplify implementation of bytes.lower() and bytes.upper().
+
 - Issue #13577: Built-in methods and functions now have a __qualname__.
   Patch by sbt.
 
diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c
@@ -248,12 +248,8 @@ _Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len)
 {
     Py_ssize_t i;
 
-    Py_MEMCPY(result, cptr, len);
-
     for (i = 0; i < len; i++) {
-        int c = Py_CHARMASK(result[i]);
-        if (Py_ISUPPER(c))
-            result[i] = Py_TOLOWER(c);
+        result[i] = Py_TOLOWER((unsigned char) cptr[i]);
     }
 }
 
@@ -268,12 +264,8 @@ _Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len)
 {
     Py_ssize_t i;
 
-    Py_MEMCPY(result, cptr, len);
-
     for (i = 0; i < len; i++) {
-        int c = Py_CHARMASK(result[i]);
-        if (Py_ISLOWER(c))
-            result[i] = Py_TOUPPER(c);
+        result[i] = Py_TOUPPER((unsigned char) cptr[i]);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -248,12 +248,8 @@ _Py_bytes_lower(char result, const char cptr, Py_ssize_t len)`
`248`	`248`	`{`
`249`	`249`	`Py_ssize_t i;`
`250`	`250`
`251`		`- Py_MEMCPY(result, cptr, len);`
`252`		`-`
`253`	`251`	`for (i = 0; i < len; i++) {`
`254`		`- int c = Py_CHARMASK(result[i]);`
`255`		`- if (Py_ISUPPER(c))`
`256`		`- result[i] = Py_TOLOWER(c);`
	`252`	`+ result[i] = Py_TOLOWER((unsigned char) cptr[i]);`
`257`	`253`	`}`
`258`	`254`	`}`
`259`	`255`
`@@ -268,12 +264,8 @@ _Py_bytes_upper(char result, const char cptr, Py_ssize_t len)`
`268`	`264`	`{`
`269`	`265`	`Py_ssize_t i;`
`270`	`266`
`271`		`- Py_MEMCPY(result, cptr, len);`
`272`		`-`
`273`	`267`	`for (i = 0; i < len; i++) {`
`274`		`- int c = Py_CHARMASK(result[i]);`
`275`		`- if (Py_ISLOWER(c))`
`276`		`- result[i] = Py_TOUPPER(c);`
	`268`	`+ result[i] = Py_TOUPPER((unsigned char) cptr[i]);`
`277`	`269`	`}`
`278`	`270`	`}`
`279`	`271`