Mailman 3 October 2005 - Python-checkins

python/dist/src/Misc NEWS,1.1382,1.1383
by nnorwitz＠users.sourceforge.net Oct. 1, 2005

Oct. 1, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8132/Misc Modified Files: NEWS Log Message: - Fix segfault with invalid coding. - SF Bug #772896, unknown encoding results in MemoryError, which is not helpful I will only backport the segfault fix. I'll let Anthony decide if he wants the other changes backported. I will do the backport if asked. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1382 retrieving revision 1.1383 diff -u -d -r1.1382 -r1.1383 --- NEWS 1 Oct 2005 16:32:31 -0000 1.1382 +++ NEWS 2 Oct 2005 01:48:49 -0000 1.1383 @@ -12,6 +12,10 @@ Core and builtins ----------------- +- Fix segfault with invalid coding. + +- SF bug #772896: unknown encoding results in MemoryError. + - All iterators now have a Boolean value of true. Formerly, some iterators supported a __len__() method which evaluated to False when the iterator was empty.

1 0

python/dist/src/Parser parsetok.c, 2.36, 2.37 pgenmain.c, 2.31, 2.32 tokenizer.c, 2.78, 2.79
by nnorwitz＠users.sourceforge.net Oct. 1, 2005

Oct. 1, 2005

Update of /cvsroot/python/python/dist/src/Parser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8132/Parser Modified Files: parsetok.c pgenmain.c tokenizer.c Log Message: - Fix segfault with invalid coding. - SF Bug #772896, unknown encoding results in MemoryError, which is not helpful I will only backport the segfault fix. I'll let Anthony decide if he wants the other changes backported. I will do the backport if asked. Index: parsetok.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Parser/parsetok.c,v retrieving revision 2.36 retrieving revision 2.37 diff -u -d -r2.36 -r2.37 --- parsetok.c 8 Jul 2004 01:54:07 -0000 2.36 +++ parsetok.c 2 Oct 2005 01:48:51 -0000 2.37 @@ -42,7 +42,7 @@ initerr(err_ret, filename); if ((tok = PyTokenizer_FromString(s)) == NULL) { - err_ret->error = E_NOMEM; + err_ret->error = PyErr_Occurred() ? E_DECODE : E_NOMEM; return NULL; } Index: pgenmain.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Parser/pgenmain.c,v retrieving revision 2.31 retrieving revision 2.32 diff -u -d -r2.31 -r2.32 --- pgenmain.c 7 Feb 2004 13:53:46 -0000 2.31 +++ pgenmain.c 2 Oct 2005 01:48:51 -0000 2.32 @@ -116,6 +116,13 @@ return g; } +/* Can't happen in pgen */ +PyObject* +PyErr_Occurred() +{ + return 0; +} + void Py_FatalError(const char *msg) { Index: tokenizer.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Parser/tokenizer.c,v retrieving revision 2.78 retrieving revision 2.79 diff -u -d -r2.78 -r2.79 --- tokenizer.c 12 Jul 2005 21:53:43 -0000 2.78 +++ tokenizer.c 2 Oct 2005 01:48:51 -0000 2.79 @@ -603,8 +603,11 @@ if (tok->enc != NULL) { assert(utf8 == NULL); utf8 = translate_into_utf8(str, tok->enc); - if (utf8 == NULL) + if (utf8 == NULL) { + PyErr_Format(PyExc_SyntaxError, + "unknown encoding: %s", tok->enc); return NULL; + } str = PyString_AsString(utf8); } #endif

1 0

python/dist/src/Lib/test bad_coding.py, NONE, 1.1 test_coding.py, NONE, 1.1
by nnorwitz＠users.sourceforge.net Oct. 1, 2005

Oct. 1, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8132/Lib/test Added Files: bad_coding.py test_coding.py Log Message: - Fix segfault with invalid coding. - SF Bug #772896, unknown encoding results in MemoryError, which is not helpful I will only backport the segfault fix. I'll let Anthony decide if he wants the other changes backported. I will do the backport if asked. --- NEW FILE: bad_coding.py --- # -*- coding: uft-8 -*- --- NEW FILE: test_coding.py --- import test.test_support, unittest import os class CodingTest(unittest.TestCase): def test_bad_coding(self): module_name = 'bad_coding' self.assertRaises(SyntaxError, __import__, 'test.' + module_name) path = os.path.dirname(__file__) filename = os.path.join(path, module_name + '.py') fp = open(filename) text = fp.read() fp.close() self.assertRaises(SyntaxError, compile, text, filename, 'exec') def test_main(): test.test_support.run_unittest(CodingTest) if __name__ == "__main__": test_main()

1 0

python/dist/src/Python pythonrun.c,2.216,2.217
by nnorwitz＠users.sourceforge.net Oct. 1, 2005

Oct. 1, 2005

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8132/Python Modified Files: pythonrun.c Log Message: - Fix segfault with invalid coding. - SF Bug #772896, unknown encoding results in MemoryError, which is not helpful I will only backport the segfault fix. I'll let Anthony decide if he wants the other changes backported. I will do the backport if asked. Index: pythonrun.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v retrieving revision 2.216 retrieving revision 2.217 diff -u -d -r2.216 -r2.217 --- pythonrun.c 24 Aug 2005 08:39:24 -0000 2.216 +++ pythonrun.c 2 Oct 2005 01:48:50 -0000 2.217 @@ -1487,7 +1487,7 @@ msg = "unknown decode error"; Py_DECREF(type); Py_DECREF(value); - Py_DECREF(tb); + Py_XDECREF(tb); break; } case E_LINECONT:

1 0

python/dist/src/Objects stringobject.c, 2.232, 2.233
by birkenfeld＠users.sourceforge.net Oct. 1, 2005

Oct. 1, 2005

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7536/Objects Modified Files: stringobject.c Log Message: Fix PyString_Format so that the "%s" format works again when Unicode is not enabled. Index: stringobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v retrieving revision 2.232 retrieving revision 2.233 diff -u -d -r2.232 -r2.233 --- stringobject.c 31 Aug 2005 23:02:05 -0000 2.232 +++ stringobject.c 1 Oct 2005 17:06:00 -0000 2.233 @@ -4083,7 +4083,9 @@ argidx = argidx_start; goto unicode; } +#endif temp = _PyObject_Str(v); +#ifdef Py_USING_UNICODE if (temp != NULL && PyUnicode_Check(temp)) { Py_DECREF(temp); fmt = fmt_start;

1 0

python/dist/src/Misc NEWS, 1.1193.2.115, 1.1193.2.116
by birkenfeld＠users.sourceforge.net Oct. 1, 2005

Oct. 1, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1642/Misc Modified Files: Tag: release24-maint NEWS Log Message: backport bug [ 729103 ] Cannot retrieve name of super object Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.115 retrieving revision 1.1193.2.116 diff -u -d -r1.1193.2.115 -r1.1193.2.116 --- NEWS 30 Sep 2005 04:58:23 -0000 1.1193.2.115 +++ NEWS 1 Oct 2005 16:32:40 -0000 1.1193.2.116 @@ -20,6 +20,9 @@ Library ------- +- Bug #729103: pydoc.py: Fix docother() method to accept additional + "parent" argument. + - Patch #1300515: xdrlib.py: Fix pack_fstring() to really use null bytes for padding.

1 0

python/dist/src/Lib pydoc.py, 1.100.2.4, 1.100.2.5
by birkenfeld＠users.sourceforge.net Oct. 1, 2005

Oct. 1, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1642/Lib Modified Files: Tag: release24-maint pydoc.py Log Message: backport bug [ 729103 ] Cannot retrieve name of super object Index: pydoc.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v retrieving revision 1.100.2.4 retrieving revision 1.100.2.5 diff -u -d -r1.100.2.4 -r1.100.2.5 --- pydoc.py 22 Jul 2005 21:52:33 -0000 1.100.2.4 +++ pydoc.py 1 Oct 2005 16:32:40 -0000 1.100.2.5 @@ -1078,7 +1078,7 @@ if data: contents = [] for key, value in data: - contents.append(self.docother(value, key, name, 70)) + contents.append(self.docother(value, key, name, maxlen=70)) result = result + self.section('DATA', join(contents, '\n')) if hasattr(object, '__version__'): @@ -1163,7 +1163,7 @@ else: doc = None push(self.docother(getattr(object, name), - name, mod, 70, doc) + '\n') + name, mod, maxlen=70, doc=doc) + '\n') return attrs attrs = filter(lambda (name, kind, cls, value): visiblename(name), @@ -1282,7 +1282,7 @@ """Produce text documentation for a property.""" return self._docproperty(name, object, mod) - def docother(self, object, name=None, mod=None, maxlen=None, doc=None): + def docother(self, object, name=None, mod=None, parent=None, maxlen=None, doc=None): """Produce text documentation for a data object.""" repr = self.repr(object) if maxlen:

1 0

python/dist/src/Lib pydoc.py,1.106,1.107
by birkenfeld＠users.sourceforge.net Oct. 1, 2005

Oct. 1, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1616/Lib Modified Files: pydoc.py Log Message: bug [ 729103 ] Cannot retrieve name of super object Index: pydoc.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- pydoc.py 22 Jul 2005 21:52:25 -0000 1.106 +++ pydoc.py 1 Oct 2005 16:32:31 -0000 1.107 @@ -1079,7 +1079,7 @@ if data: contents = [] for key, value in data: - contents.append(self.docother(value, key, name, 70)) + contents.append(self.docother(value, key, name, maxlen=70)) result = result + self.section('DATA', join(contents, '\n')) if hasattr(object, '__version__'): @@ -1164,7 +1164,7 @@ else: doc = None push(self.docother(getattr(object, name), - name, mod, 70, doc) + '\n') + name, mod, maxlen=70, doc=doc) + '\n') return attrs attrs = filter(lambda (name, kind, cls, value): visiblename(name), @@ -1272,7 +1272,7 @@ """Produce text documentation for a property.""" return self._docdescriptor(name, object, mod) - def docother(self, object, name=None, mod=None, maxlen=None, doc=None): + def docother(self, object, name=None, mod=None, parent=None, maxlen=None, doc=None): """Produce text documentation for a data object.""" repr = self.repr(object) if maxlen:

1 0

python/dist/src/Misc NEWS,1.1381,1.1382
by birkenfeld＠users.sourceforge.net Oct. 1, 2005

Oct. 1, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1616/Misc Modified Files: NEWS Log Message: bug [ 729103 ] Cannot retrieve name of super object Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1381 retrieving revision 1.1382 diff -u -d -r1.1381 -r1.1382 --- NEWS 30 Sep 2005 04:46:49 -0000 1.1381 +++ NEWS 1 Oct 2005 16:32:31 -0000 1.1382 @@ -245,6 +245,9 @@ Library ------- +- Bug #729103: pydoc.py: Fix docother() method to accept additional + "parent" argument. + - Patch #1300515: xdrlib.py: Fix pack_fstring() to really use null bytes for padding.

1 0