Mailman 3 February 2007 - Python-checkins

r54025 - python/branches/p3yk_no_args_on_exc/Lib/doctest.py
by brett.cannon Feb. 28, 2007

Feb. 28, 2007

Author: brett.cannon Date: Wed Feb 28 19:26:32 2007 New Revision: 54025 Modified: python/branches/p3yk_no_args_on_exc/Lib/doctest.py Log: Fix for removal of 'args' from exceptions. Modified: python/branches/p3yk_no_args_on_exc/Lib/doctest.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/doctest.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/doctest.py Wed Feb 28 19:26:32 2007 @@ -1611,7 +1611,7 @@ >>> raise exc_info[0], exc_info[1], exc_info[2] Traceback (most recent call last): ... - KeyError + KeyError: '' We wrap the original exception to give the calling application access to the test and example information. @@ -2050,7 +2050,7 @@ global _unittest_reportflags if (flags & REPORTING_FLAGS) != flags: - raise ValueError("Only reporting flags allowed", flags) + raise ValueError(("Only reporting flags allowed", flags)) old = _unittest_reportflags _unittest_reportflags = flags return old @@ -2151,7 +2151,7 @@ >>> raise exc_info[0], exc_info[1], exc_info[2] Traceback (most recent call last): ... - KeyError + KeyError: '' If the output doesn't match, then a DocTestFailure is raised:

1 0

r54024 - python/branches/p3yk_no_args_on_exc/Lib/test/test_dict.py
by brett.cannon Feb. 28, 2007

Feb. 28, 2007

Author: brett.cannon Date: Wed Feb 28 19:19:30 2007 New Revision: 54024 Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_dict.py Log: Fix the test for the exception 'args' removal. Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_dict.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/test/test_dict.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/test/test_dict.py Wed Feb 28 19:19:30 2007 @@ -423,7 +423,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(dict): @@ -434,7 +434,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(dict): @@ -443,7 +443,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") @@ -453,7 +453,7 @@ try: d[(1,)] except KeyError as e: - self.assertEqual(e.args, ((1,),)) + self.assertEqual(e.message, (1,)) else: self.fail("missing KeyError")

1 0

r54023 - in python/branches/p3yk_no_args_on_exc: Lib/test/test_exceptions.py Objects/exceptions.c
by brett.cannon Feb. 28, 2007

Feb. 28, 2007

Author: brett.cannon Date: Wed Feb 28 19:15:35 2007 New Revision: 54023 Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_exceptions.py python/branches/p3yk_no_args_on_exc/Objects/exceptions.c Log: Allow SyntaxError to be instantiated with no arguments. Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_exceptions.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/test/test_exceptions.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/test/test_exceptions.py Wed Feb 28 19:15:35 2007 @@ -224,6 +224,9 @@ (EnvironmentError, (1, 'strErrorStr', 'filenameStr'), {'message' : 1, 'errno' : 1, 'strerror' : 'strErrorStr', 'filename' : 'filenameStr'}), + (SyntaxError, (), {'message' : '', 'text' : None, + 'print_file_and_line' : None, 'msg' : '', 'filename' : None, + 'lineno' : None, 'offset' : None}), (SyntaxError, ('msgStr',), {'message' : 'msgStr', 'text' : None, 'print_file_and_line' : None, 'msg' : 'msgStr', 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 Wed Feb 28 19:15:35 2007 @@ -919,7 +919,7 @@ self->msg = self->message; Py_INCREF(self->msg); - if (lenargs == 1) { + if (lenargs == 0 || lenargs == 1) { Py_INCREF(Py_None); self->filename = Py_None; Py_INCREF(Py_None); @@ -960,7 +960,7 @@ Py_DECREF(info); } else { - PyErr_SetString(PyExc_TypeError, "expect either 0, 1, or 2 arguments"); + PyErr_SetString(PyExc_TypeError, "0, 1, or 2 arguments required"); return -1; } return 0;

1 0

r54022 - python/trunk/Lib/test/test_exceptions.py
by brett.cannon Feb. 28, 2007

Feb. 28, 2007

Author: brett.cannon Date: Wed Feb 28 19:15:00 2007 New Revision: 54022 Modified: python/trunk/Lib/test/test_exceptions.py Log: Add a test for instantiating SyntaxError with no arguments. Modified: python/trunk/Lib/test/test_exceptions.py ============================================================================== --- python/trunk/Lib/test/test_exceptions.py (original) +++ python/trunk/Lib/test/test_exceptions.py Wed Feb 28 19:15:00 2007 @@ -225,6 +225,9 @@ (EnvironmentError, (1, 'strErrorStr', 'filenameStr'), {'message' : '', 'args' : (1, 'strErrorStr'), 'errno' : 1, 'strerror' : 'strErrorStr', 'filename' : 'filenameStr'}), + (SyntaxError, (), {'message' : '', 'msg' : None, 'text' : None, + 'filename' : None, 'lineno' : None, 'offset' : None, + 'print_file_and_line' : None}), (SyntaxError, ('msgStr',), {'message' : 'msgStr', 'args' : ('msgStr',), 'text' : None, 'print_file_and_line' : None, 'msg' : 'msgStr',

1 0

r54020 - python/branches/p3yk_no_args_on_exc/Lib/test/test_defaultdict.py
by brett.cannon Feb. 28, 2007

Feb. 28, 2007

Author: brett.cannon Date: Wed Feb 28 18:39:53 2007 New Revision: 54020 Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_defaultdict.py Log: Fix for BaseException.args removal. Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_defaultdict.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/test/test_defaultdict.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/test/test_defaultdict.py Wed Feb 28 18:39:53 2007 @@ -44,7 +44,7 @@ try: d2[15] except KeyError as err: - self.assertEqual(err.args, (15,)) + self.assertEqual(err.message, 15) else: self.fail("d2[15] didn't raise KeyError") self.assertRaises(TypeError, defaultdict, 1)

1 0

r54019 - python/branches/p3yk_no_args_on_exc/Lib/test/test_contextlib.py
by brett.cannon Feb. 28, 2007

Feb. 28, 2007

Author: brett.cannon Date: Wed Feb 28 18:39:04 2007 New Revision: 54019 Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_contextlib.py Log: Another BaseException.args removal fix. Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_contextlib.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/test/test_contextlib.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/test/test_contextlib.py Wed Feb 28 18:39:04 2007 @@ -77,7 +77,7 @@ try: yield 42 except ZeroDivisionError as e: - state.append(e.args[0]) + state.append(e.message) self.assertEqual(state, [1, 42, 999]) with woohoo() as x: self.assertEqual(state, [1])

1 0

r54018 - python/branches/p3yk_no_args_on_exc/Lib/test/test_cgi.py python/branches/p3yk_no_args_on_exc/Lib/test/test_compiler.py
by brett.cannon Feb. 28, 2007

Feb. 28, 2007

Author: brett.cannon Date: Wed Feb 28 18:37:52 2007 New Revision: 54018 Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_cgi.py python/branches/p3yk_no_args_on_exc/Lib/test/test_compiler.py Log: Fixes for BaseException.args removal. Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_cgi.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/test/test_cgi.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/test/test_cgi.py Wed Feb 28 18:37:52 2007 @@ -30,7 +30,7 @@ if not isinstance(anExc, Exception): return NotImplemented return (self.err.__class__ == anExc.__class__ and - self.err.args == anExc.args) + self.err.message == anExc.message) def __getattr__(self, attr): return getattr(self.err, attr) 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 18:37:52 2007 @@ -50,9 +50,7 @@ try: compiler.compile(buf, basename, "exec") except Exception as e: - args = list(e.args) - args[0] += "[in file %s]" % basename - e.args = tuple(args) + args.message += "[in file %s]" % basename raise def testNewClassSyntax(self):

1 0

r54017 - python/branches/p3yk_no_args_on_exc/Lib/test/test_grammar.py
by brett.cannon Feb. 28, 2007

Feb. 28, 2007

Author: brett.cannon Date: Wed Feb 28 18:15:10 2007 New Revision: 54017 Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_grammar.py Log: Make test_grammar pass for the removal of BaseException.args. Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_grammar.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/test/test_grammar.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/test/test_grammar.py Wed Feb 28 18:15:10 2007 @@ -492,7 +492,7 @@ try: assert 0, "msg" except AssertionError as e: - self.assertEquals(e.args[0], "msg") + self.assertEquals(e.message, "msg") else: if __debug__: self.fail("AssertionError not raised by assert 0")

1 0

r54016 - python/trunk/Lib/test/crashers/modify_dict_attr.py
by armin.rigo Feb. 28, 2007

Feb. 28, 2007

Author: armin.rigo Date: Wed Feb 28 10:25:29 2007 New Revision: 54016 Added: python/trunk/Lib/test/crashers/modify_dict_attr.py - copied, changed from r53996, python/trunk/Lib/test/crashers/modify_dict_attr.py Log: Modify the segfaulting example to show why r53997 is not a solution to it. Copied: python/trunk/Lib/test/crashers/modify_dict_attr.py (from r53996, python/trunk/Lib/test/crashers/modify_dict_attr.py) ============================================================================== --- python/trunk/Lib/test/crashers/modify_dict_attr.py (original) +++ python/trunk/Lib/test/crashers/modify_dict_attr.py Wed Feb 28 10:25:29 2007 @@ -4,16 +4,17 @@ class Y(object): pass -class type_with_modifiable_dict(Y, type): +class type_with_modifiable_dict(type, Y): pass class MyClass(object): - """This class has its __dict__ attribute completely exposed: - user code can read, reassign and even delete it. + """This class has its __dict__ attribute indirectly + exposed via the __dict__ getter/setter of Y. """ __metaclass__ = type_with_modifiable_dict if __name__ == '__main__': - del MyClass.__dict__ # if we set tp_dict to NULL, + dictattr = Y.__dict__['__dict__'] + dictattr.__delete__(MyClass) # if we set tp_dict to NULL, print MyClass # doing anything with MyClass segfaults

1 0

r54015 - in python/branches/p3yk_no_args_on_exc: Lib/test/test_exceptions.py Objects/exceptions.c
by brett.cannon Feb. 28, 2007

Feb. 28, 2007

Author: brett.cannon Date: Wed Feb 28 05:56:17 2007 New Revision: 54015 Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_exceptions.py python/branches/p3yk_no_args_on_exc/Objects/exceptions.c Log: Get 'args' removal from exceptions to be able to pass test_exceptions, test_exception_variations, and test_pep352. Modified: python/branches/p3yk_no_args_on_exc/Lib/test/test_exceptions.py ============================================================================== --- python/branches/p3yk_no_args_on_exc/Lib/test/test_exceptions.py (original) +++ python/branches/p3yk_no_args_on_exc/Lib/test/test_exceptions.py Wed Feb 28 05:56:17 2007 @@ -259,7 +259,6 @@ except BaseException as e: if type(e) is not exc: raise - print(repr(e), ':', args) # Verify module name self.assertEquals(type(e).__module__, '__builtin__') # Verify no ref leaks in Exc_str() 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 Wed Feb 28 05:56:17 2007 @@ -1534,6 +1534,27 @@ return BaseException_traverse((PyBaseExceptionObject *)self, visit, arg); } + +static PyObject * +UnicodeError_reduce(PyUnicodeErrorObject *self) +{ + if (self->dict) + return Py_BuildValue("(O, (O, O, O, O, O), O)", self->ob_type, + self->encoding, self->object, self->start, + self->end, self->reason, self->dict); + else + return Py_BuildValue("(O, (O, O, O, O, O))", self->ob_type, + self->encoding, self->object, self->start, + self->end, self->reason); + +} + + +static PyMethodDef UnicodeError_methods[] = { + {"__reduce__", (PyCFunction)UnicodeError_reduce, METH_NOARGS}, + {NULL} +}; + static PyMemberDef UnicodeError_members[] = { {"message", T_OBJECT, offsetof(PyUnicodeErrorObject, message), 0, PyDoc_STR("exception message")}, @@ -1612,8 +1633,9 @@ (reprfunc)UnicodeEncodeError_str, 0, 0, 0, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, PyDoc_STR("Unicode encoding error."), (traverseproc)UnicodeError_traverse, - (inquiry)UnicodeError_clear, 0, 0, 0, 0, 0, UnicodeError_members, - 0, &_PyExc_UnicodeError, 0, 0, 0, offsetof(PyUnicodeErrorObject, dict), + (inquiry)UnicodeError_clear, 0, 0, 0, 0, UnicodeError_methods, + UnicodeError_members, 0, &_PyExc_UnicodeError, 0, 0, 0, + offsetof(PyUnicodeErrorObject, dict), (initproc)UnicodeEncodeError_init, 0, BaseException_new, }; PyObject *PyExc_UnicodeEncodeError = (PyObject *)&_PyExc_UnicodeEncodeError; @@ -1685,9 +1707,10 @@ (reprfunc)UnicodeDecodeError_str, 0, 0, 0, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, PyDoc_STR("Unicode decoding error."), (traverseproc)UnicodeError_traverse, - (inquiry)UnicodeError_clear, 0, 0, 0, 0, 0, UnicodeError_members, - 0, &_PyExc_UnicodeError, 0, 0, 0, offsetof(PyUnicodeErrorObject, dict), - (initproc)UnicodeDecodeError_init, 0, BaseException_new, + (inquiry)UnicodeError_clear, 0, 0, 0, 0, UnicodeError_methods, + UnicodeError_members, 0, &_PyExc_UnicodeError, 0, 0, 0, + offsetof(PyUnicodeErrorObject, dict), (initproc)UnicodeDecodeError_init, 0, + BaseException_new, }; PyObject *PyExc_UnicodeDecodeError = (PyObject *)&_PyExc_UnicodeDecodeError; @@ -1775,6 +1798,27 @@ ); } + +static PyObject * +UnicodeTranslateError_reduce(PyUnicodeErrorObject *self) +{ + if (self->dict) + return Py_BuildValue("(O, (O, O, O, O), O)", self->ob_type, + self->object, self->start, self->end, + self->reason, self->dict); + else + return Py_BuildValue("(O, (O, O, O, O))", self->ob_type, + self->object, self->start, self->end, + self->reason); +} + + +static PyMethodDef UnicodeTranslateError_methods[] = { + {"__reduce__", (PyCFunction)UnicodeTranslateError_reduce, METH_NOARGS}, + {NULL} +}; + + static PyTypeObject _PyExc_UnicodeTranslateError = { PyObject_HEAD_INIT(NULL) 0, @@ -1784,8 +1828,9 @@ (reprfunc)UnicodeTranslateError_str, 0, 0, 0, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, PyDoc_STR("Unicode translation error."), (traverseproc)UnicodeError_traverse, - (inquiry)UnicodeError_clear, 0, 0, 0, 0, 0, UnicodeError_members, - 0, &_PyExc_UnicodeError, 0, 0, 0, offsetof(PyUnicodeErrorObject, dict), + (inquiry)UnicodeError_clear, 0, 0, 0, 0, UnicodeTranslateError_methods, + UnicodeError_members, 0, &_PyExc_UnicodeError, 0, 0, 0, + offsetof(PyUnicodeErrorObject, dict), (initproc)UnicodeTranslateError_init, 0, BaseException_new, }; PyObject *PyExc_UnicodeTranslateError = (PyObject *)&_PyExc_UnicodeTranslateError;

1 0