Author: christian.heimes
Date: Tue Nov 27 14:09:25 2007
New Revision: 59193

Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Modules/_ctypes/_ctypes.c
Log:
Merged revisions 59187-59192 via svnmerge from 
svn+ssh://[EMAIL PROTECTED]/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.
........


Modified: python/branches/py3k/Modules/_ctypes/_ctypes.c
==============================================================================
--- python/branches/py3k/Modules/_ctypes/_ctypes.c      (original)
+++ python/branches/py3k/Modules/_ctypes/_ctypes.c      Tue Nov 27 14:09:25 2007
@@ -4560,18 +4560,6 @@
 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)
 {
     PyObject *hresult, *text, *details;
@@ -4603,13 +4591,10 @@
 }
 
 static PyMethodDef comerror_methods[] = {
-       { "__str__", comerror_str, METH_O },
        { "__init__", comerror_init, METH_VARARGS },
        { NULL, NULL },
 };
 
-PyObject *COMError;
-
 static int
 create_comerror(void)
 {
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins

Reply via email to