summaryrefslogtreecommitdiffstats
path: root/Lib/ctypes
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/ctypes')
-rw-r--r--Lib/ctypes/__init__.py10
-rw-r--r--Lib/ctypes/test/test_as_parameter.py2
-rw-r--r--Lib/ctypes/test/test_functions.py2
3 files changed, 7 insertions, 7 deletions
diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
index 7609017..b753a6b 100644
--- a/Lib/ctypes/__init__.py
+++ b/Lib/ctypes/__init__.py
@@ -59,14 +59,14 @@ def create_string_buffer(init, size=None):
create_string_buffer(anInteger) -> character array
create_string_buffer(aString, anInteger) -> character array
"""
- if isinstance(init, (str, str)):
+ if isinstance(init, str):
if size is None:
size = len(init)+1
buftype = c_char * size
buf = buftype()
buf.value = init
return buf
- elif isinstance(init, (int, int)):
+ elif isinstance(init, int):
buftype = c_char * init
buf = buftype()
return buf
@@ -281,14 +281,14 @@ else:
create_unicode_buffer(anInteger) -> character array
create_unicode_buffer(aString, anInteger) -> character array
"""
- if isinstance(init, (str, str)):
+ if isinstance(init, str):
if size is None:
size = len(init)+1
buftype = c_wchar * size
buf = buftype()
buf.value = init
return buf
- elif isinstance(init, (int, int)):
+ elif isinstance(init, int):
buftype = c_wchar * init
buf = buftype()
return buf
@@ -359,7 +359,7 @@ class CDLL(object):
def __getitem__(self, name_or_ordinal):
func = self._FuncPtr((name_or_ordinal, self))
- if not isinstance(name_or_ordinal, (int, int)):
+ if not isinstance(name_or_ordinal, int):
func.__name__ = name_or_ordinal
return func
diff --git a/Lib/ctypes/test/test_as_parameter.py b/Lib/ctypes/test/test_as_parameter.py
index e21782b..884361c 100644
--- a/Lib/ctypes/test/test_as_parameter.py
+++ b/Lib/ctypes/test/test_as_parameter.py
@@ -133,7 +133,7 @@ class BasicWrapTestCase(unittest.TestCase):
f.argtypes = [c_longlong, MyCallback]
def callback(value):
- self.failUnless(isinstance(value, (int, int)))
+ self.failUnless(isinstance(value, int))
return value & 0x7FFFFFFF
cb = MyCallback(callback)
diff --git a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py
index bbcbbc1..9e5a6f8 100644
--- a/Lib/ctypes/test/test_functions.py
+++ b/Lib/ctypes/test/test_functions.py
@@ -293,7 +293,7 @@ class FunctionTestCase(unittest.TestCase):
f.argtypes = [c_longlong, MyCallback]
def callback(value):
- self.failUnless(isinstance(value, (int, int)))
+ self.failUnless(isinstance(value, int))
return value & 0x7FFFFFFF
cb = MyCallback(callback)