Mailman 3 February 2007 - Python-checkins

r54048 - in python/branches/p3yk_no_args_on_exc: BROKEN Objects/exceptions.c
by brett.cannon 28 Feb '07

28 Feb '07

Author: brett.cannon Date: Thu Mar 1 00:51:06 2007 New Revision: 54048 Modified: python/branches/p3yk_no_args_on_exc/BROKEN python/branches/p3yk_no_args_on_exc/Objects/exceptions.c Log: Clean up the output from IOError. Allows test_xml_etree to pass after the BaseException.args removal. Modified: python/branches/p3yk_no_args_on_exc/BROKEN ============================================================================== --- python/branches/p3yk_no_args_on_exc/BROKEN (original) +++ python/branches/p3yk_no_args_on_exc/BROKEN Thu Mar 1 00:51:06 2007 @@ -3,6 +3,3 @@ PyErr_NormalizeException() passing any tuple given to it as a value as the args tuple, but not when it is any other type of value). + test_bsddb3 (?) - -* doctest oddness (need to change how SyntaxError is handled?) - + test_xml_etree Modified: python/branches/p3yk_no_args_on_exc/Objects/exceptions.c ============================================================================== --- python/branches/p3yk_no_args_on_exc/Objects/exceptions.c (original) +++ python/branches/p3yk_no_args_on_exc/Objects/exceptions.c Thu Mar 1 00:51:06 2007 @@ -524,7 +524,7 @@ { PyObject *rtnval = NULL; - if (self->filename) { + if (self->filename != Py_None) { PyObject *fmt; PyObject *repr; PyObject *tuple; @@ -558,7 +558,7 @@ Py_DECREF(fmt); Py_DECREF(tuple); } - else if (self->myerrno && self->strerror) { + else if (self->myerrno != Py_None && self->strerror != Py_None) { PyObject *fmt; PyObject *tuple;

1 0

r54047 - in python/branches/p3yk_no_args_on_exc: BROKEN Modules/_bsddb.c
by brett.cannon 28 Feb '07

28 Feb '07

Author: brett.cannon Date: Thu Mar 1 00:39:15 2007 New Revision: 54047 Modified: python/branches/p3yk_no_args_on_exc/BROKEN python/branches/p3yk_no_args_on_exc/Modules/_bsddb.c Log: Fix _bsddb for the BaseException.args removal. Modified: python/branches/p3yk_no_args_on_exc/BROKEN ============================================================================== --- python/branches/p3yk_no_args_on_exc/BROKEN (original) +++ python/branches/p3yk_no_args_on_exc/BROKEN Thu Mar 1 00:39:15 2007 @@ -2,7 +2,6 @@ thus constructor gets passed two arguments (thanks to PyErr_NormalizeException() passing any tuple given to it as a value as the args tuple, but not when it is any other type of value). - + test_bsddb + test_bsddb3 (?) * doctest oddness (need to change how SyntaxError is handled?) Modified: python/branches/p3yk_no_args_on_exc/Modules/_bsddb.c ============================================================================== --- python/branches/p3yk_no_args_on_exc/Modules/_bsddb.c (original) +++ python/branches/p3yk_no_args_on_exc/Modules/_bsddb.c Thu Mar 1 00:39:15 2007 @@ -323,7 +323,7 @@ #define _CHECK_OBJECT_NOT_CLOSED(nonNull, pyErrObj, name) \ if ((nonNull) == NULL) { \ PyObject *errTuple = NULL; \ - errTuple = Py_BuildValue("(is)", 0, #name " object has been closed"); \ + errTuple = Py_BuildValue("((is))", 0, #name " object has been closed"); \ PyErr_SetObject((pyErrObj), errTuple); \ Py_DECREF(errTuple); \ return NULL; \ @@ -602,7 +602,7 @@ } _db_errmsg[0] = 0; - errTuple = Py_BuildValue("(is)", err, errTxt); + errTuple = Py_BuildValue("((is))", err, errTxt); PyErr_SetObject(errObj, errTuple); Py_DECREF(errTuple); } @@ -1931,7 +1931,7 @@ #endif if (NULL == self->db) { - PyObject *t = Py_BuildValue("(is)", 0, + PyObject *t = Py_BuildValue("((is))", 0, "Cannot call open() twice for DB object"); PyErr_SetObject(DBError, t); Py_DECREF(t); @@ -2703,7 +2703,7 @@ DBObject* self = (DBObject*)_self; if (self->db == NULL) { - PyObject *t = Py_BuildValue("(is)", 0, "DB object has been closed"); + PyObject *t = Py_BuildValue("((is))", 0, "DB object has been closed"); PyErr_SetObject(DBError, t); Py_DECREF(t); return -1; @@ -2795,7 +2795,7 @@ int flags = 0; if (self->db == NULL) { - PyObject *t = Py_BuildValue("(is)", 0, "DB object has been closed"); + PyObject *t = Py_BuildValue("((is))", 0, "DB object has been closed"); PyErr_SetObject(DBError, t); Py_DECREF(t); return -1; @@ -4686,7 +4686,7 @@ return NULL; if (!self->txn) { - PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used " + PyObject *t = Py_BuildValue("((is))", 0, "DBTxn must not be used " "after txn_commit or txn_abort"); PyErr_SetObject(DBError, t); Py_DECREF(t); @@ -4723,7 +4723,7 @@ } if (!self->txn) { - PyObject *t = Py_BuildValue("(is)", 0,"DBTxn must not be used " + PyObject *t = Py_BuildValue("((is))", 0,"DBTxn must not be used " "after txn_commit or txn_abort"); PyErr_SetObject(DBError, t); Py_DECREF(t); @@ -4745,7 +4745,7 @@ return NULL; if (!self->txn) { - PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used " + PyObject *t = Py_BuildValue("((is))", 0, "DBTxn must not be used " "after txn_commit or txn_abort"); PyErr_SetObject(DBError, t); Py_DECREF(t); @@ -4770,7 +4770,7 @@ return NULL; if (!self->txn) { - PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used " + PyObject *t = Py_BuildValue("((is))", 0, "DBTxn must not be used " "after txn_commit or txn_abort"); PyErr_SetObject(DBError, t); Py_DECREF(t); @@ -4799,7 +4799,7 @@ return NULL; if (!self->txn) { - PyObject *t = Py_BuildValue("(is)", 0, "DBTxn must not be used " + PyObject *t = Py_BuildValue("((is))", 0, "DBTxn must not be used " "after txn_commit or txn_abort"); PyErr_SetObject(DBError, t); Py_DECREF(t);

1 0

r54046 - in python/branches/p3yk_no_args_on_exc: BROKEN Lib/socket.py Misc/NEWS Modules/_ssl.c Modules/socketmodule.c Python/errors.c
by brett.cannon 28 Feb '07

28 Feb '07

Author: brett.cannon Date: Thu Mar 1 00:31:14 2007 New Revision: 54046 Modified: python/branches/p3yk_no_args_on_exc/BROKEN python/branches/p3yk_no_args_on_exc/Lib/socket.py python/branches/p3yk_no_args_on_exc/Misc/NEWS python/branches/p3yk_no_args_on_exc/Modules/_ssl.c python/branches/p3yk_no_args_on_exc/Modules/socketmodule.c python/branches/p3yk_no_args_on_exc/Python/errors.c Log: Fix the BaseException.args removal. Required wrapping tuple arguments to PyErr_SetObject() within another tuple, else PyErr_Fetch() passes the tuple directly to the exception's init function which raising an exception itself since only one argument is allowed. Also had to tweak PyErr_SetFromErrno() to do the same thing. Modified: python/branches/p3yk_no_args_on_exc/BROKEN ============================================================================== --- python/branches/p3yk_no_args_on_exc/BROKEN (original) +++ python/branches/p3yk_no_args_on_exc/BROKEN Thu Mar 1 00:31:14 2007 @@ -1,10 +1,9 @@ -* Construction of exception at C level passing too many arguments? +* socket.error is passed two arguments but just subclasses PyExc_Exception, and + thus constructor gets passed two arguments (thanks to + PyErr_NormalizeException() passing any tuple given to it as a value as the + args tuple, but not when it is any other type of value). + test_bsddb - + test_socket - + test_socket_ssl - + test_timeout - + test_urllib2net - + test_urllibnet + + test_bsddb3 (?) * doctest oddness (need to change how SyntaxError is handled?) + test_xml_etree Modified: python/branches/p3yk_no_args_on_exc/Lib/socket.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/socket.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/socket.py Thu Mar 1 00:31:14 2007 @@ -138,7 +138,7 @@ class _closedsocket(object): __slots__ = [] def _dummy(*args): - raise error(EBADF, 'Bad file descriptor') + raise error((EBADF, 'Bad file descriptor')) def close(self): pass # All _delegate_methods must also be initialized here. Modified: python/branches/p3yk_no_args_on_exc/Misc/NEWS ============================================================================== --- python/branches/p3yk_no_args_on_exc/Misc/NEWS (original) +++ python/branches/p3yk_no_args_on_exc/Misc/NEWS Thu Mar 1 00:31:14 2007 @@ -28,6 +28,9 @@ Core and Builtins ----------------- +- PyErr_SetFromErrno() now wraps its value argument in another tuple before + passing it to the exception type's init function. + - SyntaxError now enforces the requirement of having two arguments, second of which is a four-item tuple. Modified: python/branches/p3yk_no_args_on_exc/Modules/_ssl.c ============================================================================== --- python/branches/p3yk_no_args_on_exc/Modules/_ssl.c (original) +++ python/branches/p3yk_no_args_on_exc/Modules/_ssl.c Thu Mar 1 00:31:14 2007 @@ -161,19 +161,18 @@ n = PyInt_FromLong((long) p); if (n == NULL) return NULL; - v = PyTuple_New(2); - if (v == NULL) { - Py_DECREF(n); - return NULL; - } s = PyString_FromString(errstr); if (s == NULL) { - Py_DECREF(v); Py_DECREF(n); } - PyTuple_SET_ITEM(v, 0, n); - PyTuple_SET_ITEM(v, 1, s); + v = Py_BuildValue("((O, O))", n, s); + if (v == NULL) { + Py_DECREF(n); + Py_DECREF(s); + return NULL; + } + PyErr_SetObject(PySSLErrorObject, v); Py_DECREF(v); return NULL; Modified: python/branches/p3yk_no_args_on_exc/Modules/socketmodule.c ============================================================================== --- python/branches/p3yk_no_args_on_exc/Modules/socketmodule.c (original) +++ python/branches/p3yk_no_args_on_exc/Modules/socketmodule.c Thu Mar 1 00:31:14 2007 @@ -531,7 +531,7 @@ } } - v = Py_BuildValue("(is)", err_no, msg); + v = Py_BuildValue("((is))", err_no, msg); if (v != NULL) { PyErr_SetObject(socket_error, v); Py_DECREF(v); @@ -567,7 +567,7 @@ *lastc-- = '\0'; } } - v = Py_BuildValue("(is)", myerrorcode, outbuf); + v = Py_BuildValue("((is))", myerrorcode, outbuf); if (v != NULL) { PyErr_SetObject(socket_error, v); Py_DECREF(v); @@ -580,7 +580,7 @@ #if defined(RISCOS) if (_inet_error.errnum != NULL) { PyObject *v; - v = Py_BuildValue("(is)", errno, _inet_err()); + v = Py_BuildValue("((is))", errno, _inet_err()); if (v != NULL) { PyErr_SetObject(socket_error, v); Py_DECREF(v); @@ -599,9 +599,9 @@ PyObject *v; #ifdef HAVE_HSTRERROR - v = Py_BuildValue("(is)", h_error, (char *)hstrerror(h_error)); + v = Py_BuildValue("((is))", h_error, (char *)hstrerror(h_error)); #else - v = Py_BuildValue("(is)", h_error, "host not found"); + v = Py_BuildValue("((is))", h_error, "host not found"); #endif if (v != NULL) { PyErr_SetObject(socket_herror, v); @@ -624,9 +624,9 @@ #endif #ifdef HAVE_GAI_STRERROR - v = Py_BuildValue("(is)", error, gai_strerror(error)); + v = Py_BuildValue("((is))", error, gai_strerror(error)); #else - v = Py_BuildValue("(is)", error, "getaddrinfo failed"); + v = Py_BuildValue("((is))", error, "getaddrinfo failed"); #endif if (v != NULL) { PyErr_SetObject(socket_gaierror, v); Modified: python/branches/p3yk_no_args_on_exc/Python/errors.c ============================================================================== --- python/branches/p3yk_no_args_on_exc/Python/errors.c (original) +++ python/branches/p3yk_no_args_on_exc/Python/errors.c Thu Mar 1 00:31:14 2007 @@ -335,9 +335,9 @@ #endif /* Unix/Windows */ #endif /* PLAN 9*/ if (filenameObject != NULL) - v = Py_BuildValue("(isO)", i, s, filenameObject); + v = Py_BuildValue("((isO))", i, s, filenameObject); else - v = Py_BuildValue("(is)", i, s); + v = Py_BuildValue("((is))", i, s); if (v != NULL) { PyErr_SetObject(exc, v); Py_DECREF(v); @@ -415,9 +415,9 @@ s[--len] = '\0'; } if (filenameObject != NULL) - v = Py_BuildValue("(isO)", err, s, filenameObject); + v = Py_BuildValue("((isO))", err, s, filenameObject); else - v = Py_BuildValue("(is)", err, s); + v = Py_BuildValue("((is))", err, s); if (v != NULL) { PyErr_SetObject(exc, v); Py_DECREF(v);

1 0

r54045 - python/branches/p3yk_no_args_on_exc/BROKEN
by brett.cannon 28 Feb '07

28 Feb '07

Author: brett.cannon Date: Wed Feb 28 23:34:21 2007 New Revision: 54045 Added: python/branches/p3yk_no_args_on_exc/BROKEN (contents, props changed) Log: Add a list of tests currently failing. Added: python/branches/p3yk_no_args_on_exc/BROKEN ============================================================================== --- (empty file) +++ python/branches/p3yk_no_args_on_exc/BROKEN Wed Feb 28 23:34:21 2007 @@ -0,0 +1,10 @@ +* Construction of exception at C level passing too many arguments? + + test_bsddb + + test_socket + + test_socket_ssl + + test_timeout + + test_urllib2net + + test_urllibnet + +* doctest oddness (need to change how SyntaxError is handled?) + + test_xml_etree

1 0

r54044 - python/branches/p3yk_no_args_on_exc/Lib/test/test_compiler.py
by brett.cannon 28 Feb '07

28 Feb '07

Author: brett.cannon Date: Wed Feb 28 23:33:57 2007 New Revision: 54044 Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_compiler.py Log: Fix a mistake made from the last attempt to fix this test for the BaseException.args removal. Only triggered when test_compiler run from regrtest with -uall. Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_compiler.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/test/test_compiler.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/test/test_compiler.py Wed Feb 28 23:33:57 2007 @@ -50,7 +50,7 @@ try: compiler.compile(buf, basename, "exec") except Exception as e: - args.message += "[in file %s]" % basename + e.message += "[in file %s]" % basename raise def testNewClassSyntax(self):

1 0

r54042 - python/branches/p3yk_no_args_on_exc/Lib/traceback.py
by brett.cannon 28 Feb '07

28 Feb '07

Author: brett.cannon Date: Wed Feb 28 22:41:27 2007 New Revision: 54042 Modified: python/branches/p3yk_no_args_on_exc/Lib/traceback.py Log: Fix for test_syntax failure. Modified: python/branches/p3yk_no_args_on_exc/Lib/traceback.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/traceback.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/traceback.py Wed Feb 28 22:41:27 2007 @@ -180,7 +180,7 @@ try: message = value.message filename = value.filename - lineno = value.lineno + lineno = value.lineno if value.lineno is not None else 0 offset = value.offset badline = value.text msg = value.message

1 0

r54041 - python/branches/p3yk_no_args_on_exc/Lib/test/test_userdict.py
by brett.cannon 28 Feb '07

28 Feb '07

Author: brett.cannon Date: Wed Feb 28 22:29:47 2007 New Revision: 54041 Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_userdict.py Log: Fix for BaseException.args removal. Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_userdict.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/test/test_userdict.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/test/test_userdict.py Wed Feb 28 22:29:47 2007 @@ -169,7 +169,7 @@ try: e[42] except RuntimeError as err: - self.assertEqual(err.args, (42,)) + self.assertEqual(err.message, 42) else: self.fail_("e[42] didn't raise RuntimeError") class F(UserDict.UserDict): @@ -181,7 +181,7 @@ try: f[42] except KeyError as err: - self.assertEqual(err.args, (42,)) + self.assertEqual(err.message, 42) else: self.fail_("f[42] didn't raise KeyError") class G(UserDict.UserDict): @@ -190,7 +190,7 @@ try: g[42] except KeyError as err: - self.assertEqual(err.args, (42,)) + self.assertEqual(err.message, 42) else: self.fail_("g[42] didn't raise KeyError")

1 0

r54040 - python/branches/p3yk_no_args_on_exc/Lib/traceback.py
by brett.cannon 28 Feb '07

28 Feb '07

Author: brett.cannon Date: Wed Feb 28 22:26:34 2007 New Revision: 54040 Modified: python/branches/p3yk_no_args_on_exc/Lib/traceback.py Log: Fix 'traceback' for BaseException.args removal. Modified: python/branches/p3yk_no_args_on_exc/Lib/traceback.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/traceback.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/traceback.py Wed Feb 28 22:26:34 2007 @@ -178,7 +178,12 @@ # It was a syntax error; show exactly where the problem was found. lines = [] try: - msg, (filename, lineno, offset, badline) = value.args + message = value.message + filename = value.filename + lineno = value.lineno + offset = value.offset + badline = value.text + msg = value.message except Exception: pass else:

1 0

r54039 - python/branches/p3yk_no_args_on_exc/Lib/_strptime.py
by brett.cannon 28 Feb '07

28 Feb '07

Author: brett.cannon Date: Wed Feb 28 22:12:06 2007 New Revision: 54039 Modified: python/branches/p3yk_no_args_on_exc/Lib/_strptime.py Log: Fix time.strptime for the removal of BaseException.args. Modified: python/branches/p3yk_no_args_on_exc/Lib/_strptime.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/_strptime.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/_strptime.py Wed Feb 28 22:12:06 2007 @@ -309,7 +309,7 @@ # KeyError raised when a bad format is found; can be specified as # \\, in which case it was a stray % but with a space after it except KeyError as err: - bad_directive = err.args[0] + bad_directive = err.message if bad_directive == "\\": bad_directive = "%" del err

1 0

r54038 - python/branches/p3yk_no_args_on_exc/Lib/sqlite3/test/hooks.py python/branches/p3yk_no_args_on_exc/Lib/sqlite3/test/userfunctions.py
by brett.cannon 28 Feb '07

28 Feb '07

Author: brett.cannon Date: Wed Feb 28 22:10:02 2007 New Revision: 54038 Modified: python/branches/p3yk_no_args_on_exc/Lib/sqlite3/test/hooks.py python/branches/p3yk_no_args_on_exc/Lib/sqlite3/test/userfunctions.py Log: Fix sqlite3's tests for BaseException.args removal. Modified: python/branches/p3yk_no_args_on_exc/Lib/sqlite3/test/hooks.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/sqlite3/test/hooks.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/sqlite3/test/hooks.py Wed Feb 28 22:10:02 2007 @@ -37,7 +37,7 @@ con.create_collation("X", 42) self.fail("should have raised a TypeError") except TypeError as e: - self.failUnlessEqual(e.args[0], "parameter must be callable") + self.failUnlessEqual(e.message, "parameter must be callable") def CheckCreateCollationNotAscii(self): con = sqlite.connect(":memory:") @@ -102,7 +102,7 @@ con.execute("select 'a' as x union select 'b' as x order by x collate mycoll") self.fail("should have raised an OperationalError") except sqlite.OperationalError as e: - if not e.args[0].startswith("no such collation sequence"): + if not e.message.startswith("no such collation sequence"): self.fail("wrong OperationalError raised") def suite(): Modified: python/branches/p3yk_no_args_on_exc/Lib/sqlite3/test/userfunctions.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/sqlite3/test/userfunctions.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/sqlite3/test/userfunctions.py Wed Feb 28 22:10:02 2007 @@ -206,7 +206,8 @@ cur.fetchone() self.fail("should have raised OperationalError") except sqlite.OperationalError as e: - self.failUnlessEqual(e.args[0], 'user-defined function raised exception') + self.failUnlessEqual(e.message, + 'user-defined function raised exception') def CheckParamString(self): cur = self.con.cursor() @@ -280,7 +281,8 @@ cur.execute("select nostep(t) from test") self.fail("should have raised an AttributeError") except AttributeError as e: - self.failUnlessEqual(e.args[0], "'AggrNoStep' object has no attribute 'step'") + self.failUnlessEqual(e.message, + "'AggrNoStep' object has no attribute 'step'") def CheckAggrNoFinalize(self): cur = self.con.cursor() @@ -289,7 +291,8 @@ val = cur.fetchone()[0] self.fail("should have raised an OperationalError") except sqlite.OperationalError as e: - self.failUnlessEqual(e.args[0], "user-defined aggregate's 'finalize' method raised error") + self.failUnlessEqual(e.message, + "user-defined aggregate's 'finalize' method raised error") def CheckAggrExceptionInInit(self): cur = self.con.cursor() @@ -298,7 +301,8 @@ val = cur.fetchone()[0] self.fail("should have raised an OperationalError") except sqlite.OperationalError as e: - self.failUnlessEqual(e.args[0], "user-defined aggregate's '__init__' method raised error") + self.failUnlessEqual(e.message, + "user-defined aggregate's '__init__' method raised error") def CheckAggrExceptionInStep(self): cur = self.con.cursor() @@ -307,7 +311,8 @@ val = cur.fetchone()[0] self.fail("should have raised an OperationalError") except sqlite.OperationalError as e: - self.failUnlessEqual(e.args[0], "user-defined aggregate's 'step' method raised error") + self.failUnlessEqual(e.message, + "user-defined aggregate's 'step' method raised error") def CheckAggrExceptionInFinalize(self): cur = self.con.cursor() @@ -316,7 +321,8 @@ val = cur.fetchone()[0] self.fail("should have raised an OperationalError") except sqlite.OperationalError as e: - self.failUnlessEqual(e.args[0], "user-defined aggregate's 'finalize' method raised error") + self.failUnlessEqual(e.message, + "user-defined aggregate's 'finalize' method raised error") def CheckAggrCheckParamStr(self): cur = self.con.cursor() @@ -385,7 +391,7 @@ try: self.con.execute("select * from t2") except sqlite.DatabaseError as e: - if not e.args[0].endswith("prohibited"): + if not e.message.endswith("prohibited"): self.fail("wrong exception text: %s" % e.args[0]) return self.fail("should have raised an exception due to missing privileges") @@ -394,7 +400,7 @@ try: self.con.execute("select c2 from t1") except sqlite.DatabaseError as e: - if not e.args[0].endswith("prohibited"): + if not e.message.endswith("prohibited"): self.fail("wrong exception text: %s" % e.args[0]) return self.fail("should have raised an exception due to missing privileges")

1 0