From: Thomas Heller <theller@ctypes.org>
Date: Thu, 12 Jul 2007 13:55:37 +0000 (+0000)
Subject: Use a unicode string as unique_key instead of 8-bit string.
X-Git-Tag: v3.0a1~666
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7c6d868325b999c32ec759934eac7a96c4b56fd;p=python

Use a unicode string as unique_key instead of 8-bit string.
---

diff --git a/Lib/ctypes/test/test_objects.py b/Lib/ctypes/test/test_objects.py
index 4c7441c278..83a8e1b57e 100644
--- a/Lib/ctypes/test/test_objects.py
+++ b/Lib/ctypes/test/test_objects.py
@@ -22,7 +22,7 @@ assigned from Python must be kept.
 
 >>> array[4] = 'foo bar'
 >>> array._objects
-{s'4': b'foo bar'}
+{'4': b'foo bar'}
 >>> array[4]
 s'foo bar'
 >>>
@@ -47,9 +47,9 @@ of 'x' ('_b_base_' is either None, or the root object owning the memory block):
 
 >>> x.array[0] = 'spam spam spam'
 >>> x._objects
-{s'0:2': b'spam spam spam'}
+{'0:2': b'spam spam spam'}
 >>> x.array._b_base_._objects
-{s'0:2': b'spam spam spam'}
+{'0:2': b'spam spam spam'}
 >>>
 
 '''
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index e5c147031f..bfb05590cf 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -2027,7 +2027,7 @@ unique_key(CDataObject *target, Py_ssize_t index)
 #endif
 		target = target->b_base;
 	}
-	return PyString_FromStringAndSize(string, cp-string);
+	return PyUnicode_FromStringAndSize(string, cp-string);
 }
 
 /*