[Python-checkins] r43380 - in python/branches/release24-maint: Lib/test/test_unicode.py Misc/NEWS Objects/unicodeobject.c
anthony.baxter
python-checkins at python.org
Tue Mar 28 09:32:37 CEST 2006
Author: anthony.baxter
Date: Tue Mar 28 09:32:36 2006
New Revision: 43380
Modified:
python/branches/release24-maint/Lib/test/test_unicode.py
python/branches/release24-maint/Misc/NEWS
python/branches/release24-maint/Objects/unicodeobject.c
Log:
after discussions with perky, reverted fix for Bug #1379994: Builtin
unicode_escape and raw_unicode_escape codec now encodes backslash correctly.
This caused another issue for unicode repr strings being double-escaped
(SF Bug #1459029). Correct fix will be in 2.5, but is too risky for 2.4.3.
Added a testcase for #1459029.
Modified: python/branches/release24-maint/Lib/test/test_unicode.py
==============================================================================
--- python/branches/release24-maint/Lib/test/test_unicode.py (original)
+++ python/branches/release24-maint/Lib/test/test_unicode.py Tue Mar 28 09:32:36 2006
@@ -626,24 +626,20 @@
self.assertEqual(u'hello'.encode('latin-1'), 'hello')
# Roundtrip safety for BMP (just the first 1024 chars)
- for c in xrange(1024):
- u = unichr(c)
- for encoding in ('utf-7', 'utf-8', 'utf-16', 'utf-16-le',
- 'utf-16-be', 'raw_unicode_escape',
- 'unicode_escape', 'unicode_internal'):
- self.assertEqual(unicode(u.encode(encoding),encoding), u)
+ u = u''.join(map(unichr, xrange(1024)))
+ for encoding in ('utf-7', 'utf-8', 'utf-16', 'utf-16-le', 'utf-16-be',
+ 'raw_unicode_escape', 'unicode_escape', 'unicode_internal'):
+ self.assertEqual(unicode(u.encode(encoding),encoding), u)
# Roundtrip safety for BMP (just the first 256 chars)
- for c in xrange(256):
- u = unichr(c)
- for encoding in ('latin-1',):
- self.assertEqual(unicode(u.encode(encoding),encoding), u)
+ u = u''.join(map(unichr, xrange(256)))
+ for encoding in ('latin-1',):
+ self.assertEqual(unicode(u.encode(encoding),encoding), u)
# Roundtrip safety for BMP (just the first 128 chars)
- for c in xrange(128):
- u = unichr(c)
- for encoding in ('ascii',):
- self.assertEqual(unicode(u.encode(encoding),encoding), u)
+ u = u''.join(map(unichr, xrange(128)))
+ for encoding in ('ascii',):
+ self.assertEqual(unicode(u.encode(encoding),encoding), u)
# Roundtrip safety for non-BMP (just a few chars)
u = u'\U00010001\U00020002\U00030003\U00040004\U00050005'
@@ -744,6 +740,18 @@
y = x.encode("raw-unicode-escape").decode("raw-unicode-escape")
self.assertEqual(x, y)
+ def test_unicode_repr(self):
+ class s1:
+ def __repr__(self):
+ return '\\n'
+
+ class s2:
+ def __repr__(self):
+ return u'\\n'
+
+ self.assertEqual(repr(s1()), '\\n')
+ self.assertEqual(repr(s2()), '\\n')
+
def test_main():
test_support.run_unittest(UnicodeTest)
Modified: python/branches/release24-maint/Misc/NEWS
==============================================================================
--- python/branches/release24-maint/Misc/NEWS (original)
+++ python/branches/release24-maint/Misc/NEWS Tue Mar 28 09:32:36 2006
@@ -17,6 +17,10 @@
- A threading issue that caused random segfaults on some platforms from
the testsuite was fixed in test_capi.
+- Reverted fix for Bug #1379994: Builtin unicode_escape and
+ raw_unicode_escape codec now encodes backslash correctly.
+ This caused another issue for unicode repr strings being double-escaped
+ (SF Bug #1459029). Correct fix will be in 2.5, but is too risky for 2.4.3.
What's New in Python 2.4.3c1?
=============================
Modified: python/branches/release24-maint/Objects/unicodeobject.c
==============================================================================
--- python/branches/release24-maint/Objects/unicodeobject.c (original)
+++ python/branches/release24-maint/Objects/unicodeobject.c Tue Mar 28 09:32:36 2006
@@ -1982,9 +1982,9 @@
while (size-- > 0) {
Py_UNICODE ch = *s++;
- /* Escape quotes and backslashes */
- if ((quotes &&
- ch == (Py_UNICODE) PyString_AS_STRING(repr)[1]) || ch == '\\') {
+ /* Escape quotes */
+ if (quotes &&
+ (ch == (Py_UNICODE) PyString_AS_STRING(repr)[1] || ch == '\\')) {
*p++ = '\\';
*p++ = (char) ch;
continue;
More information about the Python-checkins
mailing list