summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_b2.py
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-05-06 01:05:02 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-05-06 01:05:02 (GMT)
commit8572b4fedf7e6ee4cd350680d53cd0a21574b083 (patch)
treed8f3f982d9b35dffb659ec228ae53628bf85a56e /Lib/test/test_b2.py
parentef0c42d4e5d0d7493395b1e3c37fe53dc48a377f (diff)
downloadcpython-8572b4fedf7e6ee4cd350680d53cd0a21574b083.zip
cpython-8572b4fedf7e6ee4cd350680d53cd0a21574b083.tar.gz
cpython-8572b4fedf7e6ee4cd350680d53cd0a21574b083.tar.bz2
Generalize zip() to work with iterators.
NEEDS DOC CHANGES. More AttributeErrors transmuted into TypeErrors, in test_b2.py, and, again, this strikes me as a good thing. This checkin completes the iterator generalization work that obviously needed to be done. Can anyone think of others that should be changed?
Diffstat (limited to 'Lib/test/test_b2.py')
-rw-r--r--Lib/test/test_b2.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_b2.py b/Lib/test/test_b2.py
index 2802215..324d02f 100644
--- a/Lib/test/test_b2.py
+++ b/Lib/test/test_b2.py
@@ -309,13 +309,13 @@ class G:
exc = 0
try:
zip(a, G())
-except AttributeError:
+except TypeError:
exc = 1
except:
e = sys.exc_info()[0]
raise TestFailed, 'zip(a, b) - b instance w/o __getitem__'
if not exc:
- raise TestFailed, 'zip(a, b) - missing expected AttributeError'
+ raise TestFailed, 'zip(a, b) - missing expected TypeError'
# Epilogue -- unlink the temp file