Mailman 3 July 2010 - Python-checkins

r83246 - python/branches/import_unicode/Python/ast.c
by victor.stinner 29 Jul '10

29 Jul '10

Author: victor.stinner Date: Fri Jul 30 01:03:50 2010 New Revision: 83246 Log: ast_error_finish() uses PyUnicode_DecodeFSDefault() to decode the input filename Modified: python/branches/import_unicode/Python/ast.c Modified: python/branches/import_unicode/Python/ast.c ============================================================================== --- python/branches/import_unicode/Python/ast.c (original) +++ python/branches/import_unicode/Python/ast.c Fri Jul 30 01:03:50 2010 @@ -103,6 +103,7 @@ { PyObject *type, *value, *tback, *errstr, *loc, *tmp; long lineno; + PyObject *filename_obj; assert(PyErr_Occurred()); if (!PyErr_ExceptionMatches(PyExc_SyntaxError)) @@ -125,8 +126,19 @@ Py_INCREF(Py_None); loc = Py_None; } - tmp = Py_BuildValue("(zlOO)", filename, lineno, Py_None, loc); - Py_DECREF(loc); + if (filename != NULL) { + filename_obj = PyUnicode_DecodeFSDefault(filename); + if (filename_obj == NULL) { + Py_DECREF(loc); + Py_DECREF(errstr); + return; + } + } + else { + Py_INCREF(Py_None); + filename_obj = Py_None; + } + tmp = Py_BuildValue("(NlON)", filename_obj, lineno, Py_None, loc); if (!tmp) { Py_DECREF(errstr); return;

1 0

r83245 - python/branches/import_unicode/Python/pythonrun.c
by victor.stinner 29 Jul '10

29 Jul '10

Author: victor.stinner Date: Fri Jul 30 00:57:23 2010 New Revision: 83245 Log: err_input() uses PyUnicode_DecodeFSDefault() to decode the input filename Modified: python/branches/import_unicode/Python/pythonrun.c Modified: python/branches/import_unicode/Python/pythonrun.c ============================================================================== --- python/branches/import_unicode/Python/pythonrun.c (original) +++ python/branches/import_unicode/Python/pythonrun.c Fri Jul 30 00:57:23 2010 @@ -2088,6 +2088,8 @@ PyObject *v, *w, *errtype, *errtext; PyObject *msg_obj = NULL; char *msg = NULL; + PyObject *filename; + errtype = PyExc_SyntaxError; switch (err->error) { case E_ERROR: @@ -2171,8 +2173,17 @@ errtext = PyUnicode_DecodeUTF8(err->text, strlen(err->text), "replace"); } - v = Py_BuildValue("(ziiN)", err->filename, - err->lineno, err->offset, errtext); + if (err->filename != NULL) + filename = PyUnicode_DecodeFSDefault(err->filename); + else { + Py_INCREF(Py_None); + filename = Py_None; + } + if (filename != NULL) + v = Py_BuildValue("(NiiN)", filename, + err->lineno, err->offset, errtext); + else + v = NULL; if (v != NULL) { if (msg_obj) w = Py_BuildValue("(OO)", msg_obj, v);

1 0

r83244 - python/branches/import_unicode/Python/compile.c
by victor.stinner 29 Jul '10

29 Jul '10

Author: victor.stinner Date: Fri Jul 30 00:51:21 2010 New Revision: 83244 Log: compiler_error() uses PyUnicode_DecodeFSDefault() to decode the filename Modified: python/branches/import_unicode/Python/compile.c Modified: python/branches/import_unicode/Python/compile.c ============================================================================== --- python/branches/import_unicode/Python/compile.c (original) +++ python/branches/import_unicode/Python/compile.c Fri Jul 30 00:51:21 2010 @@ -3363,13 +3363,23 @@ { PyObject *loc; PyObject *u = NULL, *v = NULL; + PyObject *filename; loc = PyErr_ProgramText(c->c_filename, c->u->u_lineno); if (!loc) { Py_INCREF(Py_None); loc = Py_None; } - u = Py_BuildValue("(ziOO)", c->c_filename, c->u->u_lineno, + if (c->c_filename != NULL) { + filename = PyUnicode_DecodeFSDefault(c->c_filename); + if (filename == NULL) + goto exit; + } + else { + Py_INCREF(Py_None); + filename = Py_None; + } + u = Py_BuildValue("(NiOO)", filename, c->u->u_lineno, Py_None, loc); if (!u) goto exit;

1 0

r83243 - python/branches/import_unicode/Python/errors.c
by victor.stinner 29 Jul '10

29 Jul '10

Author: victor.stinner Date: Fri Jul 30 00:51:19 2010 New Revision: 83243 Log: PyErr_SyntaxLocation() uses PyUnicode_DecodeFSDefault() to decode the filename Modified: python/branches/import_unicode/Python/errors.c Modified: python/branches/import_unicode/Python/errors.c ============================================================================== --- python/branches/import_unicode/Python/errors.c (original) +++ python/branches/import_unicode/Python/errors.c Fri Jul 30 00:51:19 2010 @@ -803,7 +803,7 @@ Py_DECREF(tmp); } if (filename != NULL) { - tmp = PyUnicode_FromString(filename); + tmp = PyUnicode_DecodeFSDefault(filename); if (tmp == NULL) PyErr_Clear(); else {

1 0

r83242 - in python/branches/release26-maint: Misc/NEWS Modules/_struct.c
by mark.dickinson 29 Jul '10

29 Jul '10

Author: mark.dickinson Date: Thu Jul 29 23:47:28 2010 New Revision: 83242 Log: Merged revisions 83241 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83241 | mark.dickinson | 2010-07-29 22:44:47 +0100 (Thu, 29 Jul 2010) | 9 lines Merged revisions 83239 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83239 | mark.dickinson | 2010-07-29 22:41:59 +0100 (Thu, 29 Jul 2010) | 2 lines Issue #9422: Fix memory leak when re-initializing a struct.Struct object. ........ ................ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Misc/NEWS python/branches/release26-maint/Modules/_struct.c Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Thu Jul 29 23:47:28 2010 @@ -322,6 +322,8 @@ Extension Modules ----------------- +- Issue #9422: Fix memory leak when re-initializing a struct.Struct object. + - Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly compared to other unix systems. In particular, os.getgroups() does not reflect any changes made using os.setgroups() but basicly always Modified: python/branches/release26-maint/Modules/_struct.c ============================================================================== --- python/branches/release26-maint/Modules/_struct.c (original) +++ python/branches/release26-maint/Modules/_struct.c Thu Jul 29 23:47:28 2010 @@ -1404,6 +1404,9 @@ PyErr_NoMemory(); return -1; } + /* Free any s_codes value left over from a previous initialization. */ + if (self->s_codes != NULL) + PyMem_FREE(self->s_codes); self->s_codes = codes; s = fmt;

1 0

r83241 - in python/branches/release27-maint: Misc/NEWS Modules/_struct.c
by mark.dickinson 29 Jul '10

29 Jul '10

Author: mark.dickinson Date: Thu Jul 29 23:44:47 2010 New Revision: 83241 Log: Merged revisions 83239 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83239 | mark.dickinson | 2010-07-29 22:41:59 +0100 (Thu, 29 Jul 2010) | 2 lines Issue #9422: Fix memory leak when re-initializing a struct.Struct object. ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Misc/NEWS python/branches/release27-maint/Modules/_struct.c Modified: python/branches/release27-maint/Misc/NEWS ============================================================================== --- python/branches/release27-maint/Misc/NEWS (original) +++ python/branches/release27-maint/Misc/NEWS Thu Jul 29 23:44:47 2010 @@ -64,6 +64,8 @@ Extension Modules ----------------- +- Issue #9422: Fix memory leak when re-initializing a struct.Struct object. + - Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly compared to other unix systems. In particular, os.getgroups() does not reflect any changes made using os.setgroups() but basicly always Modified: python/branches/release27-maint/Modules/_struct.c ============================================================================== --- python/branches/release27-maint/Modules/_struct.c (original) +++ python/branches/release27-maint/Modules/_struct.c Thu Jul 29 23:44:47 2010 @@ -1289,6 +1289,9 @@ PyErr_NoMemory(); return -1; } + /* Free any s_codes value left over from a previous initialization. */ + if (self->s_codes != NULL) + PyMem_FREE(self->s_codes); self->s_codes = codes; s = fmt;

1 0

r83240 - in python/branches/release31-maint: Misc/NEWS Modules/_struct.c
by mark.dickinson 29 Jul '10

29 Jul '10

Author: mark.dickinson Date: Thu Jul 29 23:43:24 2010 New Revision: 83240 Log: Merged revisions 83239 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83239 | mark.dickinson | 2010-07-29 22:41:59 +0100 (Thu, 29 Jul 2010) | 2 lines Issue #9422: Fix memory leak when re-initializing a struct.Struct object. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Misc/NEWS python/branches/release31-maint/Modules/_struct.c Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Thu Jul 29 23:43:24 2010 @@ -323,6 +323,8 @@ Extension Modules ----------------- +- Issue #9422: Fix memory leak when re-initializing a struct.Struct object. + - Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly compared to other unix systems. In particular, os.getgroups() does not reflect any changes made using os.setgroups() but basicly always Modified: python/branches/release31-maint/Modules/_struct.c ============================================================================== --- python/branches/release31-maint/Modules/_struct.c (original) +++ python/branches/release31-maint/Modules/_struct.c Thu Jul 29 23:43:24 2010 @@ -1233,6 +1233,9 @@ PyErr_NoMemory(); return -1; } + /* Free any s_codes value left over from a previous initialization. */ + if (self->s_codes != NULL) + PyMem_FREE(self->s_codes); self->s_codes = codes; s = fmt;

1 0

r83239 - in python/branches/py3k: Misc/NEWS Modules/_struct.c
by mark.dickinson 29 Jul '10

29 Jul '10

Author: mark.dickinson Date: Thu Jul 29 23:41:59 2010 New Revision: 83239 Log: Issue #9422: Fix memory leak when re-initializing a struct.Struct object. Modified: python/branches/py3k/Misc/NEWS python/branches/py3k/Modules/_struct.c Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Thu Jul 29 23:41:59 2010 @@ -1492,6 +1492,8 @@ Extension Modules ----------------- +- Issue #9422: Fix memory leak when re-initializing a struct.Struct object. + - Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly compared to other unix systems. In particular, os.getgroups() does not reflect any changes made using os.setgroups() but basicly always Modified: python/branches/py3k/Modules/_struct.c ============================================================================== --- python/branches/py3k/Modules/_struct.c (original) +++ python/branches/py3k/Modules/_struct.c Thu Jul 29 23:41:59 2010 @@ -1247,6 +1247,9 @@ PyErr_NoMemory(); return -1; } + /* Free any s_codes value left over from a previous initialization. */ + if (self->s_codes != NULL) + PyMem_FREE(self->s_codes); self->s_codes = codes; s = fmt;

1 0

r83238 - in python/branches/py3k: Lib/test/test_robotparser.py Lib/urllib/robotparser.py Misc/NEWS
by georg.brandl 29 Jul '10

29 Jul '10

Author: georg.brandl Date: Thu Jul 29 19:55:01 2010 New Revision: 83238 Log: #4108: the first default entry (User-agent: *) wins. Modified: python/branches/py3k/Lib/test/test_robotparser.py python/branches/py3k/Lib/urllib/robotparser.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/test/test_robotparser.py ============================================================================== --- python/branches/py3k/Lib/test/test_robotparser.py (original) +++ python/branches/py3k/Lib/test/test_robotparser.py Thu Jul 29 19:55:01 2010 @@ -216,6 +216,20 @@ RobotTest(14, doc, good, bad) +# 15. For issue #4108 (obey first * entry) +doc = """ +User-agent: * +Disallow: /some/path + +User-agent: * +Disallow: /another/path +""" + +good = ['/another/path'] +bad = ['/some/path'] + +RobotTest(15, doc, good, bad) + class NetworkTestCase(unittest.TestCase): Modified: python/branches/py3k/Lib/urllib/robotparser.py ============================================================================== --- python/branches/py3k/Lib/urllib/robotparser.py (original) +++ python/branches/py3k/Lib/urllib/robotparser.py Thu Jul 29 19:55:01 2010 @@ -66,7 +66,9 @@ def _add_entry(self, entry): if "*" in entry.useragents: # the default entry is considered last - self.default_entry = entry + if self.default_entry is None: + # the first default entry wins + self.default_entry = entry else: self.entries.append(entry) @@ -118,7 +120,7 @@ entry.rulelines.append(RuleLine(line[1], True)) state = 2 if state == 2: - self.entries.append(entry) + self._add_entry(entry) def can_fetch(self, useragent, url): Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Thu Jul 29 19:55:01 2010 @@ -475,6 +475,9 @@ Library ------- +- Issue #4108: In urllib.robotparser, if there are multiple 'User-agent: *' + entries, consider the first one. + - Issue #6630: Allow customizing regex flags when subclassing the string.Template class.

1 0

r83237 - python/branches/py3k/Lib/os.py
by victor.stinner 29 Jul '10

29 Jul '10

Author: victor.stinner Date: Thu Jul 29 19:19:38 2010 New Revision: 83237 Log: #8603: Add environb to os.__all__ Modified: python/branches/py3k/Lib/os.py Modified: python/branches/py3k/Lib/os.py ============================================================================== --- python/branches/py3k/Lib/os.py (original) +++ python/branches/py3k/Lib/os.py Thu Jul 29 19:19:38 2010 @@ -533,7 +533,8 @@ The optional second argument can specify an alternate default. key, default and the result are bytes.""" return environb.get(key, default) - __all__.append("getenvb") + + __all__.extend(("environb", "getenvb")) def fsencode(value): """Encode value for use in the file system, environment variables

1 0