Mailman 3 August 2012 - Python-checkins

cpython: Issue #15794: Relax a test case due to the deadlock detection's
by antoine.pitrou Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/454dceb5fd56 changeset: 78790:454dceb5fd56 parent: 78788:06497bbdf4fe user: Antoine Pitrou <solipsis(a)pitrou.net> date: Tue Aug 28 20:10:18 2012 +0200 summary: Issue #15794: Relax a test case due to the deadlock detection's conservativeness. files: Lib/test/test_importlib/test_locks.py | 22 ++++++++++++-- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_importlib/test_locks.py b/Lib/test/test_importlib/test_locks.py --- a/Lib/test/test_importlib/test_locks.py +++ b/Lib/test/test_importlib/test_locks.py @@ -1,4 +1,5 @@ from importlib import _bootstrap +import sys import time import unittest import weakref @@ -41,6 +42,17 @@ @unittest.skipUnless(threading, "threads needed for this test") class DeadlockAvoidanceTests(unittest.TestCase): + def setUp(self): + try: + self.old_switchinterval = sys.getswitchinterval() + sys.setswitchinterval(0.000001) + except AttributeError: + self.old_switchinterval = None + + def tearDown(self): + if self.old_switchinterval is not None: + sys.setswitchinterval(self.old_switchinterval) + def run_deadlock_avoidance_test(self, create_deadlock): NLOCKS = 10 locks = [LockType(str(i)) for i in range(NLOCKS)] @@ -75,10 +87,12 @@ def test_deadlock(self): results = self.run_deadlock_avoidance_test(True) - # One of the threads detected a potential deadlock on its second - # acquire() call. - self.assertEqual(results.count((True, False)), 1) - self.assertEqual(results.count((True, True)), len(results) - 1) + # At least one of the threads detected a potential deadlock on its + # second acquire() call. It may be several of them, because the + # deadlock avoidance mechanism is conservative. + nb_deadlocks = results.count((True, False)) + self.assertGreaterEqual(nb_deadlocks, 1) + self.assertEqual(results.count((True, True)), len(results) - nb_deadlocks) def test_no_deadlock(self): results = self.run_deadlock_avoidance_test(False) -- Repository URL: http://hg.python.org/cpython

2 1

cpython (2.7): - fix typo introduced in http://hg.python.org/cpython/rev/f918d4a06c64
by matthias.klose Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/ec4ea40be2f6 changeset: 78789:ec4ea40be2f6 branch: 2.7 parent: 78786:f918d4a06c64 user: Matthias Klose <doko(a)ubuntu.com> date: Tue Aug 28 19:23:56 2012 +0200 summary: - fix typo introduced in http://hg.python.org/cpython/rev/f918d4a06c64 files: Makefile.pre.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -408,7 +408,7 @@ # Build the shared modules sharedmods: $(BUILDPYTHON) if which getopt >/dev/null 2>&1; then \ - s=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \ + mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \ else \ mflags=" $$MAKEFLAGS "; \ fi; \ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): - fix paste error (whitespace) from previous commit
by matthias.klose Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/06497bbdf4fe changeset: 78788:06497bbdf4fe parent: 78785:3a3fd48a6ef7 parent: 78787:5c13bd7f6256 user: Matthias Klose <doko(a)ubuntu.com> date: Tue Aug 28 19:08:42 2012 +0200 summary: - fix paste error (whitespace) from previous commit files: Makefile.pre.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -475,7 +475,7 @@ # Build the shared modules sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA) - if which getopt >/dev/null; then \ + if which getopt >/dev/null; then \ mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \ else \ mflags=" $$MAKEFLAGS "; \ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): - fix paste error (whitespace) from previous commit
by matthias.klose Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/5c13bd7f6256 changeset: 78787:5c13bd7f6256 branch: 3.2 parent: 78784:763d188a96bb user: Matthias Klose <doko(a)ubuntu.com> date: Tue Aug 28 19:07:38 2012 +0200 summary: - fix paste error (whitespace) from previous commit files: Makefile.pre.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -436,7 +436,7 @@ # Build the shared modules sharedmods: $(BUILDPYTHON) - if which getopt >/dev/null; then \ + if which getopt >/dev/null; then \ mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \ else \ mflags=" $$MAKEFLAGS "; \ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): - fix paste error (whitespace) from previous commit
by matthias.klose Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/f918d4a06c64 changeset: 78786:f918d4a06c64 branch: 2.7 parent: 78783:1a1d097b17e2 user: Matthias Klose <doko(a)ubuntu.com> date: Tue Aug 28 19:07:08 2012 +0200 summary: - fix paste error (whitespace) from previous commit files: Makefile.pre.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -407,8 +407,8 @@ # Build the shared modules sharedmods: $(BUILDPYTHON) - if which getopt >/dev/null 2>&1; then \ - mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \ + if which getopt >/dev/null 2>&1; then \ + s=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \ else \ mflags=" $$MAKEFLAGS "; \ fi; \ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): - Issue #15591: Fix parsing MAKEFLAGS in the sharedmods target.
by matthias.klose Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/3a3fd48a6ef7 changeset: 78785:3a3fd48a6ef7 parent: 78781:0fb511659ef4 parent: 78784:763d188a96bb user: Matthias Klose <doko(a)ubuntu.com> date: Tue Aug 28 19:00:01 2012 +0200 summary: - Issue #15591: Fix parsing MAKEFLAGS in the sharedmods target. files: Makefile.pre.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -475,7 +475,12 @@ # Build the shared modules sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA) - case $$MAKEFLAGS in *s*) quiet=-q; esac; \ + if which getopt >/dev/null; then \ + mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \ + else \ + mflags=" $$MAKEFLAGS "; \ + fi; \ + case $$mflags in "* -s *") quiet=-q; esac; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): - Issue #15591: Fix parsing MAKEFLAGS in the sharedmods target.
by matthias.klose Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/763d188a96bb changeset: 78784:763d188a96bb branch: 3.2 parent: 78780:5bff555168ab user: Matthias Klose <doko(a)ubuntu.com> date: Tue Aug 28 18:55:07 2012 +0200 summary: - Issue #15591: Fix parsing MAKEFLAGS in the sharedmods target. files: Makefile.pre.in | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -436,10 +436,14 @@ # Build the shared modules sharedmods: $(BUILDPYTHON) - @case $$MAKEFLAGS in \ - *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ - esac + if which getopt >/dev/null; then \ + mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \ + else \ + mflags=" $$MAKEFLAGS "; \ + fi; \ + case $$mflags in "* -s *") quiet=-q; esac; \ + $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ + ./$(BUILDPYTHON) -E $(srcdir)/setup.py $$quiet build # Build static library # avoid long command lines, same as LIBRARY_OBJS -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): - Issue #15591: Fix parsing MAKEFLAGS in the sharedmods target.
by matthias.klose Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/1a1d097b17e2 changeset: 78783:1a1d097b17e2 branch: 2.7 user: Matthias Klose <doko(a)ubuntu.com> date: Tue Aug 28 18:52:28 2012 +0200 summary: - Issue #15591: Fix parsing MAKEFLAGS in the sharedmods target. files: Makefile.pre.in | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -407,10 +407,14 @@ # Build the shared modules sharedmods: $(BUILDPYTHON) - @case $$MAKEFLAGS in \ - *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ - esac + if which getopt >/dev/null 2>&1; then \ + mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \ + else \ + mflags=" $$MAKEFLAGS "; \ + fi; \ + case $$mflags in "* -s *") quiet=-q; esac; \ + $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ + ./$(BUILDPYTHON) -E $(srcdir)/setup.py $$quiet build # Build static library # avoid long command lines, same as LIBRARY_OBJS -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #14880: Fix kwargs notation in csv.reader, .writer & .register_dialect
by hynek.schlawack Aug. 28, 2012

Aug. 28, 2012

http://hg.python.org/cpython/rev/dc080e19f7aa changeset: 78782:dc080e19f7aa branch: 2.7 parent: 78774:92aa438a5c4b user: Hynek Schlawack <hs(a)ox.cx> date: Tue Aug 28 12:33:46 2012 +0200 summary: #14880: Fix kwargs notation in csv.reader, .writer & .register_dialect Patch by Chris Rebert. files: Doc/library/csv.rst | 12 ++++++------ Misc/NEWS | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst --- a/Doc/library/csv.rst +++ b/Doc/library/csv.rst @@ -57,7 +57,7 @@ The :mod:`csv` module defines the following functions: -.. function:: reader(csvfile[, dialect='excel'][, fmtparam]) +.. function:: reader(csvfile, dialect='excel', **fmtparams) Return a reader object which will iterate over lines in the given *csvfile*. *csvfile* can be any object which supports the :term:`iterator` protocol and returns a @@ -67,7 +67,7 @@ *dialect* parameter can be given which is used to define a set of parameters specific to a particular CSV dialect. It may be an instance of a subclass of the :class:`Dialect` class or one of the strings returned by the - :func:`list_dialects` function. The other optional *fmtparam* keyword arguments + :func:`list_dialects` function. The other optional *fmtparams* keyword arguments can be given to override individual formatting parameters in the current dialect. For full details about the dialect and formatting parameters, see section :ref:`csv-fmt-params`. @@ -94,7 +94,7 @@ be split into lines in a manner which preserves the newline characters. -.. function:: writer(csvfile[, dialect='excel'][, fmtparam]) +.. function:: writer(csvfile, dialect='excel', **fmtparams) Return a writer object responsible for converting the user's data into delimited strings on the given file-like object. *csvfile* can be any object with a @@ -103,7 +103,7 @@ parameter can be given which is used to define a set of parameters specific to a particular CSV dialect. It may be an instance of a subclass of the :class:`Dialect` class or one of the strings returned by the - :func:`list_dialects` function. The other optional *fmtparam* keyword arguments + :func:`list_dialects` function. The other optional *fmtparams* keyword arguments can be given to override individual formatting parameters in the current dialect. For full details about the dialect and formatting parameters, see section :ref:`csv-fmt-params`. To make it @@ -122,11 +122,11 @@ >>> spamWriter.writerow(['Spam', 'Lovely Spam', 'Wonderful Spam']) -.. function:: register_dialect(name[, dialect][, fmtparam]) +.. function:: register_dialect(name[, dialect], **fmtparams) Associate *dialect* with *name*. *name* must be a string or Unicode object. The dialect can be specified either by passing a sub-class of :class:`Dialect`, or - by *fmtparam* keyword arguments, or both, with keyword arguments overriding + by *fmtparams* keyword arguments, or both, with keyword arguments overriding parameters of the dialect. For full details about the dialect and formatting parameters, see section :ref:`csv-fmt-params`. diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -378,6 +378,9 @@ Documentation ------------- +- Issue #14880: Fix kwargs notation in csv.reader, .writer & .register_dialect. + Patch by Chris Rebert. + - 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

cpython (merge 3.2 -> default): #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/0fb511659ef4 changeset: 78781:0fb511659ef4 parent: 78779:7fa6336e9864 parent: 78780:5bff555168ab user: Petri Lehtinen <petri(a)digip.org> date: Tue Aug 28 12:34:09 2012 +0300 summary: #11964: Document a change in v3.2 to the json indent parameter files: Doc/library/json.rst | 16 ++++++++++++---- Misc/NEWS | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 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 @@ -2,6 +2,36 @@ Python News +++++++++++ +What's New in Python 3.3.1 +========================== + +*Release date: XX-XX-XXXX* + +Core and Builtins +----------------- + +Library +------- + +Extension Modules +----------------- + +Tests +----- + +Build +----- + +Documentation +------------- + +- Issue #11964: Document a change in v3.2 to the behavior of the indent + parameter of json encoding operations. + +Tools/Demos +----------- + + What's New in Python 3.3.0 Release Candidate 2? =============================================== -- Repository URL: http://hg.python.org/cpython

1 0