diff Python/fileutils.c @ 80057:13dd8199c112

Issue #16330: Use surrogate-related macros Patch written by Serhiy Storchaka.
author Victor Stinner <victor.stinner@gmail.com>
date Tue, 30 Oct 2012 01:42:39 +0100
parents c80d9a0bd5a0
children 3857a63cf840
line wrap: on
line diff
--- a/Python/fileutils.c	Mon Oct 29 18:20:18 2012 -0500
+++ b/Python/fileutils.c	Tue Oct 30 01:42:39 2012 +0100
@@ -85,7 +85,7 @@
             /* Only use the result if it contains no
                surrogate characters. */
             for (tmp = res; *tmp != 0 &&
-                         (*tmp < 0xd800 || *tmp > 0xdfff); tmp++)
+                         !Py_UNICODE_IS_SURROGATE(*tmp); tmp++)
                 ;
             if (*tmp == 0) {
                 if (size != NULL)
@@ -131,7 +131,7 @@
             memset(&mbs, 0, sizeof mbs);
             continue;
         }
-        if (*out >= 0xd800 && *out <= 0xdfff) {
+        if (Py_UNICODE_IS_SURROGATE(*out)) {
             /* Surrogate character.  Escape the original
                byte sequence with surrogateescape. */
             argsize -= converted;