summaryrefslogtreecommitdiffstats
path: root/Lib/ctypes
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/ctypes')
-rw-r--r--Lib/ctypes/test/test_array_in_pointer.py2
-rw-r--r--Lib/ctypes/test/test_byteswap.py2
-rw-r--r--Lib/ctypes/test/test_pep3118.py37
-rw-r--r--Lib/ctypes/test/test_pickling.py8
-rw-r--r--Lib/ctypes/test/test_random_things.py4
-rw-r--r--Lib/ctypes/test/test_strings.py12
6 files changed, 25 insertions, 40 deletions
diff --git a/Lib/ctypes/test/test_array_in_pointer.py b/Lib/ctypes/test/test_array_in_pointer.py
index c313aa6..ee7863c 100644
--- a/Lib/ctypes/test/test_array_in_pointer.py
+++ b/Lib/ctypes/test/test_array_in_pointer.py
@@ -6,7 +6,7 @@ import re
def dump(obj):
# helper function to dump memory contents in hex, with a hyphen
# between the bytes.
- h = hexlify(buffer(obj))
+ h = hexlify(memoryview(obj))
return re.sub(r"(..)", r"\1-", h)[:-1]
diff --git a/Lib/ctypes/test/test_byteswap.py b/Lib/ctypes/test/test_byteswap.py
index e64fd45..3163756 100644
--- a/Lib/ctypes/test/test_byteswap.py
+++ b/Lib/ctypes/test/test_byteswap.py
@@ -4,7 +4,7 @@ from binascii import hexlify
from ctypes import *
def bin(s):
- return hexlify(buffer(s)).upper()
+ return hexlify(memoryview(s)).upper()
# Each *simple* type that supports different byte orders has an
# __ctype_be__ attribute that specifies the same type in BIG ENDIAN
diff --git a/Lib/ctypes/test/test_pep3118.py b/Lib/ctypes/test/test_pep3118.py
index f302e12..976473c 100644
--- a/Lib/ctypes/test/test_pep3118.py
+++ b/Lib/ctypes/test/test_pep3118.py
@@ -1,6 +1,6 @@
import unittest
from ctypes import *
-import re, struct, sys
+import re, sys
if sys.byteorder == "little":
THIS_ENDIAN = "<"
@@ -9,27 +9,6 @@ else:
THIS_ENDIAN = ">"
OTHER_ENDIAN = "<"
-class memoryview(object):
- # This class creates a memoryview - like object from data returned
- # by the private _ctypes._buffer_info() function, just enough for
- # these tests.
- #
- # It can be removed when the py3k memoryview object is backported.
- def __init__(self, ob):
- from _ctypes import _buffer_info
- self.format, self.ndim, self.shape = _buffer_info(ob)
- if self.shape == ():
- self.shape = None
- self.itemsize = sizeof(ob)
- else:
- size = sizeof(ob)
- for dim in self.shape:
- size //= dim
- self.itemsize = size
- self.strides = None
- self.readonly = False
- self.size = sizeof(ob)
-
def normalize(format):
# Remove current endian specifier and white space from a format
# string
@@ -46,7 +25,10 @@ class Test(unittest.TestCase):
v = memoryview(ob)
try:
self.assertEqual(normalize(v.format), normalize(fmt))
- self.assertEqual(v.size, sizeof(ob))
+ if shape is not None:
+ self.assertEqual(len(v), shape[0])
+ else:
+ self.assertEqual(len(v) * sizeof(itemtp), sizeof(ob))
self.assertEqual(v.itemsize, sizeof(itemtp))
self.assertEqual(v.shape, shape)
# ctypes object always have a non-strided memory block
@@ -58,7 +40,7 @@ class Test(unittest.TestCase):
n = 1
for dim in v.shape:
n = n * dim
- self.assertEqual(v.itemsize * n, v.size)
+ self.assertEqual(n * v.itemsize, len(v.tobytes()))
except:
# so that we can see the failing type
print(tp)
@@ -70,7 +52,10 @@ class Test(unittest.TestCase):
v = memoryview(ob)
try:
self.assertEqual(v.format, fmt)
- self.assertEqual(v.size, sizeof(ob))
+ if shape is not None:
+ self.assertEqual(len(v), shape[0])
+ else:
+ self.assertEqual(len(v) * sizeof(itemtp), sizeof(ob))
self.assertEqual(v.itemsize, sizeof(itemtp))
self.assertEqual(v.shape, shape)
# ctypes object always have a non-strided memory block
@@ -82,7 +67,7 @@ class Test(unittest.TestCase):
n = 1
for dim in v.shape:
n = n * dim
- self.assertEqual(v.itemsize * n, v.size)
+ self.assertEqual(n, len(v))
except:
# so that we can see the failing type
print(tp)
diff --git a/Lib/ctypes/test/test_pickling.py b/Lib/ctypes/test/test_pickling.py
index dee2060..136cbe9 100644
--- a/Lib/ctypes/test/test_pickling.py
+++ b/Lib/ctypes/test/test_pickling.py
@@ -28,8 +28,8 @@ class PickleTest(unittest.TestCase):
]:
dst = self.loads(self.dumps(src))
self.assertEqual(src.__dict__, dst.__dict__)
- self.assertEqual(buffer(src)[:],
- buffer(dst)[:])
+ self.assertEqual(memoryview(src).tobytes(),
+ memoryview(dst).tobytes())
def test_struct(self):
X.init_called = 0
@@ -46,8 +46,8 @@ class PickleTest(unittest.TestCase):
# ctypes instances are identical when the instance __dict__
# and the memory buffer are identical
self.assertEqual(y.__dict__, x.__dict__)
- self.assertEqual(buffer(y)[:],
- buffer(x)[:])
+ self.assertEqual(memoryview(y).tobytes(),
+ memoryview(x).tobytes())
def test_unpickable(self):
# ctypes objects that are pointers or contain pointers are
diff --git a/Lib/ctypes/test/test_random_things.py b/Lib/ctypes/test/test_random_things.py
index ddb597d..1c217c3 100644
--- a/Lib/ctypes/test/test_random_things.py
+++ b/Lib/ctypes/test/test_random_things.py
@@ -2,7 +2,7 @@ from ctypes import *
import unittest, sys
def callback_func(arg):
- 42 / arg
+ 42 // arg
raise ValueError(arg)
if sys.platform == "win32":
@@ -69,7 +69,7 @@ class CallbackTracbackTestCase(unittest.TestCase):
out = self.capture_stderr(cb, "spam")
self.assertEqual(out.splitlines()[-1],
"TypeError: "
- "unsupported operand type(s) for /: 'int' and 'str'")
+ "unsupported operand type(s) for //: 'int' and 'str'")
if __name__ == '__main__':
unittest.main()
diff --git a/Lib/ctypes/test/test_strings.py b/Lib/ctypes/test/test_strings.py
index bc803db..324848e 100644
--- a/Lib/ctypes/test/test_strings.py
+++ b/Lib/ctypes/test/test_strings.py
@@ -30,17 +30,17 @@ class StringArrayTestCase(unittest.TestCase):
buf.value = "Hello, World"
self.assertEqual(buf.value, "Hello, World")
- self.assertRaises(TypeError, setattr, buf, "value", buffer("Hello, World"))
- self.assertRaises(TypeError, setattr, buf, "value", buffer("abc"))
- self.assertRaises(ValueError, setattr, buf, "raw", buffer("x" * 100))
+ self.assertRaises(TypeError, setattr, buf, "value", memoryview("Hello, World"))
+ self.assertRaises(TypeError, setattr, buf, "value", memoryview("abc"))
+ self.assertRaises(ValueError, setattr, buf, "raw", memoryview("x" * 100))
def test_c_buffer_raw(self):
buf = c_buffer(32)
- buf.raw = buffer("Hello, World")
+ buf.raw = memoryview("Hello, World")
self.assertEqual(buf.value, "Hello, World")
- self.assertRaises(TypeError, setattr, buf, "value", buffer("abc"))
- self.assertRaises(ValueError, setattr, buf, "raw", buffer("x" * 100))
+ self.assertRaises(TypeError, setattr, buf, "value", memoryview("abc"))
+ self.assertRaises(ValueError, setattr, buf, "raw", memoryview("x" * 100))
def test_param_1(self):
BUF = c_char * 4
generated by cgit v0.12 at 2024-11-26 04:42:29 (GMT)