mirror of
https://github.com/python/cpython
synced 2024-10-08 11:31:34 +00:00
2ee470f7f9
svn+ssh://pythondev@svn.python.org/python/trunk ........ r64722 | georg.brandl | 2008-07-05 12:13:36 +0200 (Sat, 05 Jul 2008) | 4 lines #2663: support an *ignore* argument to shutil.copytree(). Patch by Tarek Ziade. This is a new feature, but Barry authorized adding it in the beta period. ........ r64729 | mark.dickinson | 2008-07-05 13:33:52 +0200 (Sat, 05 Jul 2008) | 5 lines Issue 3188: accept float('infinity') as well as float('inf'). This makes the float constructor behave in the same way as specified by various other language standards, including C99, IEEE 754r, and the IBM Decimal standard. ........ r64753 | gregory.p.smith | 2008-07-06 05:35:58 +0200 (Sun, 06 Jul 2008) | 4 lines - Issue #2862: Make int and float freelist management consistent with other freelists. Changes their CompactFreeList apis into ClearFreeList apis and calls them via gc.collect(). ........ r64845 | raymond.hettinger | 2008-07-10 16:03:19 +0200 (Thu, 10 Jul 2008) | 1 line Issue 3301: Bisect functions behaved badly when lo was negative. ........ r64846 | raymond.hettinger | 2008-07-10 16:34:57 +0200 (Thu, 10 Jul 2008) | 1 line Issue 3285: Fractions from_float() and from_decimal() accept Integral arguments. ........ r64849 | andrew.kuchling | 2008-07-10 16:43:31 +0200 (Thu, 10 Jul 2008) | 1 line Wording changes ........ r64871 | raymond.hettinger | 2008-07-11 14:00:21 +0200 (Fri, 11 Jul 2008) | 1 line Add cautionary note on the use of PySequence_Fast_ITEMS. ........ r64880 | amaury.forgeotdarc | 2008-07-11 23:28:25 +0200 (Fri, 11 Jul 2008) | 5 lines #3317 in zipfile module, restore the previous names of global variables: some applications relied on them. Also remove duplicated lines. ........ r64881 | amaury.forgeotdarc | 2008-07-11 23:45:06 +0200 (Fri, 11 Jul 2008) | 3 lines #3342: In tracebacks, printed source lines were not indented since r62555. #3343: Py_DisplaySourceLine should be a private function. Rename it to _Py_DisplaySourceLine. ........ r64882 | josiah.carlson | 2008-07-12 00:17:14 +0200 (Sat, 12 Jul 2008) | 2 lines Fix for the AttributeError in test_asynchat. ........ r64885 | josiah.carlson | 2008-07-12 01:26:59 +0200 (Sat, 12 Jul 2008) | 2 lines Fixed test for asyncore. ........ r64888 | matthias.klose | 2008-07-12 09:51:48 +0200 (Sat, 12 Jul 2008) | 2 lines - Fix bashisms in Tools/faqwiz/move-faqwiz.sh ........ r64897 | benjamin.peterson | 2008-07-12 22:16:19 +0200 (Sat, 12 Jul 2008) | 1 line fix various doc typos #3320 ........ r64900 | alexandre.vassalotti | 2008-07-13 00:06:53 +0200 (Sun, 13 Jul 2008) | 2 lines Fixed typo. ........ r64901 | benjamin.peterson | 2008-07-13 01:41:19 +0200 (Sun, 13 Jul 2008) | 1 line #1778443 robotparser fixes from Aristotelis Mikropoulos ........ r64915 | nick.coghlan | 2008-07-13 16:52:36 +0200 (Sun, 13 Jul 2008) | 1 line Fix issue 3221 by emitting a RuntimeWarning instead of raising SystemError when the parent module can't be found during an absolute import (likely due to non-PEP 361 aware code which sets a module level __package__ attribute) ........ r64926 | martin.v.loewis | 2008-07-13 22:31:49 +0200 (Sun, 13 Jul 2008) | 2 lines Add turtle into the module index. ........ r64927 | alexandre.vassalotti | 2008-07-13 22:42:44 +0200 (Sun, 13 Jul 2008) | 3 lines Issue #3274: Use a less common identifier for the temporary variable in Py_CLEAR(). ........ r64928 | andrew.kuchling | 2008-07-13 23:43:25 +0200 (Sun, 13 Jul 2008) | 1 line Re-word ........ r64929 | andrew.kuchling | 2008-07-13 23:43:52 +0200 (Sun, 13 Jul 2008) | 1 line Add various items; move ctypes items into a subsection of their own ........ r64938 | andrew.kuchling | 2008-07-14 02:35:32 +0200 (Mon, 14 Jul 2008) | 1 line Typo fixes ........ r64939 | andrew.kuchling | 2008-07-14 02:40:55 +0200 (Mon, 14 Jul 2008) | 1 line Typo fix ........ r64940 | andrew.kuchling | 2008-07-14 03:18:16 +0200 (Mon, 14 Jul 2008) | 1 line Typo fix ........ r64941 | andrew.kuchling | 2008-07-14 03:18:31 +0200 (Mon, 14 Jul 2008) | 1 line Expand the multiprocessing section ........ r64944 | gregory.p.smith | 2008-07-14 08:06:48 +0200 (Mon, 14 Jul 2008) | 7 lines Fix posix.fork1() / os.fork1() to only call PyOS_AfterFork() in the child process rather than both parent and child. Does anyone actually use fork1()? It appears to be a Solaris thing but if Python is built with pthreads on Solaris, fork1() and fork() should be the same. ........ r64961 | jesse.noller | 2008-07-15 15:47:33 +0200 (Tue, 15 Jul 2008) | 1 line multiprocessing/connection.py patch to remove fqdn oddness for issue 3270 ........ r64966 | nick.coghlan | 2008-07-15 17:40:22 +0200 (Tue, 15 Jul 2008) | 1 line Add missing NEWS entry for r64962 ........ r64973 | jesse.noller | 2008-07-15 20:29:18 +0200 (Tue, 15 Jul 2008) | 1 line Revert 3270 patch: self._address is in pretty widespread use, need to revisit ........
312 lines
12 KiB
Python
312 lines
12 KiB
Python
import sys
|
|
import unittest
|
|
from test import support
|
|
from collections import UserList
|
|
|
|
# We do a bit of trickery here to be able to test both the C implementation
|
|
# and the Python implementation of the module.
|
|
|
|
# Make it impossible to import the C implementation anymore.
|
|
sys.modules['_bisect'] = 0
|
|
# We must also handle the case that bisect was imported before.
|
|
if 'bisect' in sys.modules:
|
|
del sys.modules['bisect']
|
|
|
|
# Now we can import the module and get the pure Python implementation.
|
|
import bisect as py_bisect
|
|
|
|
# Restore everything to normal.
|
|
del sys.modules['_bisect']
|
|
del sys.modules['bisect']
|
|
|
|
# This is now the module with the C implementation.
|
|
import bisect as c_bisect
|
|
|
|
|
|
class TestBisect(unittest.TestCase):
|
|
module = None
|
|
|
|
def setUp(self):
|
|
self.precomputedCases = [
|
|
(self.module.bisect_right, [], 1, 0),
|
|
(self.module.bisect_right, [1], 0, 0),
|
|
(self.module.bisect_right, [1], 1, 1),
|
|
(self.module.bisect_right, [1], 2, 1),
|
|
(self.module.bisect_right, [1, 1], 0, 0),
|
|
(self.module.bisect_right, [1, 1], 1, 2),
|
|
(self.module.bisect_right, [1, 1], 2, 2),
|
|
(self.module.bisect_right, [1, 1, 1], 0, 0),
|
|
(self.module.bisect_right, [1, 1, 1], 1, 3),
|
|
(self.module.bisect_right, [1, 1, 1], 2, 3),
|
|
(self.module.bisect_right, [1, 1, 1, 1], 0, 0),
|
|
(self.module.bisect_right, [1, 1, 1, 1], 1, 4),
|
|
(self.module.bisect_right, [1, 1, 1, 1], 2, 4),
|
|
(self.module.bisect_right, [1, 2], 0, 0),
|
|
(self.module.bisect_right, [1, 2], 1, 1),
|
|
(self.module.bisect_right, [1, 2], 1.5, 1),
|
|
(self.module.bisect_right, [1, 2], 2, 2),
|
|
(self.module.bisect_right, [1, 2], 3, 2),
|
|
(self.module.bisect_right, [1, 1, 2, 2], 0, 0),
|
|
(self.module.bisect_right, [1, 1, 2, 2], 1, 2),
|
|
(self.module.bisect_right, [1, 1, 2, 2], 1.5, 2),
|
|
(self.module.bisect_right, [1, 1, 2, 2], 2, 4),
|
|
(self.module.bisect_right, [1, 1, 2, 2], 3, 4),
|
|
(self.module.bisect_right, [1, 2, 3], 0, 0),
|
|
(self.module.bisect_right, [1, 2, 3], 1, 1),
|
|
(self.module.bisect_right, [1, 2, 3], 1.5, 1),
|
|
(self.module.bisect_right, [1, 2, 3], 2, 2),
|
|
(self.module.bisect_right, [1, 2, 3], 2.5, 2),
|
|
(self.module.bisect_right, [1, 2, 3], 3, 3),
|
|
(self.module.bisect_right, [1, 2, 3], 4, 3),
|
|
(self.module.bisect_right, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 0, 0),
|
|
(self.module.bisect_right, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 1, 1),
|
|
(self.module.bisect_right, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 1.5, 1),
|
|
(self.module.bisect_right, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 2, 3),
|
|
(self.module.bisect_right, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 2.5, 3),
|
|
(self.module.bisect_right, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 3, 6),
|
|
(self.module.bisect_right, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 3.5, 6),
|
|
(self.module.bisect_right, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 4, 10),
|
|
(self.module.bisect_right, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 5, 10),
|
|
|
|
(self.module.bisect_left, [], 1, 0),
|
|
(self.module.bisect_left, [1], 0, 0),
|
|
(self.module.bisect_left, [1], 1, 0),
|
|
(self.module.bisect_left, [1], 2, 1),
|
|
(self.module.bisect_left, [1, 1], 0, 0),
|
|
(self.module.bisect_left, [1, 1], 1, 0),
|
|
(self.module.bisect_left, [1, 1], 2, 2),
|
|
(self.module.bisect_left, [1, 1, 1], 0, 0),
|
|
(self.module.bisect_left, [1, 1, 1], 1, 0),
|
|
(self.module.bisect_left, [1, 1, 1], 2, 3),
|
|
(self.module.bisect_left, [1, 1, 1, 1], 0, 0),
|
|
(self.module.bisect_left, [1, 1, 1, 1], 1, 0),
|
|
(self.module.bisect_left, [1, 1, 1, 1], 2, 4),
|
|
(self.module.bisect_left, [1, 2], 0, 0),
|
|
(self.module.bisect_left, [1, 2], 1, 0),
|
|
(self.module.bisect_left, [1, 2], 1.5, 1),
|
|
(self.module.bisect_left, [1, 2], 2, 1),
|
|
(self.module.bisect_left, [1, 2], 3, 2),
|
|
(self.module.bisect_left, [1, 1, 2, 2], 0, 0),
|
|
(self.module.bisect_left, [1, 1, 2, 2], 1, 0),
|
|
(self.module.bisect_left, [1, 1, 2, 2], 1.5, 2),
|
|
(self.module.bisect_left, [1, 1, 2, 2], 2, 2),
|
|
(self.module.bisect_left, [1, 1, 2, 2], 3, 4),
|
|
(self.module.bisect_left, [1, 2, 3], 0, 0),
|
|
(self.module.bisect_left, [1, 2, 3], 1, 0),
|
|
(self.module.bisect_left, [1, 2, 3], 1.5, 1),
|
|
(self.module.bisect_left, [1, 2, 3], 2, 1),
|
|
(self.module.bisect_left, [1, 2, 3], 2.5, 2),
|
|
(self.module.bisect_left, [1, 2, 3], 3, 2),
|
|
(self.module.bisect_left, [1, 2, 3], 4, 3),
|
|
(self.module.bisect_left, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 0, 0),
|
|
(self.module.bisect_left, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 1, 0),
|
|
(self.module.bisect_left, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 1.5, 1),
|
|
(self.module.bisect_left, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 2, 1),
|
|
(self.module.bisect_left, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 2.5, 3),
|
|
(self.module.bisect_left, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 3, 3),
|
|
(self.module.bisect_left, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 3.5, 6),
|
|
(self.module.bisect_left, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 4, 6),
|
|
(self.module.bisect_left, [1, 2, 2, 3, 3, 3, 4, 4, 4, 4], 5, 10)
|
|
]
|
|
|
|
def test_precomputed(self):
|
|
for func, data, elem, expected in self.precomputedCases:
|
|
self.assertEqual(func(data, elem), expected)
|
|
self.assertEqual(func(UserList(data), elem), expected)
|
|
|
|
def test_negative_lo(self):
|
|
# Issue 3301
|
|
mod = self.module
|
|
self.assertRaises(ValueError, mod.bisect_left, [1, 2, 3], 5, -1, 3),
|
|
self.assertRaises(ValueError, mod.bisect_right, [1, 2, 3], 5, -1, 3),
|
|
self.assertRaises(ValueError, mod.insort_left, [1, 2, 3], 5, -1, 3),
|
|
self.assertRaises(ValueError, mod.insort_right, [1, 2, 3], 5, -1, 3),
|
|
|
|
def test_random(self, n=25):
|
|
from random import randrange
|
|
for i in range(n):
|
|
data = [randrange(0, n, 2) for j in range(i)]
|
|
data.sort()
|
|
elem = randrange(-1, n+1)
|
|
ip = self.module.bisect_left(data, elem)
|
|
if ip < len(data):
|
|
self.failUnless(elem <= data[ip])
|
|
if ip > 0:
|
|
self.failUnless(data[ip-1] < elem)
|
|
ip = self.module.bisect_right(data, elem)
|
|
if ip < len(data):
|
|
self.failUnless(elem < data[ip])
|
|
if ip > 0:
|
|
self.failUnless(data[ip-1] <= elem)
|
|
|
|
def test_optionalSlicing(self):
|
|
for func, data, elem, expected in self.precomputedCases:
|
|
for lo in range(4):
|
|
lo = min(len(data), lo)
|
|
for hi in range(3,8):
|
|
hi = min(len(data), hi)
|
|
ip = func(data, elem, lo, hi)
|
|
self.failUnless(lo <= ip <= hi)
|
|
if func is self.module.bisect_left and ip < hi:
|
|
self.failUnless(elem <= data[ip])
|
|
if func is self.module.bisect_left and ip > lo:
|
|
self.failUnless(data[ip-1] < elem)
|
|
if func is self.module.bisect_right and ip < hi:
|
|
self.failUnless(elem < data[ip])
|
|
if func is self.module.bisect_right and ip > lo:
|
|
self.failUnless(data[ip-1] <= elem)
|
|
self.assertEqual(ip, max(lo, min(hi, expected)))
|
|
|
|
def test_backcompatibility(self):
|
|
self.assertEqual(self.module.bisect, self.module.bisect_right)
|
|
|
|
def test_keyword_args(self):
|
|
data = [10, 20, 30, 40, 50]
|
|
self.assertEqual(self.module.bisect_left(a=data, x=25, lo=1, hi=3), 2)
|
|
self.assertEqual(self.module.bisect_right(a=data, x=25, lo=1, hi=3), 2)
|
|
self.assertEqual(self.module.bisect(a=data, x=25, lo=1, hi=3), 2)
|
|
self.module.insort_left(a=data, x=25, lo=1, hi=3)
|
|
self.module.insort_right(a=data, x=25, lo=1, hi=3)
|
|
self.module.insort(a=data, x=25, lo=1, hi=3)
|
|
self.assertEqual(data, [10, 20, 25, 25, 25, 30, 40, 50])
|
|
|
|
class TestBisectPython(TestBisect):
|
|
module = py_bisect
|
|
|
|
class TestBisectC(TestBisect):
|
|
module = c_bisect
|
|
|
|
#==============================================================================
|
|
|
|
class TestInsort(unittest.TestCase):
|
|
module = None
|
|
|
|
def test_vsBuiltinSort(self, n=500):
|
|
from random import choice
|
|
for insorted in (list(), UserList()):
|
|
for i in range(n):
|
|
digit = choice("0123456789")
|
|
if digit in "02468":
|
|
f = self.module.insort_left
|
|
else:
|
|
f = self.module.insort_right
|
|
f(insorted, digit)
|
|
self.assertEqual(sorted(insorted), insorted)
|
|
|
|
def test_backcompatibility(self):
|
|
self.assertEqual(self.module.insort, self.module.insort_right)
|
|
|
|
class TestInsortPython(TestInsort):
|
|
module = py_bisect
|
|
|
|
class TestInsortC(TestInsort):
|
|
module = c_bisect
|
|
|
|
#==============================================================================
|
|
|
|
|
|
class LenOnly:
|
|
"Dummy sequence class defining __len__ but not __getitem__."
|
|
def __len__(self):
|
|
return 10
|
|
|
|
class GetOnly:
|
|
"Dummy sequence class defining __getitem__ but not __len__."
|
|
def __getitem__(self, ndx):
|
|
return 10
|
|
|
|
class CmpErr:
|
|
"Dummy element that always raises an error during comparison"
|
|
def __lt__(self, other):
|
|
raise ZeroDivisionError
|
|
__gt__ = __lt__
|
|
__le__ = __lt__
|
|
__ge__ = __lt__
|
|
__eq__ = __lt__
|
|
__ne__ = __lt__
|
|
|
|
class TestErrorHandling(unittest.TestCase):
|
|
module = None
|
|
|
|
def test_non_sequence(self):
|
|
for f in (self.module.bisect_left, self.module.bisect_right,
|
|
self.module.insort_left, self.module.insort_right):
|
|
self.assertRaises(TypeError, f, 10, 10)
|
|
|
|
def test_len_only(self):
|
|
for f in (self.module.bisect_left, self.module.bisect_right,
|
|
self.module.insort_left, self.module.insort_right):
|
|
self.assertRaises(TypeError, f, LenOnly(), 10)
|
|
|
|
def test_get_only(self):
|
|
for f in (self.module.bisect_left, self.module.bisect_right,
|
|
self.module.insort_left, self.module.insort_right):
|
|
self.assertRaises(TypeError, f, GetOnly(), 10)
|
|
|
|
def test_cmp_err(self):
|
|
seq = [CmpErr(), CmpErr(), CmpErr()]
|
|
for f in (self.module.bisect_left, self.module.bisect_right,
|
|
self.module.insort_left, self.module.insort_right):
|
|
self.assertRaises(ZeroDivisionError, f, seq, 10)
|
|
|
|
def test_arg_parsing(self):
|
|
for f in (self.module.bisect_left, self.module.bisect_right,
|
|
self.module.insort_left, self.module.insort_right):
|
|
self.assertRaises(TypeError, f, 10)
|
|
|
|
class TestErrorHandlingPython(TestErrorHandling):
|
|
module = py_bisect
|
|
|
|
class TestErrorHandlingC(TestErrorHandling):
|
|
module = c_bisect
|
|
|
|
#==============================================================================
|
|
|
|
libreftest = """
|
|
Example from the Library Reference: Doc/library/bisect.rst
|
|
|
|
The bisect() function is generally useful for categorizing numeric data.
|
|
This example uses bisect() to look up a letter grade for an exam total
|
|
(say) based on a set of ordered numeric breakpoints: 85 and up is an `A',
|
|
75..84 is a `B', etc.
|
|
|
|
>>> grades = "FEDCBA"
|
|
>>> breakpoints = [30, 44, 66, 75, 85]
|
|
>>> from bisect import bisect
|
|
>>> def grade(total):
|
|
... return grades[bisect(breakpoints, total)]
|
|
...
|
|
>>> grade(66)
|
|
'C'
|
|
>>> list(map(grade, [33, 99, 77, 44, 12, 88]))
|
|
['E', 'A', 'B', 'D', 'F', 'A']
|
|
|
|
"""
|
|
|
|
#------------------------------------------------------------------------------
|
|
|
|
__test__ = {'libreftest' : libreftest}
|
|
|
|
def test_main(verbose=None):
|
|
from test import test_bisect
|
|
|
|
test_classes = [TestBisectPython, TestBisectC,
|
|
TestInsortPython, TestInsortC,
|
|
TestErrorHandlingPython, TestErrorHandlingC]
|
|
|
|
support.run_unittest(*test_classes)
|
|
support.run_doctest(test_bisect, verbose)
|
|
|
|
# verify reference counting
|
|
if verbose and hasattr(sys, "gettotalrefcount"):
|
|
import gc
|
|
counts = [None] * 5
|
|
for i in range(len(counts)):
|
|
support.run_unittest(*test_classes)
|
|
gc.collect()
|
|
counts[i] = sys.gettotalrefcount()
|
|
print(counts)
|
|
|
|
if __name__ == "__main__":
|
|
test_main(verbose=True)
|