unicode_writer_finish() checks string consistency

vstinner · vstinner · commit f59c28c93007 · 2012-05-09T03:24:14.000+02:00
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
@@ -1064,6 +1064,10 @@ def __str__(self):
         self.assertEqual('%f' % INF, 'inf')
         self.assertEqual('%F' % INF, 'INF')
 
+        # PEP 393
+        self.assertEqual('%.1s' % "a\xe9\u20ac", 'a')
+        self.assertEqual('%.2s' % "a\xe9\u20ac", 'a\xe9')
+
     def test_startswith_endswith_errors(self):
         for meth in ('foo'.startswith, 'foo'.endswith):
             with self.assertRaises(TypeError) as cm:
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -13320,6 +13320,7 @@ unicode_writer_finish(unicode_writer_t *writer)
         Py_DECREF(writer->buffer);
         return NULL;
     }
+    assert(_PyUnicode_CheckConsistency(writer->buffer, 1));
     return writer->buffer;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13320,6 +13320,7 @@ unicode_writer_finish(unicode_writer_t *writer)`
`13320`	`13320`	`Py_DECREF(writer->buffer);`
`13321`	`13321`	`return NULL;`
`13322`	`13322`	`}`
	`13323`	`+ assert(_PyUnicode_CheckConsistency(writer->buffer, 1));`
`13323`	`13324`	`return writer->buffer;`
`13324`	`13325`	`}`
`13325`	`13326`