[Python-checkins] r43444 - in python/trunk: Misc/NEWS Objects/object.c

[anthony.baxter]

Author: anthony.baxter
Date: Thu Mar 30 12:53:17 2006
New Revision: 43444

Modified:
   python/trunk/Misc/NEWS
   python/trunk/Objects/object.c
Log:
Fixed bug #1459029 - unicode reprs were double-escaped.
Backed out an old patch from 2000.


Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu Mar 30 12:53:17 2006
@@ -12,6 +12,8 @@
 Core and builtins
 -----------------
 
+- Fixed bug #1459029 - unicode reprs were double-escaped.
+
 - Patch #1396919: The system scope threads are reenabled on FreeBSD
   5.4 and later versions.
 

Modified: python/trunk/Objects/object.c
==============================================================================
--- python/trunk/Objects/object.c	(original)
+++ python/trunk/Objects/object.c	Thu Mar 30 12:53:17 2006
@@ -316,7 +316,7 @@
 #ifdef Py_USING_UNICODE
 		if (PyUnicode_Check(res)) {
 			PyObject* str;
-			str = PyUnicode_AsUnicodeEscapeString(res);
+			str = PyUnicode_AsEncodedString(res, NULL, NULL);
 			Py_DECREF(res);
 			if (str)
 				res = str;