Mailman 3 December 2011 - Python-checkins

cpython (2.7): Issue #7502: Fix equality comparison for DocTestCase instances.
by antoine.pitrou Dec. 18, 2011

Dec. 18, 2011

http://hg.python.org/cpython/rev/64d670a8b183 changeset: 74050:64d670a8b183 branch: 2.7 parent: 74036:775319cebaa3 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Dec 18 19:27:45 2011 +0100 summary: Issue #7502: Fix equality comparison for DocTestCase instances. Patch by Cédric Krier. files: Lib/doctest.py | 41 ++++++++++++++++++++++++++++ Lib/test/test_doctest.py | 40 +++++++++++++++++++++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 ++ 4 files changed, 85 insertions(+), 0 deletions(-) diff --git a/Lib/doctest.py b/Lib/doctest.py --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -451,6 +451,21 @@ self.options = options self.exc_msg = exc_msg + def __eq__(self, other): + if type(self) is not type(other): + return NotImplemented + + return self.source == other.source and \ + self.want == other.want and \ + self.lineno == other.lineno and \ + self.indent == other.indent and \ + self.options == other.options and \ + self.exc_msg == other.exc_msg + + def __ne__(self, other): + return not self == other + + class DocTest: """ A collection of doctest examples that should be run in a single @@ -499,6 +514,19 @@ return ('<DocTest %s from %s:%s (%s)>' % (self.name, self.filename, self.lineno, examples)) + def __eq__(self, other): + if type(self) is not type(other): + return NotImplemented + + return self.examples == other.examples and \ + self.docstring == other.docstring and \ + self.globs == other.globs and \ + self.name == other.name and \ + self.filename == other.filename and \ + self.lineno == other.lineno + + def __ne__(self, other): + return not self == other # This lets us sort tests by name: def __cmp__(self, other): @@ -2252,6 +2280,19 @@ def id(self): return self._dt_test.name + def __eq__(self, other): + if type(self) is not type(other): + return NotImplemented + + return self._dt_test == other._dt_test and \ + self._dt_optionflags == other._dt_optionflags and \ + self._dt_setUp == other._dt_setUp and \ + self._dt_tearDown == other._dt_tearDown and \ + self._dt_checker == other._dt_checker + + def __ne__(self, other): + return not self == other + def __repr__(self): name = self._dt_test.name.split('.') return "%s (%s)" % (name[-1], '.'.join(name[:-1])) diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -347,6 +347,46 @@ Traceback (most recent call last): ValueError: line 2 of the docstring for some_test lacks blank after ...: '...print 1' +Compare `DocTest`: + + >>> docstring = ''' + ... >>> print 12 + ... 12 + ... ''' + >>> test = parser.get_doctest(docstring, globs, 'some_test', + ... 'some_test', 20) + >>> same_test = parser.get_doctest(docstring, globs, 'some_test', + ... 'some_test', 20) + >>> test == same_test + True + >>> test != same_test + False + >>> docstring = ''' + ... >>> print 42 + ... 42 + ... ''' + >>> other_test = parser.get_doctest(docstring, globs, 'other_test', + ... 'other_file', 10) + >>> test == other_test + False + >>> test != other_test + True + +Compare `DocTestCase`: + + >>> DocTestCase = doctest.DocTestCase + >>> test_case = DocTestCase(test) + >>> same_test_case = DocTestCase(same_test) + >>> other_test_case = DocTestCase(other_test) + >>> test_case == same_test_case + True + >>> test_case != same_test_case + False + >>> test == other_test_case + False + >>> test != other_test_case + True + """ def test_DocTestFinder(): r""" diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -464,6 +464,7 @@ Holger Krekel Michael Kremer Fabian Kreutz +Cédric Krier Hannu Krosing Andrej Krpic Ivan Krstić diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -86,6 +86,9 @@ Library ------- +- Issue #7502: Fix equality comparison for DocTestCase instances. Patch by + Cédric Krier. + - Issue #11870: threading: Properly reinitialize threads internal locks and condition variables to avoid deadlocks in child processes. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #7502: Fix equality comparison for DocTestCase instances.
by antoine.pitrou Dec. 18, 2011

Dec. 18, 2011

http://hg.python.org/cpython/rev/b8cb6f1e4981 changeset: 74049:b8cb6f1e4981 parent: 74041:99aaa0a4f23b parent: 74048:a175284ede57 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Dec 18 19:29:06 2011 +0100 summary: Issue #7502: Fix equality comparison for DocTestCase instances. Patch by Cédric Krier. files: Lib/doctest.py | 41 ++++++++++++++++++++++++++++ Lib/test/test_doctest.py | 40 +++++++++++++++++++++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 ++ 4 files changed, 85 insertions(+), 0 deletions(-) diff --git a/Lib/doctest.py b/Lib/doctest.py --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -440,6 +440,21 @@ self.options = options self.exc_msg = exc_msg + def __eq__(self, other): + if type(self) is not type(other): + return NotImplemented + + return self.source == other.source and \ + self.want == other.want and \ + self.lineno == other.lineno and \ + self.indent == other.indent and \ + self.options == other.options and \ + self.exc_msg == other.exc_msg + + def __ne__(self, other): + return not self == other + + class DocTest: """ A collection of doctest examples that should be run in a single @@ -488,6 +503,19 @@ return ('<DocTest %s from %s:%s (%s)>' % (self.name, self.filename, self.lineno, examples)) + def __eq__(self, other): + if type(self) is not type(other): + return NotImplemented + + return self.examples == other.examples and \ + self.docstring == other.docstring and \ + self.globs == other.globs and \ + self.name == other.name and \ + self.filename == other.filename and \ + self.lineno == other.lineno + + def __ne__(self, other): + return not self == other # This lets us sort tests by name: def __lt__(self, other): @@ -2206,6 +2234,19 @@ def id(self): return self._dt_test.name + def __eq__(self, other): + if type(self) is not type(other): + return NotImplemented + + return self._dt_test == other._dt_test and \ + self._dt_optionflags == other._dt_optionflags and \ + self._dt_setUp == other._dt_setUp and \ + self._dt_tearDown == other._dt_tearDown and \ + self._dt_checker == other._dt_checker + + def __ne__(self, other): + return not self == other + def __repr__(self): name = self._dt_test.name.split('.') return "%s (%s)" % (name[-1], '.'.join(name[:-1])) diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -348,6 +348,46 @@ Traceback (most recent call last): ValueError: line 2 of the docstring for some_test lacks blank after ...: '...print(1)' +Compare `DocTest`: + + >>> docstring = ''' + ... >>> print 12 + ... 12 + ... ''' + >>> test = parser.get_doctest(docstring, globs, 'some_test', + ... 'some_test', 20) + >>> same_test = parser.get_doctest(docstring, globs, 'some_test', + ... 'some_test', 20) + >>> test == same_test + True + >>> test != same_test + False + >>> docstring = ''' + ... >>> print 42 + ... 42 + ... ''' + >>> other_test = parser.get_doctest(docstring, globs, 'other_test', + ... 'other_file', 10) + >>> test == other_test + False + >>> test != other_test + True + +Compare `DocTestCase`: + + >>> DocTestCase = doctest.DocTestCase + >>> test_case = DocTestCase(test) + >>> same_test_case = DocTestCase(same_test) + >>> other_test_case = DocTestCase(other_test) + >>> test_case == same_test_case + True + >>> test_case != same_test_case + False + >>> test == other_test_case + False + >>> test != other_test_case + True + """ def test_DocTestFinder(): r""" diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -549,6 +549,7 @@ Holger Krekel Michael Kremer Fabian Kreutz +Cédric Krier Hannu Krosing Andrej Krpic Ivan Krstić diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -419,6 +419,9 @@ Library ------- +- Issue #7502: Fix equality comparison for DocTestCase instances. Patch by + Cédric Krier. + - Issue #11870: threading: Properly reinitialize threads internal locks and condition variables to avoid deadlocks in child processes. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> 3.2): Merge
by antoine.pitrou Dec. 18, 2011

Dec. 18, 2011

http://hg.python.org/cpython/rev/a175284ede57 changeset: 74048:a175284ede57 branch: 3.2 parent: 74047:c478734ded4b parent: 74037:de962ec0faaa user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Dec 18 19:28:33 2011 +0100 summary: Merge files: Lib/threading.py | 11 ++++------- Misc/NEWS | 3 +++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Lib/threading.py b/Lib/threading.py --- a/Lib/threading.py +++ b/Lib/threading.py @@ -1068,21 +1068,18 @@ current = current_thread() with _active_limbo_lock: for thread in _active.values(): + # Any lock/condition variable may be currently locked or in an + # invalid state, so we reinitialize them. + thread._reset_internal_locks() if thread is current: # There is only one active thread. We reset the ident to # its new value since it can have changed. ident = _get_ident() thread._ident = ident - # Any condition variables hanging off of the active thread may - # be in an invalid state, so we reinitialize them. - thread._reset_internal_locks() new_active[ident] = thread else: # All the others are already stopped. - # We don't call _Thread__stop() because it tries to acquire - # thread._Thread__block which could also have been held while - # we forked. - thread._stopped = True + thread._stop() _limbo.clear() _active.clear() diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -100,6 +100,9 @@ - Issue #7502: Fix equality comparison for DocTestCase instances. Patch by Cédric Krier. +- Issue #11870: threading: Properly reinitialize threads internal locks and + condition variables to avoid deadlocks in child processes. + - Issue #8035: urllib: Fix a bug where the client could remain stuck after a redirection or an error. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #7502: Fix equality comparison for DocTestCase instances.
by antoine.pitrou Dec. 18, 2011

Dec. 18, 2011

http://hg.python.org/cpython/rev/c478734ded4b changeset: 74047:c478734ded4b branch: 3.2 parent: 74034:a420b27a86d9 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Dec 18 19:27:45 2011 +0100 summary: Issue #7502: Fix equality comparison for DocTestCase instances. Patch by Cédric Krier. files: Lib/doctest.py | 41 ++++++++++++++++++++++++++++ Lib/test/test_doctest.py | 40 +++++++++++++++++++++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 ++ 4 files changed, 85 insertions(+), 0 deletions(-) diff --git a/Lib/doctest.py b/Lib/doctest.py --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -440,6 +440,21 @@ self.options = options self.exc_msg = exc_msg + def __eq__(self, other): + if type(self) is not type(other): + return NotImplemented + + return self.source == other.source and \ + self.want == other.want and \ + self.lineno == other.lineno and \ + self.indent == other.indent and \ + self.options == other.options and \ + self.exc_msg == other.exc_msg + + def __ne__(self, other): + return not self == other + + class DocTest: """ A collection of doctest examples that should be run in a single @@ -488,6 +503,19 @@ return ('<DocTest %s from %s:%s (%s)>' % (self.name, self.filename, self.lineno, examples)) + def __eq__(self, other): + if type(self) is not type(other): + return NotImplemented + + return self.examples == other.examples and \ + self.docstring == other.docstring and \ + self.globs == other.globs and \ + self.name == other.name and \ + self.filename == other.filename and \ + self.lineno == other.lineno + + def __ne__(self, other): + return not self == other # This lets us sort tests by name: def __lt__(self, other): @@ -2204,6 +2232,19 @@ def id(self): return self._dt_test.name + def __eq__(self, other): + if type(self) is not type(other): + return NotImplemented + + return self._dt_test == other._dt_test and \ + self._dt_optionflags == other._dt_optionflags and \ + self._dt_setUp == other._dt_setUp and \ + self._dt_tearDown == other._dt_tearDown and \ + self._dt_checker == other._dt_checker + + def __ne__(self, other): + return not self == other + def __repr__(self): name = self._dt_test.name.split('.') return "%s (%s)" % (name[-1], '.'.join(name[:-1])) diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -347,6 +347,46 @@ Traceback (most recent call last): ValueError: line 2 of the docstring for some_test lacks blank after ...: '...print(1)' +Compare `DocTest`: + + >>> docstring = ''' + ... >>> print 12 + ... 12 + ... ''' + >>> test = parser.get_doctest(docstring, globs, 'some_test', + ... 'some_test', 20) + >>> same_test = parser.get_doctest(docstring, globs, 'some_test', + ... 'some_test', 20) + >>> test == same_test + True + >>> test != same_test + False + >>> docstring = ''' + ... >>> print 42 + ... 42 + ... ''' + >>> other_test = parser.get_doctest(docstring, globs, 'other_test', + ... 'other_file', 10) + >>> test == other_test + False + >>> test != other_test + True + +Compare `DocTestCase`: + + >>> DocTestCase = doctest.DocTestCase + >>> test_case = DocTestCase(test) + >>> same_test_case = DocTestCase(same_test) + >>> other_test_case = DocTestCase(other_test) + >>> test_case == same_test_case + True + >>> test_case != same_test_case + False + >>> test == other_test_case + False + >>> test != other_test_case + True + """ def test_DocTestFinder(): r""" diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -509,6 +509,7 @@ Holger Krekel Michael Kremer Fabian Kreutz +Cédric Krier Hannu Krosing Andrej Krpic Ivan Krstić diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -97,6 +97,9 @@ Library ------- +- Issue #7502: Fix equality comparison for DocTestCase instances. Patch by + Cédric Krier. + - Issue #8035: urllib: Fix a bug where the client could remain stuck after a redirection or an error. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Small clarification in docstring of dict.update(): the positional argument is
by georg.brandl Dec. 18, 2011

Dec. 18, 2011

http://hg.python.org/cpython/rev/d9bb270feb58 changeset: 74046:d9bb270feb58 branch: 2.7 parent: 74036:775319cebaa3 user: Georg Brandl <georg(a)python.org> date: Sun Dec 18 19:30:55 2011 +0100 summary: Small clarification in docstring of dict.update(): the positional argument is not required. files: Objects/dictobject.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2167,9 +2167,9 @@ "D.values() -> list of D's values"); PyDoc_STRVAR(update__doc__, -"D.update(E, **F) -> None. Update D from dict/iterable E and F.\n" -"If E has a .keys() method, does: for k in E: D[k] = E[k]\n\ -If E lacks .keys() method, does: for (k, v) in E: D[k] = v\n\ +"D.update([E, ]**F) -> None. Update D from dict/iterable E and F.\n" +"If E present and has a .keys() method, does: for k in E: D[k] = E[k]\n\ +If E present and lacks .keys() method, does: for (k, v) in E: D[k] = v\n\ In either case, this is followed by: for k in F: D[k] = F[k]"); PyDoc_STRVAR(fromkeys__doc__, -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge with 3.2.
by georg.brandl Dec. 18, 2011

Dec. 18, 2011

http://hg.python.org/cpython/rev/e49fdf7d149b changeset: 74045:e49fdf7d149b parent: 74043:f30ac7729f2b parent: 74044:393906d020fe user: Georg Brandl <georg(a)python.org> date: Sun Dec 18 19:32:37 2011 +0100 summary: Merge with 3.2. files: Objects/dictobject.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1981,9 +1981,9 @@ 2-tuple; but raise KeyError if D is empty."); PyDoc_STRVAR(update__doc__, -"D.update(E, **F) -> None. Update D from dict/iterable E and F.\n" -"If E has a .keys() method, does: for k in E: D[k] = E[k]\n\ -If E lacks .keys() method, does: for (k, v) in E: D[k] = v\n\ +"D.update([E, ]**F) -> None. Update D from dict/iterable E and F.\n" +"If E present and has a .keys() method, does: for k in E: D[k] = E[k]\n\ +If E present and lacks .keys() method, does: for (k, v) in E: D[k] = v\n\ In either case, this is followed by: for k in F: D[k] = F[k]"); PyDoc_STRVAR(fromkeys__doc__, -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Small clarification in docstring of dict.update(): the positional argument is
by georg.brandl Dec. 18, 2011

Dec. 18, 2011

http://hg.python.org/cpython/rev/393906d020fe changeset: 74044:393906d020fe branch: 3.2 parent: 74042:fa5c8cf29963 user: Georg Brandl <georg(a)python.org> date: Sun Dec 18 19:30:55 2011 +0100 summary: Small clarification in docstring of dict.update(): the positional argument is not required. files: Objects/dictobject.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1973,9 +1973,9 @@ 2-tuple; but raise KeyError if D is empty."); PyDoc_STRVAR(update__doc__, -"D.update(E, **F) -> None. Update D from dict/iterable E and F.\n" -"If E has a .keys() method, does: for k in E: D[k] = E[k]\n\ -If E lacks .keys() method, does: for (k, v) in E: D[k] = v\n\ +"D.update([E, ]**F) -> None. Update D from dict/iterable E and F.\n" +"If E present and has a .keys() method, does: for k in E: D[k] = E[k]\n\ +If E present and lacks .keys() method, does: for (k, v) in E: D[k] = v\n\ In either case, this is followed by: for k in F: D[k] = F[k]"); PyDoc_STRVAR(fromkeys__doc__, -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #13617: Document that the result of the conversion of a Unicode object to
by victor.stinner Dec. 18, 2011

Dec. 18, 2011

http://hg.python.org/cpython/rev/f30ac7729f2b changeset: 74043:f30ac7729f2b parent: 74041:99aaa0a4f23b parent: 74042:fa5c8cf29963 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Sun Dec 18 19:30:55 2011 +0100 summary: Issue #13617: Document that the result of the conversion of a Unicode object to wchar*, Py_UNICODE* and bytes may contain embedded null characters/bytes. Patch written by Arnaud Calmettes. files: Doc/ACKS.txt | 1 + Doc/c-api/unicode.rst | 37 ++++++++++++++++++++---------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt --- a/Doc/ACKS.txt +++ b/Doc/ACKS.txt @@ -33,6 +33,7 @@ * Keith Briggs * Ian Bruntlett * Lee Busby + * Arnaud Calmettes * Lorenzo M. Catucci * Carl Cerecke * Mauro Cicognini diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -649,9 +649,11 @@ .. c:function:: Py_UNICODE* PyUnicode_AsUnicode(PyObject *unicode) Return a read-only pointer to the Unicode object's internal - :c:type:`Py_UNICODE` buffer, *NULL* if *unicode* is not a Unicode object. - This will create the :c:type:`Py_UNICODE` representation of the object if it - is not yet available. + :c:type:`Py_UNICODE` buffer, or *NULL* on error. This will create the + :c:type:`Py_UNICODE*` representation of the object if it is not yet + available. Note that the resulting :c:type:`Py_UNICODE` string may contain + embedded null characters, which would cause the string to be truncated when + used in most C functions. Please migrate to using :c:func:`PyUnicode_AsUCS4`, :c:func:`PyUnicode_Substring`, :c:func:`PyUnicode_ReadChar` or similar new @@ -668,7 +670,9 @@ .. c:function:: Py_UNICODE* PyUnicode_AsUnicodeAndSize(PyObject *unicode, Py_ssize_t *size) Like :c:func:`PyUnicode_AsUnicode`, but also saves the :c:func:`Py_UNICODE` - array length in *size*. + array length in *size*. Note that the resulting :c:type:`Py_UNICODE*` string + may contain embedded null characters, which would cause the string to be + truncated when used in most C functions. .. versionadded:: 3.3 @@ -677,8 +681,10 @@ Create a copy of a Unicode string ending with a nul character. Return *NULL* and raise a :exc:`MemoryError` exception on memory allocation failure, - otherwise return a new allocated buffer (use :c:func:`PyMem_Free` to free the - buffer). + otherwise return a new allocated buffer (use :c:func:`PyMem_Free` to free + the buffer). Note that the resulting :c:type:`Py_UNICODE*` string may + contain embedded null characters, which would cause the string to be + truncated when used in most C functions. .. versionadded:: 3.2 @@ -817,7 +823,8 @@ Encode a Unicode object to :c:data:`Py_FileSystemDefaultEncoding` with the ``'surrogateescape'`` error handler, or ``'strict'`` on Windows, and return - :class:`bytes`. + :class:`bytes`. Note that the resulting :class:`bytes` object may contain + null bytes. If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the locale encoding. @@ -850,10 +857,12 @@ Copy the Unicode object contents into the :c:type:`wchar_t` buffer *w*. At most *size* :c:type:`wchar_t` characters are copied (excluding a possibly trailing 0-termination character). Return the number of :c:type:`wchar_t` characters - copied or -1 in case of an error. Note that the resulting :c:type:`wchar_t` + copied or -1 in case of an error. Note that the resulting :c:type:`wchar_t*` string may or may not be 0-terminated. It is the responsibility of the caller - to make sure that the :c:type:`wchar_t` string is 0-terminated in case this is - required by the application. + to make sure that the :c:type:`wchar_t*` string is 0-terminated in case this is + required by the application. Also, note that the :c:type:`wchar_t*` string + might contain null characters, which would cause the string to be truncated + when used with most C functions. .. c:function:: wchar_t* PyUnicode_AsWideCharString(PyObject *unicode, Py_ssize_t *size) @@ -863,9 +872,11 @@ of wide characters (excluding the trailing 0-termination character) into *\*size*. - Returns a buffer allocated by :c:func:`PyMem_Alloc` (use :c:func:`PyMem_Free` - to free it) on success. On error, returns *NULL*, *\*size* is undefined and - raises a :exc:`MemoryError`. + Returns a buffer allocated by :c:func:`PyMem_Alloc` (use + :c:func:`PyMem_Free` to free it) on success. On error, returns *NULL*, + *\*size* is undefined and raises a :exc:`MemoryError`. Note that the + resulting :c:type:`wchar_t` string might contain null characters, which + would cause the string to be truncated when used with most C functions. .. versionadded:: 3.2 -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #13617: Document that the result of the conversion of a Unicode object to
by victor.stinner Dec. 18, 2011

Dec. 18, 2011

http://hg.python.org/cpython/rev/fa5c8cf29963 changeset: 74042:fa5c8cf29963 branch: 3.2 parent: 74037:de962ec0faaa user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Sun Dec 18 19:22:31 2011 +0100 summary: Issue #13617: Document that the result of the conversion of a Unicode object to wchar*, Py_UNICODE* and bytes may contain embedded null characters/bytes. Patch written by Arnaud Calmettes. files: Doc/ACKS.txt | 1 + Doc/c-api/unicode.rst | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt --- a/Doc/ACKS.txt +++ b/Doc/ACKS.txt @@ -33,6 +33,7 @@ * Keith Briggs * Ian Bruntlett * Lee Busby + * Arnaud Calmettes * Lorenzo M. Catucci * Carl Cerecke * Mauro Cicognini diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -338,16 +338,21 @@ .. c:function:: Py_UNICODE* PyUnicode_AsUnicode(PyObject *unicode) - Return a read-only pointer to the Unicode object's internal :c:type:`Py_UNICODE` - buffer, *NULL* if *unicode* is not a Unicode object. + Return a read-only pointer to the Unicode object's internal + :c:type:`Py_UNICODE` buffer, *NULL* if *unicode* is not a Unicode object. + Note that the resulting :c:type:`Py_UNICODE*` string may contain embedded + null characters, which would cause the string to be truncated when used in + most C functions. .. c:function:: Py_UNICODE* PyUnicode_AsUnicodeCopy(PyObject *unicode) Create a copy of a Unicode string ending with a nul character. Return *NULL* and raise a :exc:`MemoryError` exception on memory allocation failure, - otherwise return a new allocated buffer (use :c:func:`PyMem_Free` to free the - buffer). + otherwise return a new allocated buffer (use :c:func:`PyMem_Free` to free + the buffer). Note that the resulting :c:type:`Py_UNICODE*` string may contain + embedded null characters, which would cause the string to be truncated when + used in most C functions. .. versionadded:: 3.2 @@ -447,7 +452,8 @@ Encode a Unicode object to :c:data:`Py_FileSystemDefaultEncoding` with the ``'surrogateescape'`` error handler, or ``'strict'`` on Windows, and return - :class:`bytes`. + :class:`bytes`. Note that the resulting :class:`bytes` object may contain + null bytes. If :c:data:`Py_FileSystemDefaultEncoding` is not set, fall back to the locale encoding. @@ -476,7 +482,9 @@ copied or -1 in case of an error. Note that the resulting :c:type:`wchar_t` string may or may not be 0-terminated. It is the responsibility of the caller to make sure that the :c:type:`wchar_t` string is 0-terminated in case this is - required by the application. + required by the application. Also, note that the :c:type:`wchar_t*` string + might contain null characters, which would cause the string to be truncated + when used with most C functions. .. c:function:: wchar_t* PyUnicode_AsWideCharString(PyObject *unicode, Py_ssize_t *size) @@ -486,9 +494,11 @@ of wide characters (excluding the trailing 0-termination character) into *\*size*. - Returns a buffer allocated by :c:func:`PyMem_Alloc` (use :c:func:`PyMem_Free` - to free it) on success. On error, returns *NULL*, *\*size* is undefined and - raises a :exc:`MemoryError`. + Returns a buffer allocated by :c:func:`PyMem_Alloc` (use + :c:func:`PyMem_Free` to free it) on success. On error, returns *NULL*, + *\*size* is undefined and raises a :exc:`MemoryError`. Note that the + resulting :c:type:`wchar_t*` string might contain null characters, which + would cause the string to be truncated when used with most C functions. .. versionadded:: 3.2 -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): Merge
by antoine.pitrou Dec. 18, 2011

Dec. 18, 2011

http://hg.python.org/cpython/rev/99aaa0a4f23b changeset: 74041:99aaa0a4f23b parent: 74040:8335e6c084f6 parent: 74039:336805423372 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sun Dec 18 19:00:16 2011 +0100 summary: Merge files: Lib/threading.py | 11 ++++------- Lib/urllib/request.py | 2 -- Misc/NEWS | 6 ++++++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Lib/threading.py b/Lib/threading.py --- a/Lib/threading.py +++ b/Lib/threading.py @@ -1047,21 +1047,18 @@ current = current_thread() with _active_limbo_lock: for thread in _active.values(): + # Any lock/condition variable may be currently locked or in an + # invalid state, so we reinitialize them. + thread._reset_internal_locks() if thread is current: # There is only one active thread. We reset the ident to # its new value since it can have changed. ident = get_ident() thread._ident = ident - # Any condition variables hanging off of the active thread may - # be in an invalid state, so we reinitialize them. - thread._reset_internal_locks() new_active[ident] = thread else: # All the others are already stopped. - # We don't call _Thread__stop() because it tries to acquire - # thread._Thread__block which could also have been held while - # we forked. - thread._stopped = True + thread._stop() _limbo.clear() _active.clear() diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1762,7 +1762,6 @@ def http_error_default(self, url, fp, errcode, errmsg, headers): """Default error handler: close the connection and raise IOError.""" - void = fp.read() fp.close() raise HTTPError(url, errcode, errmsg, headers, None) @@ -1951,7 +1950,6 @@ newurl = headers['uri'] else: return - void = fp.read() fp.close() # In case the server sent a relative URL, join with original: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -419,6 +419,12 @@ Library ------- +- Issue #11870: threading: Properly reinitialize threads internal locks and + condition variables to avoid deadlocks in child processes. + +- Issue #8035: urllib: Fix a bug where the client could remain stuck after a + redirection or an error. + - Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8. -- Repository URL: http://hg.python.org/cpython

1 0