summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorKristjan Valur Jonsson <sweskman@gmail.com>2011-03-30 11:24:58 (GMT)
committerKristjan Valur Jonsson <sweskman@gmail.com>2011-03-30 11:24:58 (GMT)
commitfa3edbed251a06226ae77571dc9e16eb44bf902b (patch)
tree9fca14b17e2947d4c28fcb8b01404f0f45c52783 /Lib
parent6a2638b1637bd7f79f55def97df20cfccff02509 (diff)
parent35722a93768e942be31270fe60acff138d878b26 (diff)
downloadcpython-fa3edbed251a06226ae77571dc9e16eb44bf902b.zip
cpython-fa3edbed251a06226ae77571dc9e16eb44bf902b.tar.gz
cpython-fa3edbed251a06226ae77571dc9e16eb44bf902b.tar.bz2
Merge 3.1
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_itertools.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py
index 5e4bf1b..8cdc597 100644
--- a/Lib/test/test_itertools.py
+++ b/Lib/test/test_itertools.py
@@ -357,6 +357,8 @@ class TestBasicOps(unittest.TestCase):
list(range(maxsize-5, maxsize+5)))
self.assertEqual(list(islice(count(-maxsize-5), 10)),
list(range(-maxsize-5, -maxsize+5)))
+ self.assertEqual(list(islice(count(10, maxsize+5), 3)),
+ list(range(10, 10+3*(maxsize+5), maxsize+5)))
c = count(3)
self.assertEqual(repr(c), 'count(3)')
next(c)
@@ -379,6 +381,9 @@ class TestBasicOps(unittest.TestCase):
self.assertEqual(next(copy.deepcopy(c)), value)
self.assertEqual(next(pickle.loads(pickle.dumps(c))), value)
+ #check proper internal error handling for large "step' sizes
+ count(1, maxsize+5); sys.exc_info()
+
def test_count_with_stride(self):
self.assertEqual(lzip('abc',count(2,3)), [('a', 2), ('b', 5), ('c', 8)])
self.assertEqual(lzip('abc',count(start=2,step=3)),