[Python-checkins] commit of r41728 - in python: branches/release24-maint/Lib/test/test_unicode.py branches/release24-maint/Misc/NEWS branches/release24-maint/Objects/unicodeobject.c trunk/Lib/test/test_unicode.py trunk/Misc/NEWS trunk/Objects/unicodeobject.c

[Walter Dörwald]

hyeshik.chang wrote:

> Author: hyeshik.chang
> Date: Sat Dec 17 05:38:31 2005
> New Revision: 41728
>
> Modified:
>   python/branches/release24-maint/Lib/test/test_unicode.py
>   python/branches/release24-maint/Misc/NEWS
>   python/branches/release24-maint/Objects/unicodeobject.c
>   python/trunk/Lib/test/test_unicode.py
>   python/trunk/Misc/NEWS
>   python/trunk/Objects/unicodeobject.c
> Log:
> Bug #1379994: Fix *unicode_escape codecs to encode r'\' as r'\\'
> just like string codecs.

I don't see how the patches to test_unicode.py check for this change. It just changes the check from testing one long string to
testing each character separately.
> 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	Sat Dec 17 05:38:31 2005 @@ -611,20 +611,24 @@
>         self.assertEqual(u'hello'.encode('latin-1'), 'hello')
>
>         # Roundtrip safety for BMP (just the first 1024 chars)
> -        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)
> +        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)
>
>         # Roundtrip safety for BMP (just the first 256 chars)
> -        u = u''.join(map(unichr, xrange(256)))
> -        for encoding in ('latin-1',):
> -            self.assertEqual(unicode(u.encode(encoding),encoding), u)
> +        for c in xrange(256):
> +            u = unichr(c)
> +            for encoding in ('latin-1',):
> +                self.assertEqual(unicode(u.encode(encoding),encoding), u)
>
>         # Roundtrip safety for BMP (just the first 128 chars)
> -        u = u''.join(map(unichr, xrange(128)))
> -        for encoding in ('ascii',):
> -            self.assertEqual(unicode(u.encode(encoding),encoding), u)
> +        for c in xrange(128):
> +            u = unichr(c)
> +            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'