diff options
| -rw-r--r-- | Lib/ctypes/__init__.py | 14 | ||||
| -rw-r--r-- | Lib/ctypes/macholib/dyld.py | 2 | ||||
| -rw-r--r-- | Lib/ctypes/test/test_cfuncs.py | 2 | ||||
| -rw-r--r-- | Lib/ctypes/test/test_macholib.py | 2 | ||||
| -rw-r--r-- | Lib/ctypes/test/test_random_things.py | 2 |
5 files changed, 10 insertions, 12 deletions
diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py index cff5483..cdf6d36 100644 --- a/Lib/ctypes/__init__.py +++ b/Lib/ctypes/__init__.py @@ -14,7 +14,7 @@ from _ctypes import ArgumentError from struct import calcsize as _calcsize if __version__ != _ctypes_version: - raise Exception, ("Version number mismatch", __version__, _ctypes_version) + raise Exception("Version number mismatch", __version__, _ctypes_version) if _os.name in ("nt", "ce"): from _ctypes import FormatError @@ -67,7 +67,7 @@ def create_string_buffer(init, size=None): buftype = c_char * init buf = buftype() return buf - raise TypeError, init + raise TypeError(init) def c_buffer(init, size=None): ## "deprecated, use create_string_buffer instead" @@ -297,18 +297,16 @@ else: buftype = c_wchar * init buf = buftype() return buf - raise TypeError, init + raise TypeError(init) POINTER(c_char).from_param = c_char_p.from_param #_SimpleCData.c_char_p_from_param # XXX Deprecated def SetPointerType(pointer, cls): if _pointer_type_cache.get(cls, None) is not None: - raise RuntimeError, \ - "This type already exists in the cache" + raise RuntimeError("This type already exists in the cache") if id(pointer) not in _pointer_type_cache: - raise RuntimeError, \ - "What's this???" + raise RuntimeError("What's this???") pointer.set_type(cls) _pointer_type_cache[cls] = pointer del _pointer_type_cache[id(pointer)] @@ -357,7 +355,7 @@ class CDLL(object): def __getattr__(self, name): if name.startswith('__') and name.endswith('__'): - raise AttributeError, name + raise AttributeError(name) func = self.__getitem__(name) setattr(self, name, func) return func diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py index 2bd43c3..dc7052e 100644 --- a/Lib/ctypes/macholib/dyld.py +++ b/Lib/ctypes/macholib/dyld.py @@ -124,7 +124,7 @@ def dyld_find(name, executable_path=None, env=None): ), env): if os.path.isfile(path): return path - raise ValueError, "dylib %s could not be found" % (name,) + raise ValueError("dylib %s could not be found" % (name,)) def framework_find(fn, executable_path=None, env=None): """ diff --git a/Lib/ctypes/test/test_cfuncs.py b/Lib/ctypes/test/test_cfuncs.py index fa858a6..63564a8 100644 --- a/Lib/ctypes/test/test_cfuncs.py +++ b/Lib/ctypes/test/test_cfuncs.py @@ -186,7 +186,7 @@ else: class stdcall_dll(WinDLL): def __getattr__(self, name): if name[:2] == '__' and name[-2:] == '__': - raise AttributeError, name + raise AttributeError(name) func = self._FuncPtr(("s_" + name, self)) setattr(self, name, func) return func diff --git a/Lib/ctypes/test/test_macholib.py b/Lib/ctypes/test/test_macholib.py index 4bb68ac..f2ee035 100644 --- a/Lib/ctypes/test/test_macholib.py +++ b/Lib/ctypes/test/test_macholib.py @@ -42,7 +42,7 @@ def find_lib(name): return os.path.realpath(dyld_find(dylib)) except ValueError: pass - raise ValueError, "%s not found" % (name,) + raise ValueError("%s not found" % (name,)) class MachOTest(unittest.TestCase): if sys.platform == "darwin": diff --git a/Lib/ctypes/test/test_random_things.py b/Lib/ctypes/test/test_random_things.py index e803895..6b2c1b1 100644 --- a/Lib/ctypes/test/test_random_things.py +++ b/Lib/ctypes/test/test_random_things.py @@ -3,7 +3,7 @@ import unittest, sys def callback_func(arg): 42 / arg - raise ValueError, arg + raise ValueError(arg) if sys.platform == "win32": |