Mailman 3 August 2012 - Python-checkins

cpython (3.2): #11964: Document a change in v3.2 to the json indent parameter
by petri.lehtinen Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/5bff555168ab changeset: 78780:5bff555168ab branch: 3.2 parent: 78777:3e50d6dada09 user: Petri Lehtinen <petri(a)digip.org> date: Tue Aug 28 07:08:44 2012 +0300 summary: #11964: Document a change in v3.2 to the json indent parameter files: Doc/library/json.rst | 16 ++++++++++++---- Misc/NEWS | 3 +++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Doc/library/json.rst b/Doc/library/json.rst --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -149,6 +149,9 @@ indents that many spaces per level. If *indent* is a string (such as ``"\t"``), that string is used to indent each level. + .. versionchanged:: 3.2 + Allow strings for *indent* in addition to integers. + If *separators* is an ``(item_separator, dict_separator)`` tuple, then it will be used instead of the default ``(', ', ': ')`` separators. ``(',', ':')`` is the most compact JSON representation. @@ -371,10 +374,15 @@ will be sorted by key; this is useful for regression tests to ensure that JSON serializations can be compared on a day-to-day basis. - If *indent* is a non-negative integer (it is ``None`` by default), then JSON - array elements and object members will be pretty-printed with that indent - level. An indent level of 0 will only insert newlines. ``None`` is the most - compact representation. + If *indent* is a non-negative integer or string, then JSON array elements and + object members will be pretty-printed with that indent level. An indent level + of 0, negative, or ``""`` will only insert newlines. ``None`` (the default) + selects the most compact representation. Using a positive integer indent + indents that many spaces per level. If *indent* is a string (such as ``"\t"``), + that string is used to indent each level. + + .. versionchanged:: 3.2 + Allow strings for *indent* in addition to integers. If specified, *separators* should be an ``(item_separator, key_separator)`` tuple. The default is ``(', ', ': ')``. To get the most compact JSON diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -519,6 +519,9 @@ Documentation ------------- +- Issue #11964: Document a change in v3.2 to the behavior of the indent + parameter of json encoding operations. + - Issue #14674: Add a discussion of the json module's standard compliance. Patch by Chris Rebert. -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (7fa6336e9864): sum=0
by solipsis＠pitrou.net Aug. 28, 2012

Aug. 28, 2012

results for 7fa6336e9864 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflognwJ4KS', '-x']

1 0

cpython: Issue #15781: Fix two small race conditions in import's module locking.
by antoine.pitrou Aug. 27, 2012

Aug. 27, 2012

http://hg.python.org/cpython/rev/7fa6336e9864 changeset: 78779:7fa6336e9864 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Aug 28 00:24:52 2012 +0200 summary: Issue #15781: Fix two small race conditions in import's module locking. files: Lib/importlib/_bootstrap.py | 10 +- Lib/test/test_threaded_import.py | 12 +- Misc/NEWS | 2 + Python/import.c | 6 +- Python/importlib.h | 7302 +++++++++-------- 5 files changed, 3678 insertions(+), 3654 deletions(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -268,8 +268,10 @@ Should only be called with the import lock taken.""" lock = None - if name in _module_locks: + try: lock = _module_locks[name]() + except KeyError: + pass if lock is None: if _thread is None: lock = _DummyModuleLock(name) @@ -543,6 +545,9 @@ # implicitly imports 'locale' and would otherwise trigger an # infinite loop. module = new_module(fullname) + # This must be done before putting the module in sys.modules + # (otherwise an optimization shortcut in import.c becomes wrong) + module.__initializing__ = True sys.modules[fullname] = module module.__loader__ = self try: @@ -554,8 +559,9 @@ module.__package__ = fullname else: module.__package__ = fullname.rpartition('.')[0] + else: + module.__initializing__ = True try: - module.__initializing__ = True # If __package__ was not set above, __import__() will do it later. return fxn(self, module, *args, **kwargs) except: diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py --- a/Lib/test/test_threaded_import.py +++ b/Lib/test/test_threaded_import.py @@ -224,7 +224,17 @@ @reap_threads def test_main(): - run_unittest(ThreadedImportTests) + old_switchinterval = None + try: + old_switchinterval = sys.getswitchinterval() + sys.setswitchinterval(0.00000001) + except AttributeError: + pass + try: + run_unittest(ThreadedImportTests) + finally: + if old_switchinterval is not None: + sys.setswitchinterval(old_switchinterval) if __name__ == "__main__": test_main() diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,8 @@ Core and Builtins ----------------- +- Issue #15781: Fix two small race conditions in import's module locking. + Library ------- diff --git a/Python/import.c b/Python/import.c --- a/Python/import.c +++ b/Python/import.c @@ -1408,7 +1408,11 @@ int initializing = 0; Py_INCREF(mod); - /* Only call _bootstrap._lock_unlock_module() if __initializing__ is true. */ + /* Optimization: only call _bootstrap._lock_unlock_module() if + __initializing__ is true. + NOTE: because of this, __initializing__ must be set *before* + stuffing the new module in sys.modules. + */ value = _PyObject_GetAttrId(mod, &PyId___initializing__); if (value == NULL) PyErr_Clear(); diff --git a/Python/importlib.h b/Python/importlib.h --- a/Python/importlib.h +++ b/Python/importlib.h [stripped] -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge: Fix a JSON doc typo
by petri.lehtinen Aug. 27, 2012

Aug. 27, 2012

http://hg.python.org/cpython/rev/52159aa5d401 changeset: 78778:52159aa5d401 parent: 78776:64640a02b0ca parent: 78777:3e50d6dada09 user: Petri Lehtinen <petri(a)digip.org> date: Mon Aug 27 20:27:51 2012 +0300 summary: Merge: Fix a JSON doc typo files: Doc/library/json.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/json.rst b/Doc/library/json.rst --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -146,7 +146,7 @@ object members will be pretty-printed with that indent level. An indent level of 0, negative, or ``""`` will only insert newlines. ``None`` (the default) selects the most compact representation. Using a positive integer indent - indents that many spaces per level. If *indent* is a string (such at '\t'), + indents that many spaces per level. If *indent* is a string (such as ``"\t"``), that string is used to indent each level. If *separators* is an ``(item_separator, dict_separator)`` tuple, then it -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fix a JSON doc typo
by petri.lehtinen Aug. 27, 2012

Aug. 27, 2012

http://hg.python.org/cpython/rev/3e50d6dada09 changeset: 78777:3e50d6dada09 branch: 3.2 parent: 78775:1676e423054a user: Petri Lehtinen <petri(a)digip.org> date: Mon Aug 27 20:27:30 2012 +0300 summary: Fix a JSON doc typo files: Doc/library/json.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/json.rst b/Doc/library/json.rst --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -146,7 +146,7 @@ object members will be pretty-printed with that indent level. An indent level of 0, negative, or ``""`` will only insert newlines. ``None`` (the default) selects the most compact representation. Using a positive integer indent - indents that many spaces per level. If *indent* is a string (such at '\t'), + indents that many spaces per level. If *indent* is a string (such as ``"\t"``), that string is used to indent each level. If *separators* is an ``(item_separator, dict_separator)`` tuple, then it -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): #15788: merge with 3.2.
by ezio.melotti Aug. 27, 2012

Aug. 27, 2012

http://hg.python.org/cpython/rev/64640a02b0ca changeset: 78776:64640a02b0ca parent: 78773:5b0595339c9d parent: 78775:1676e423054a user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Mon Aug 27 10:03:23 2012 +0300 summary: #15788: merge with 3.2. files: Doc/library/subprocess.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -669,8 +669,8 @@ .. warning:: - Use :meth:`communicate` rather than :attr:`.stdin.write <stdin>`, - :attr:`.stdout.read <stdout>` or :attr:`.stderr.read <stderr>` to avoid + Use :meth:`~Popen.communicate` rather than :attr:`.stdin.write <Popen.stdin>`, + :attr:`.stdout.read <Popen.stdout>` or :attr:`.stderr.read <Popen.stderr>` to avoid deadlocks due to any of the other OS pipe buffers filling up and blocking the child process. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): #15788: fix broken links in subprocess doc. Patch by Chris Rebert.
by ezio.melotti Aug. 27, 2012

Aug. 27, 2012

http://hg.python.org/cpython/rev/1676e423054a changeset: 78775:1676e423054a branch: 3.2 parent: 78765:a425f2697273 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Mon Aug 27 10:00:05 2012 +0300 summary: #15788: fix broken links in subprocess doc. Patch by Chris Rebert. files: Doc/library/subprocess.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -565,8 +565,8 @@ .. warning:: - Use :meth:`communicate` rather than :attr:`.stdin.write <stdin>`, - :attr:`.stdout.read <stdout>` or :attr:`.stderr.read <stderr>` to avoid + Use :meth:`~Popen.communicate` rather than :attr:`.stdin.write <Popen.stdin>`, + :attr:`.stdout.read <Popen.stdout>` or :attr:`.stderr.read <Popen.stderr>` to avoid deadlocks due to any of the other OS pipe buffers filling up and blocking the child process. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #15788: fix broken links in subprocess doc. Patch by Chris Rebert.
by ezio.melotti Aug. 27, 2012

Aug. 27, 2012

http://hg.python.org/cpython/rev/92aa438a5c4b changeset: 78774:92aa438a5c4b branch: 2.7 parent: 78764:58a87c02692c user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Mon Aug 27 10:00:05 2012 +0300 summary: #15788: fix broken links in subprocess doc. Patch by Chris Rebert. files: Doc/library/subprocess.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -513,8 +513,8 @@ .. warning:: - Use :meth:`communicate` rather than :attr:`.stdin.write <stdin>`, - :attr:`.stdout.read <stdout>` or :attr:`.stderr.read <stderr>` to avoid + Use :meth:`~Popen.communicate` rather than :attr:`.stdin.write <Popen.stdin>`, + :attr:`.stdout.read <Popen.stdout>` or :attr:`.stderr.read <Popen.stderr>` to avoid deadlocks due to any of the other OS pipe buffers filling up and blocking the child process. -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (5b0595339c9d): sum=0
by solipsis＠pitrou.net Aug. 27, 2012

Aug. 27, 2012

results for 5b0595339c9d on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogW9OOhY', '-x']

1 0

cpython: Fix typo.
by ezio.melotti Aug. 26, 2012

Aug. 26, 2012

http://hg.python.org/cpython/rev/5b0595339c9d changeset: 78773:5b0595339c9d user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Sun Aug 26 07:33:10 2012 +0300 summary: Fix typo. files: Doc/library/types.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/library/types.rst b/Doc/library/types.rst --- a/Doc/library/types.rst +++ b/Doc/library/types.rst @@ -69,7 +69,7 @@ the types that arise only incidentally during processing such as the ``listiterator`` type. -Typical use is of these names is for :func:`isinstance` or +Typical use of these names is for :func:`isinstance` or :func:`issubclass` checks. Standard names are defined for the following types: -- Repository URL: http://hg.python.org/cpython

1 0