Mailman 3 November 2010 - Python-checkins

r86833 - python/tags/r271
by benjamin.peterson Nov. 27, 2010

Nov. 27, 2010

Author: benjamin.peterson Date: Sat Nov 27 15:41:37 2010 New Revision: 86833 Log: tag 2.7.1 final Added: python/tags/r271/ - copied from r86832, /python/branches/release27-maint/

1 0

r86832 - in python/branches/release27-maint: Include/patchlevel.h Lib/distutils/__init__.py Lib/idlelib/idlever.py Misc/NEWS Misc/RPM/python-2.7.spec README
by benjamin.peterson Nov. 27, 2010

Nov. 27, 2010

Author: benjamin.peterson Date: Sat Nov 27 15:40:29 2010 New Revision: 86832 Log: 2.7.1 final version bump Modified: python/branches/release27-maint/Include/patchlevel.h python/branches/release27-maint/Lib/distutils/__init__.py python/branches/release27-maint/Lib/idlelib/idlever.py python/branches/release27-maint/Misc/NEWS python/branches/release27-maint/Misc/RPM/python-2.7.spec python/branches/release27-maint/README Modified: python/branches/release27-maint/Include/patchlevel.h ============================================================================== --- python/branches/release27-maint/Include/patchlevel.h (original) +++ python/branches/release27-maint/Include/patchlevel.h Sat Nov 27 15:40:29 2010 @@ -23,11 +23,11 @@ #define PY_MAJOR_VERSION 2 #define PY_MINOR_VERSION 7 #define PY_MICRO_VERSION 1 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA -#define PY_RELEASE_SERIAL 1 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "2.7.1rc1+" +#define PY_VERSION "2.7.1" /*--end constants--*/ /* Subversion Revision number of this file (not of the repository) */ Modified: python/branches/release27-maint/Lib/distutils/__init__.py ============================================================================== --- python/branches/release27-maint/Lib/distutils/__init__.py (original) +++ python/branches/release27-maint/Lib/distutils/__init__.py Sat Nov 27 15:40:29 2010 @@ -15,5 +15,5 @@ # Updated automatically by the Python release process. # #--start constants-- -__version__ = "2.7.1rc1" +__version__ = "2.7.1" #--end constants-- Modified: python/branches/release27-maint/Lib/idlelib/idlever.py ============================================================================== --- python/branches/release27-maint/Lib/idlelib/idlever.py (original) +++ python/branches/release27-maint/Lib/idlelib/idlever.py Sat Nov 27 15:40:29 2010 @@ -1 +1 @@ -IDLE_VERSION = "2.7.1rc1" +IDLE_VERSION = "2.7.1" Modified: python/branches/release27-maint/Misc/NEWS ============================================================================== --- python/branches/release27-maint/Misc/NEWS (original) +++ python/branches/release27-maint/Misc/NEWS Sat Nov 27 15:40:29 2010 @@ -5,10 +5,7 @@ What's New in Python 2.7.1? =========================== -*Release date: XXXX-XX-XX* - -Core and Builtins ------------------ +*Release date: 2010-11-27* Library ------- Modified: python/branches/release27-maint/Misc/RPM/python-2.7.spec ============================================================================== --- python/branches/release27-maint/Misc/RPM/python-2.7.spec (original) +++ python/branches/release27-maint/Misc/RPM/python-2.7.spec Sat Nov 27 15:40:29 2010 @@ -39,7 +39,7 @@ %define name python #--start constants-- -%define version 2.7.1rc1 +%define version 2.7.1 %define libvers 2.7 #--end constants-- %define release 1pydotorg Modified: python/branches/release27-maint/README ============================================================================== --- python/branches/release27-maint/README (original) +++ python/branches/release27-maint/README Sat Nov 27 15:40:29 2010 @@ -1,5 +1,5 @@ -This is Python version 2.7.1 release candidate 1 -================================================ +This is Python version 2.7.1 +============================ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software Foundation.

1 0

r86745 - in python/branches/py3k: Doc/library/difflib.rst Lib/difflib.py Lib/test/test_difflib.py Misc/NEWS
by terry.reedy Nov. 27, 2010

Nov. 27, 2010

Author: terry.reedy Date: Thu Nov 25 07:12:34 2010 New Revision: 86745 Log: Modified: python/branches/py3k/Doc/library/difflib.rst python/branches/py3k/Lib/difflib.py python/branches/py3k/Lib/test/test_difflib.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Doc/library/difflib.rst ============================================================================== --- python/branches/py3k/Doc/library/difflib.rst (original) +++ python/branches/py3k/Doc/library/difflib.rst Thu Nov 25 07:12:34 2010 @@ -17,6 +17,7 @@ information in various formats, including HTML and context and unified diffs. For comparing directories and files, see also, the :mod:`filecmp` module. + .. class:: SequenceMatcher This is a flexible class for comparing pairs of sequences of any type, so long @@ -35,6 +36,14 @@ complicated way on how many elements the sequences have in common; best case time is linear. + **Automatic junk heuristic:** :class:`SequenceMatcher` supports a heuristic that + automatically treats certain sequence items as junk. The heuristic counts how many + times each individual item appears in the sequence. If an item's duplicates (after + the first one) account for more than 1% of the sequence and the sequence is at least + 200 items long, this item is marked as "popular" and is treated as junk for + the purpose of sequence matching. This heuristic can be turned off by setting + the ``autojunk`` argument to ``False`` when creating the :class:`SequenceMatcher`. + .. class:: Differ @@ -324,7 +333,7 @@ The :class:`SequenceMatcher` class has this constructor: -.. class:: SequenceMatcher(isjunk=None, a='', b='') +.. class:: SequenceMatcher(isjunk=None, a='', b='', autojunk=True) Optional argument *isjunk* must be ``None`` (the default) or a one-argument function that takes a sequence element and returns true if and only if the @@ -340,6 +349,9 @@ The optional arguments *a* and *b* are sequences to be compared; both default to empty strings. The elements of both sequences must be :term:`hashable`. + The optional argument *autojunk* can be used to disable the automatic junk + heuristic. + :class:`SequenceMatcher` objects have the following methods: Modified: python/branches/py3k/Lib/difflib.py ============================================================================== --- python/branches/py3k/Lib/difflib.py (original) +++ python/branches/py3k/Lib/difflib.py Thu Nov 25 07:12:34 2010 @@ -150,7 +150,7 @@ Return an upper bound on ratio() very quickly. """ - def __init__(self, isjunk=None, a='', b=''): + def __init__(self, isjunk=None, a='', b='', autojunk=True): """Construct a SequenceMatcher. Optional arg isjunk is None (the default), or a one-argument @@ -168,6 +168,10 @@ Optional arg b is the second of two sequences to be compared. By default, an empty string. The elements of b must be hashable. See also .set_seqs() and .set_seq2(). + + Optional arg autojunk should be set to False to disable the + "automatic junk heuristic" that treats popular elements as junk + (see module documentation for more information). """ # Members: @@ -206,11 +210,13 @@ # DOES NOT WORK for x in a! # isbpopular # for x in b, isbpopular(x) is true iff b is reasonably long - # (at least 200 elements) and x accounts for more than 1% of - # its elements. DOES NOT WORK for x in a! + # (at least 200 elements) and x accounts for more than 1 + 1% of + # its elements (when autojunk is enabled). + # DOES NOT WORK for x in a! self.isjunk = isjunk self.a = self.b = None + self.autojunk = autojunk self.set_seqs(a, b) def set_seqs(self, a, b): @@ -287,7 +293,7 @@ # from starting any matching block at a junk element ... # also creates the fast isbjunk function ... # b2j also does not contain entries for "popular" elements, meaning - # elements that account for more than 1% of the total elements, and + # elements that account for more than 1 + 1% of the total elements, and # when the sequence is reasonably large (>= 200 elements); this can # be viewed as an adaptive notion of semi-junk, and yields an enormous # speedup when, e.g., comparing program files with hundreds of @@ -308,44 +314,37 @@ # out the junk later is much cheaper than building b2j "right" # from the start. b = self.b - n = len(b) self.b2j = b2j = {} - populardict = {} + for i, elt in enumerate(b): - if elt in b2j: - indices = b2j[elt] - if n >= 200 and len(indices) * 100 > n: - populardict[elt] = 1 - del indices[:] - else: - indices.append(i) - else: - b2j[elt] = [i] + indices = b2j.setdefault(elt, []) + indices.append(i) - # Purge leftover indices for popular elements. - for elt in populardict: - del b2j[elt] - - # Now b2j.keys() contains elements uniquely, and especially when - # the sequence is a string, that's usually a good deal smaller - # than len(string). The difference is the number of isjunk calls - # saved. + # Purge junk elements + junk = set() isjunk = self.isjunk - junkdict = {} if isjunk: - for d in populardict, b2j: - for elt in list(d.keys()): - if isjunk(elt): - junkdict[elt] = 1 - del d[elt] - - # Now for x in b, isjunk(x) == x in junkdict, but the - # latter is much faster. Note too that while there may be a - # lot of junk in the sequence, the number of *unique* junk - # elements is probably small. So the memory burden of keeping - # this dict alive is likely trivial compared to the size of b2j. - self.isbjunk = junkdict.__contains__ - self.isbpopular = populardict.__contains__ + for elt in list(b2j.keys()): # using list() since b2j is modified + if isjunk(elt): + junk.add(elt) + del b2j[elt] + + # Purge popular elements that are not junk + popular = set() + n = len(b) + if self.autojunk and n >= 200: + ntest = n // 100 + 1 + for elt, idxs in list(b2j.items()): + if len(idxs) > ntest: + popular.add(elt) + del b2j[elt] + + # Now for x in b, isjunk(x) == x in junk, but the latter is much faster. + # Since the number of *unique* junk elements is probably small, the + # memory burden of keeping this set alive is likely trivial compared to + # the size of b2j. + self.isbjunk = junk.__contains__ + self.isbpopular = popular.__contains__ def find_longest_match(self, alo, ahi, blo, bhi): """Find longest matching block in a[alo:ahi] and b[blo:bhi]. Modified: python/branches/py3k/Lib/test/test_difflib.py ============================================================================== --- python/branches/py3k/Lib/test/test_difflib.py (original) +++ python/branches/py3k/Lib/test/test_difflib.py Thu Nov 25 07:12:34 2010 @@ -4,8 +4,47 @@ import doctest import sys -class TestSFbugs(unittest.TestCase): +class TestWithAscii(unittest.TestCase): + def test_one_insert(self): + sm = difflib.SequenceMatcher(None, 'b' * 100, 'a' + 'b' * 100) + self.assertAlmostEqual(sm.ratio(), 0.995, places=3) + self.assertEqual(list(sm.get_opcodes()), + [ ('insert', 0, 0, 0, 1), + ('equal', 0, 100, 1, 101)]) + sm = difflib.SequenceMatcher(None, 'b' * 100, 'b' * 50 + 'a' + 'b' * 50) + self.assertAlmostEqual(sm.ratio(), 0.995, places=3) + self.assertEqual(list(sm.get_opcodes()), + [ ('equal', 0, 50, 0, 50), + ('insert', 50, 50, 50, 51), + ('equal', 50, 100, 51, 101)]) + + def test_one_delete(self): + sm = difflib.SequenceMatcher(None, 'a' * 40 + 'c' + 'b' * 40, 'a' * 40 + 'b' * 40) + self.assertAlmostEqual(sm.ratio(), 0.994, places=3) + self.assertEqual(list(sm.get_opcodes()), + [ ('equal', 0, 40, 0, 40), + ('delete', 40, 41, 40, 40), + ('equal', 41, 81, 40, 80)]) + + +class TestAutojunk(unittest.TestCase): + """Tests for the autojunk parameter added in 2.7""" + def test_one_insert_homogenous_sequence(self): + # By default autojunk=True and the heuristic kicks in for a sequence + # of length 200+ + seq1 = 'b' * 200 + seq2 = 'a' + 'b' * 200 + + sm = difflib.SequenceMatcher(None, seq1, seq2) + self.assertAlmostEqual(sm.ratio(), 0, places=3) + + # Now turn the heuristic off + sm = difflib.SequenceMatcher(None, seq1, seq2, autojunk=False) + self.assertAlmostEqual(sm.ratio(), 0.9975, places=3) + + +class TestSFbugs(unittest.TestCase): def test_ratio_for_null_seqn(self): # Check clearing of SF bug 763023 s = difflib.SequenceMatcher(None, [], []) @@ -184,7 +223,9 @@ def test_main(): difflib.HtmlDiff._default_prefix = 0 Doctests = doctest.DocTestSuite(difflib) - run_unittest(TestSFpatches, TestSFbugs, TestOutputFormat, Doctests) + run_unittest( + TestWithAscii, TestAutojunk, TestSFpatches, TestSFbugs, + TestOutputFormat, Doctests) if __name__ == '__main__': test_main() Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Thu Nov 25 07:12:34 2010 @@ -37,6 +37,10 @@ Library ------- +- Issue #2986: difflib.SequenceMatcher gets a new parameter, autojunk, which + can be set to False to turn off the previously undocumented 'popularity' + heuristic. Patch by Terry Reedy and Eli Bendersky. + - Issue #9846: zipfile is now correctly closing underlying file objects. - Issue #10459: Update CJK character names to Unicode 6.0.

2 1

Python Regression Test Failures refleak (1)
by Neal Norwitz Nov. 27, 2010

Nov. 27, 2010

More important issues: ---------------------- test_bz2 leaked [-69, 0, 77] references, sum=8 Less important issues: ---------------------- test_threadsignals leaked [0, 0, -8] references, sum=-8

1 0

r86831 - python/branches/release27-maint
by stefan.krah Nov. 27, 2010

Nov. 27, 2010

Author: stefan.krah Date: Sat Nov 27 12:49:05 2010 New Revision: 86831 Log: Blocked revisions 86829 via svnmerge ........ r86829 | stefan.krah | 2010-11-27 12:44:18 +0100 (Sat, 27 Nov 2010) | 1 line Fix additional leaks. ........ Modified: python/branches/release27-maint/ (props changed)

1 0

r86830 - python/branches/release31-maint
by stefan.krah Nov. 27, 2010

Nov. 27, 2010

Author: stefan.krah Date: Sat Nov 27 12:48:09 2010 New Revision: 86830 Log: Blocked revisions 86829 via svnmerge ........ r86829 | stefan.krah | 2010-11-27 12:44:18 +0100 (Sat, 27 Nov 2010) | 1 line Fix additional leaks. ........ Modified: python/branches/release31-maint/ (props changed)

1 0

r86829 - python/branches/py3k/Modules/posixmodule.c
by stefan.krah Nov. 27, 2010

Nov. 27, 2010

Author: stefan.krah Date: Sat Nov 27 12:44:18 2010 New Revision: 86829 Log: Fix additional leaks. Modified: python/branches/py3k/Modules/posixmodule.c Modified: python/branches/py3k/Modules/posixmodule.c ============================================================================== --- python/branches/py3k/Modules/posixmodule.c (original) +++ python/branches/py3k/Modules/posixmodule.c Sat Nov 27 12:44:18 2010 @@ -2263,6 +2263,8 @@ rslt = CreateHardLink(dst, src, NULL); Py_END_ALLOW_THREADS + Py_DECREF(osrc); + Py_DECREF(odst); if (rslt == 0) return posix_error();

1 0

r86828 - in python/branches/py3k: Doc/library/unittest.rst Lib/unittest/case.py Lib/unittest/test/test_assertions.py Lib/unittest/test/test_case.py Misc/NEWS
by raymond.hettinger Nov. 27, 2010

Nov. 27, 2010

Author: raymond.hettinger Date: Sat Nov 27 10:31:37 2010 New Revision: 86828 Log: Issue 10242: unittest.assertItemsEqual makes too many assumptions. Modified: python/branches/py3k/Doc/library/unittest.rst python/branches/py3k/Lib/unittest/case.py python/branches/py3k/Lib/unittest/test/test_assertions.py python/branches/py3k/Lib/unittest/test/test_case.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Doc/library/unittest.rst ============================================================================== --- python/branches/py3k/Doc/library/unittest.rst (original) +++ python/branches/py3k/Doc/library/unittest.rst Sat Nov 27 10:31:37 2010 @@ -1068,8 +1068,8 @@ | :meth:`assertDictContainsSubset(a, b) | all the key/value pairs | 3.1 | | <TestCase.assertDictContainsSubset>` | in `a` exist in `b` | | +---------------------------------------+--------------------------------+--------------+ - | :meth:`assertItemsEqual(a, b) | `a` and `b` have the same | 3.2 | - | <TestCase.assertItemsEqual>` | elements in the same number, | | + | :meth:`assertCountEqual(a, b) | `a` and `b` have the same | 3.2 | + | <TestCase.assertCountEqual>` | elements in the same number, | | | | regardless of their order | | +---------------------------------------+--------------------------------+--------------+ @@ -1130,7 +1130,7 @@ .. versionadded:: 3.1 - .. method:: assertItemsEqual(actual, expected, msg=None) + .. method:: assertCountEqual(expected, actual, msg=None) Test that sequence *expected* contains the same elements as *actual*, regardless of their order. When they don't, an error message listing the @@ -1138,12 +1138,18 @@ Duplicate elements are *not* ignored when comparing *actual* and *expected*. It verifies if each element has the same count in both - sequences. It is the equivalent of ``assertEqual(sorted(expected), - sorted(actual))`` but it works with sequences of unhashable objects as - well. + sequences. Equivalent to: + ``assertEqual(Counter(iter(expected)), Counter(iter(actual)))`` + but works with sequences of unhashable objects as well. .. versionadded:: 3.2 + .. method:: assertItemsEqual(actual, expected, msg=None) + + Outdated name for :meth:`assertCountEqual`, kept for compatibility + with Python 2.7. + + .. versionadded:: 3.2 .. method:: assertSameElements(actual, expected, msg=None) @@ -1155,7 +1161,7 @@ It is the equivalent of ``assertEqual(set(expected), set(actual))`` but it works with sequences of unhashable objects as well. Because duplicates are ignored, this method has been deprecated in favour of - :meth:`assertItemsEqual`. + :meth:`assertCountEqual`. .. versionadded:: 3.1 .. deprecated:: 3.2 Modified: python/branches/py3k/Lib/unittest/case.py ============================================================================== --- python/branches/py3k/Lib/unittest/case.py (original) +++ python/branches/py3k/Lib/unittest/case.py Sat Nov 27 10:31:37 2010 @@ -6,6 +6,7 @@ import pprint import re import warnings +import collections from . import result from .util import (strclass, safe_repr, sorted_list_difference, @@ -990,15 +991,13 @@ self.fail(self._formatMessage(msg, standardMsg)) - def assertItemsEqual(self, expected_seq, actual_seq, msg=None): - """An unordered sequence / set specific comparison. It asserts that - expected_seq and actual_seq contain the same elements. It is - the equivalent of:: + def assertCountEqual(self, expected_seq, actual_seq, msg=None): + """An unordered sequence specific comparison. It asserts that + expected_seq and actual_seq have the same element counts. + Equivalent to:: - self.assertEqual(sorted(expected_seq), sorted(actual_seq)) - - Raises with an error message listing which elements of expected_seq - are missing from actual_seq and vice versa if any. + self.assertEqual(Counter(iter(expected_seq)), + Counter(iter(actual_seq))) Asserts that each element has the same count in both sequences. Example: @@ -1006,15 +1005,18 @@ - [0, 0, 1] and [0, 1] compare unequal. """ try: - expected = sorted(expected_seq) - actual = sorted(actual_seq) + expected = collections.Counter(iter(expected_seq)) + actual = collections.Counter(iter(actual_seq)) except TypeError: # Unsortable items (example: set(), complex(), ...) expected = list(expected_seq) actual = list(actual_seq) missing, unexpected = unorderable_list_difference(expected, actual) else: - return self.assertSequenceEqual(expected, actual, msg=msg) + if expected == actual: + return + missing = list(expected - actual) + unexpected = list(actual - expected) errors = [] if missing: @@ -1027,6 +1029,9 @@ standardMsg = '\n'.join(errors) self.fail(self._formatMessage(msg, standardMsg)) + # Old name for assertCountEqual() + assertItemsEqual = assertCountEqual + def assertMultiLineEqual(self, first, second, msg=None): """Assert that two multi-line strings are equal.""" self.assertIsInstance(first, str, 'First argument is not a string') Modified: python/branches/py3k/Lib/unittest/test/test_assertions.py ============================================================================== --- python/branches/py3k/Lib/unittest/test/test_assertions.py (original) +++ python/branches/py3k/Lib/unittest/test/test_assertions.py Sat Nov 27 10:31:37 2010 @@ -229,8 +229,8 @@ "^Missing: 'key'$", "^Missing: 'key' : oops$"]) - def testAssertItemsEqual(self): - self.assertMessages('assertItemsEqual', ([], [None]), + def testassertCountEqual(self): + self.assertMessages('assertCountEqual', ([], [None]), [r"\[None\]$", "^oops$", r"\[None\]$", r"\[None\] : oops$"]) Modified: python/branches/py3k/Lib/unittest/test/test_case.py ============================================================================== --- python/branches/py3k/Lib/unittest/test/test_case.py (original) +++ python/branches/py3k/Lib/unittest/test/test_case.py Sat Nov 27 10:31:37 2010 @@ -672,46 +672,53 @@ else: self.fail('assertMultiLineEqual did not fail') - def testAssertItemsEqual(self): + def testassertCountEqual(self): a = object() - self.assertItemsEqual([1, 2, 3], [3, 2, 1]) - self.assertItemsEqual(['foo', 'bar', 'baz'], ['bar', 'baz', 'foo']) - self.assertItemsEqual([a, a, 2, 2, 3], (a, 2, 3, a, 2)) - self.assertItemsEqual([1, "2", "a", "a"], ["a", "2", True, "a"]) - self.assertRaises(self.failureException, self.assertItemsEqual, + self.assertCountEqual([1, 2, 3], [3, 2, 1]) + self.assertCountEqual(['foo', 'bar', 'baz'], ['bar', 'baz', 'foo']) + self.assertCountEqual([a, a, 2, 2, 3], (a, 2, 3, a, 2)) + self.assertCountEqual([1, "2", "a", "a"], ["a", "2", True, "a"]) + self.assertRaises(self.failureException, self.assertCountEqual, [1, 2] + [3] * 100, [1] * 100 + [2, 3]) - self.assertRaises(self.failureException, self.assertItemsEqual, + self.assertRaises(self.failureException, self.assertCountEqual, [1, "2", "a", "a"], ["a", "2", True, 1]) - self.assertRaises(self.failureException, self.assertItemsEqual, + self.assertRaises(self.failureException, self.assertCountEqual, [10], [10, 11]) - self.assertRaises(self.failureException, self.assertItemsEqual, + self.assertRaises(self.failureException, self.assertCountEqual, [10, 11], [10]) - self.assertRaises(self.failureException, self.assertItemsEqual, + self.assertRaises(self.failureException, self.assertCountEqual, [10, 11, 10], [10, 11]) # Test that sequences of unhashable objects can be tested for sameness: - self.assertItemsEqual([[1, 2], [3, 4], 0], [False, [3, 4], [1, 2]]) + self.assertCountEqual([[1, 2], [3, 4], 0], [False, [3, 4], [1, 2]]) # hashable types, but not orderable - self.assertRaises(self.failureException, self.assertItemsEqual, + self.assertRaises(self.failureException, self.assertCountEqual, [], [divmod, 'x', 1, 5j, 2j, frozenset()]) # comparing dicts - self.assertItemsEqual([{'a': 1}, {'b': 2}], [{'b': 2}, {'a': 1}]) + self.assertCountEqual([{'a': 1}, {'b': 2}], [{'b': 2}, {'a': 1}]) # comparing heterogenous non-hashable sequences - self.assertItemsEqual([1, 'x', divmod, []], [divmod, [], 'x', 1]) - self.assertRaises(self.failureException, self.assertItemsEqual, + self.assertCountEqual([1, 'x', divmod, []], [divmod, [], 'x', 1]) + self.assertRaises(self.failureException, self.assertCountEqual, [], [divmod, [], 'x', 1, 5j, 2j, set()]) - self.assertRaises(self.failureException, self.assertItemsEqual, + self.assertRaises(self.failureException, self.assertCountEqual, [[1]], [[2]]) # Same elements, but not same sequence length - self.assertRaises(self.failureException, self.assertItemsEqual, + self.assertRaises(self.failureException, self.assertCountEqual, [1, 1, 2], [2, 1]) - self.assertRaises(self.failureException, self.assertItemsEqual, + self.assertRaises(self.failureException, self.assertCountEqual, [1, 1, "2", "a", "a"], ["2", "2", True, "a"]) - self.assertRaises(self.failureException, self.assertItemsEqual, + self.assertRaises(self.failureException, self.assertCountEqual, [1, {'b': 2}, None, True], [{'b': 2}, True, None]) + # Same elements which don't reliably compare, in + # different order, see issue 10242 + a = [{2,4}, {1,2}] + b = a[::-1] + self.assertCountEqual(a, b) + + def testAssertSetEqual(self): set1 = set() set2 = set() Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sat Nov 27 10:31:37 2010 @@ -41,6 +41,9 @@ Library ------- +- Issue #10242: Fixed implementation of unittest.ItemsEqual and gave it + a new more informative name, unittest.CountEqual. + - Issue #2986: difflib.SequenceMatcher gets a new parameter, autojunk, which can be set to False to turn off the previously undocumented 'popularity' heuristic. Patch by Terry Reedy and Eli Bendersky.

1 0

r86825 - python/branches/py3k/Lib/decimal.py
by raymond.hettinger Nov. 27, 2010

Nov. 27, 2010

Author: raymond.hettinger Date: Sat Nov 27 09:09:40 2010 New Revision: 86825 Log: Replace _nbits() with int.bit_length(). Modified: python/branches/py3k/Lib/decimal.py Modified: python/branches/py3k/Lib/decimal.py ============================================================================== --- python/branches/py3k/Lib/decimal.py (original) +++ python/branches/py3k/Lib/decimal.py Sat Nov 27 09:09:40 2010 @@ -5526,23 +5526,7 @@ ##### Integer arithmetic functions used by ln, log10, exp and __pow__ ##### -# This function from Tim Peters was taken from here: -# http://mail.python.org/pipermail/python-list/1999-July/007758.html -# The correction being in the function definition is for speed, and -# the whole function is not resolved with math.log because of avoiding -# the use of floats. -def _nbits(n, correction = { - '0': 4, '1': 3, '2': 2, '3': 2, - '4': 1, '5': 1, '6': 1, '7': 1, - '8': 0, '9': 0, 'a': 0, 'b': 0, - 'c': 0, 'd': 0, 'e': 0, 'f': 0}): - """Number of bits in binary representation of the positive integer n, - or 0 if n == 0. - """ - if n < 0: - raise ValueError("The argument to _nbits should be nonnegative.") - hex_n = "%x" % n - return 4*len(hex_n) - correction[hex_n[0]] +_nbits = int.bit_length def _sqrt_nearest(n, a): """Closest integer to the square root of the positive integer n. a is

1 0

Daily py3k reference leaks (r86824): sum=0
by solipsis＠pitrou.net Nov. 27, 2010

Nov. 27, 2010

py3k results for svn r86824 (hg cset b8c8c977a4dc) -------------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflogBqtV76', '-x']

1 0