Author: thomas.heller
Date: Wed Jul 11 15:50:53 2007
New Revision: 56268
Modified:
python/branches/py3k-struni/Lib/ctypes/test/test_cast.py
python/branches/py3k-struni/Lib/ctypes/test/test_internals.py
Log:
Fix some more ctypes tests.
Modified: python/branches/py3k-struni/Lib/ctypes/test/test_cast.py
==============================================================================
--- python/branches/py3k-struni/Lib/ctypes/test/test_cast.py (original)
+++ python/branches/py3k-struni/Lib/ctypes/test/test_cast.py Wed Jul 11
15:50:53 2007
@@ -34,17 +34,17 @@
array = (c_char_p * 5)()
self.failUnlessEqual(array._objects, None)
array[0] = "foo bar"
- self.failUnlessEqual(array._objects, {'0': "foo bar"})
+ self.failUnlessEqual(array._objects, {'0': b"foo bar"})
p = cast(array, POINTER(c_char_p))
# array and p share a common _objects attribute
self.failUnless(p._objects is array._objects)
- self.failUnlessEqual(array._objects, {'0': "foo bar", id(array):
array})
+ self.failUnlessEqual(array._objects, {'0': b"foo bar", id(array):
array})
p[0] = "spam spam"
- self.failUnlessEqual(p._objects, {'0': "spam spam", id(array): array})
+ self.failUnlessEqual(p._objects, {'0': b"spam spam", id(array): array})
self.failUnless(array._objects is p._objects)
p[1] = "foo bar"
- self.failUnlessEqual(p._objects, {'1': 'foo bar', '0': "spam spam",
id(array): array})
+ self.failUnlessEqual(p._objects, {'1': b'foo bar', '0': b"spam spam",
id(array): array})
self.failUnless(array._objects is p._objects)
def test_other(self):
Modified: python/branches/py3k-struni/Lib/ctypes/test/test_internals.py
==============================================================================
--- python/branches/py3k-struni/Lib/ctypes/test/test_internals.py
(original)
+++ python/branches/py3k-struni/Lib/ctypes/test/test_internals.py Wed Jul
11 15:50:53 2007
@@ -76,11 +76,11 @@
x = X()
x.a = s1
x.b = s2
- self.failUnlessEqual(x._objects, {"0": s1, "1": s2})
+ self.failUnlessEqual(x._objects, {"0": bytes(s1), "1": bytes(s2)})
y = Y()
y.x = x
- self.failUnlessEqual(y._objects, {"0": {"0": s1, "1": s2}})
+ self.failUnlessEqual(y._objects, {"0": {"0": bytes(s1), "1":
bytes(s2)}})
## x = y.x
## del y
## print x._b_base_._objects
_______________________________________________
Python-3000-checkins mailing list
Python-3000-checkins@python.org
http://mail.python.org/mailman/listinfo/python-3000-checkins
