[Python-checkins] r83446 - in python/branches/release27-maint: Objects/unicodeobject.c

[georg.brandl]

Author: georg.brandl
Date: Sun Aug  1 22:54:30 2010
New Revision: 83446

Log:
Recorded merge of revisions 83444 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83444 | georg.brandl | 2010-08-01 22:51:02 +0200 (So, 01 Aug 2010) | 1 line
  
  Revert r83395, it introduces test failures and is not necessary anyway since we now have to nul-terminate the string anyway.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Objects/unicodeobject.c

Modified: python/branches/release27-maint/Objects/unicodeobject.c
==============================================================================
--- python/branches/release27-maint/Objects/unicodeobject.c	(original)
+++ python/branches/release27-maint/Objects/unicodeobject.c	Sun Aug  1 22:54:30 2010
@@ -294,7 +294,7 @@
 }
 
 /* We allocate one more byte to make sure the string is
-   Ux0000 terminated -- XXX is this needed ?
+   Ux0000 terminated; some code relies on that.
 
    XXX This allocator could further be enhanced by assuring that the
    free list never reduces its size below 1.
@@ -3067,7 +3067,7 @@
 
             ch2 = *s++;
             size--;
-            if (ch2 >= 0xDC00 && ch2 <= 0xDFFF && size) {
+            if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) {
                 ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000;
                 *p++ = '\\';
                 *p++ = 'U';
@@ -3316,7 +3316,7 @@
 
                 ch2 = *s++;
                 size--;
-                if (ch2 >= 0xDC00 && ch2 <= 0xDFFF && size) {
+                if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) {
                     ucs = (((ch & 0x03FF) << 10) | (ch2 & 0x03FF)) + 0x00010000;
                     *p++ = '\\';
                     *p++ = 'U';