[Python-checkins] r80385 - in python/branches/release31-maint: Objects/unicodeobject.c
victor.stinner
python-checkins at python.org
Thu Apr 22 22:07:28 CEST 2010
Author: victor.stinner
Date: Thu Apr 22 22:07:28 2010
New Revision: 80385
Log:
Merged revisions 80384 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r80384 | victor.stinner | 2010-04-22 22:01:57 +0200 (jeu., 22 avril 2010) | 2 lines
Fix my previous commit (r80382) for wide build (unicodeobject.c)
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Objects/unicodeobject.c
Modified: python/branches/release31-maint/Objects/unicodeobject.c
==============================================================================
--- python/branches/release31-maint/Objects/unicodeobject.c (original)
+++ python/branches/release31-maint/Objects/unicodeobject.c Thu Apr 22 22:07:28 2010
@@ -2481,9 +2481,8 @@
*p++ = (char)(0x80 | ((ch >> 12) & 0x3f));
*p++ = (char)(0x80 | ((ch >> 6) & 0x3f));
*p++ = (char)(0x80 | (ch & 0x3f));
-
-#endif
} else {
+#endif
Py_ssize_t newpos;
PyObject *rep;
Py_ssize_t repsize, k;
@@ -2543,7 +2542,9 @@
}
}
Py_DECREF(rep);
+#ifndef Py_UNICODE_WIDE
}
+#endif
} else if (ch < 0x10000) {
*p++ = (char)(0xe0 | (ch >> 12));
*p++ = (char)(0x80 | ((ch >> 6) & 0x3f));
More information about the Python-checkins
mailing list