From: Christian Heimes <christian@cheimes.de>
Date: Tue, 27 Nov 2007 13:09:25 +0000 (+0000)
Subject: Merged revisions 59187-59192 via svnmerge from
X-Git-Tag: v3.0a2~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b2b8dbefa7d10620d59fd9785e2db23292c7124;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 59187-59192 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r59190 | thomas.heller | 2007-11-27 13:22:11 +0100 (Tue, 27 Nov 2007) | 3 lines

  Remove unused global variable, and remove unneeded COMError.__str__
  implementation in C.
........
---

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index cf0cb9a62e4d..85687c426b3c 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -4559,18 +4559,6 @@ static char *module_docs =
 
 static char comerror_doc[] = "Raised when a COM method call failed.";
 
-static PyObject *
-comerror_str(PyObject *ignored, PyObject *self)
-{
-	PyObject *args = PyObject_GetAttrString(self, "args");
-	PyObject *result;
-	if (args == NULL)
-		return NULL;
-	result = PyObject_Str(args);
-	Py_DECREF(args);
-	return result;
-}
-
 static PyObject *
 comerror_init(PyObject *self, PyObject *args)
 {
@@ -4603,13 +4591,10 @@ comerror_init(PyObject *self, PyObject *args)
 }
 
 static PyMethodDef comerror_methods[] = {
-	{ "__str__", comerror_str, METH_O },
 	{ "__init__", comerror_init, METH_VARARGS },
 	{ NULL, NULL },
 };
 
-PyObject *COMError;
-
 static int
 create_comerror(void)
 {