summaryrefslogtreecommitdiffstats
path: root/Lib/test/output
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-05-05 03:56:37 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-05-05 03:56:37 (GMT)
commit6912d4ddf0504a3d5611ddd12cbde3354bd48279 (patch)
treeaf9162f00d5169fc8e9c13c0046d61051c2463ed /Lib/test/output
parentf4848dac41689d1f2f8bd224bd935beae9b8df86 (diff)
downloadcpython-6912d4ddf0504a3d5611ddd12cbde3354bd48279.zip
cpython-6912d4ddf0504a3d5611ddd12cbde3354bd48279.tar.gz
cpython-6912d4ddf0504a3d5611ddd12cbde3354bd48279.tar.bz2
Generalize tuple() to work nicely with iterators.
NEEDS DOC CHANGES. This one surprised me! While I expected tuple() to be a no-brainer, turns out it's actually dripping with consequences: 1. It will *allow* the popular PySequence_Fast() to work with any iterable object (code for that not yet checked in, but should be trivial). 2. It caused two std tests to fail. This because some places used PyTuple_Sequence() (the C spelling of tuple()) as an indirect way to test whether something *is* a sequence. But tuple() code only looked for the existence of sq->item to determine that, and e.g. an instance passed that test whether or not it supported the other operations tuple() needed (e.g., __len__). So some things the tests *expected* to fail with an AttributeError now fail with a TypeError instead. This looks like an improvement to me; e.g., test_coercion used to produce 559 TypeErrors and 2 AttributeErrors, and now they're all TypeErrors. The error details are more informative too, because the places calling this were *looking* for TypeErrors in order to replace the generic tuple() "not a sequence" msg with their own more specific text, and AttributeErrors snuck by that.
Diffstat (limited to 'Lib/test/output')
-rw-r--r--Lib/test/output/test_coercion4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/output/test_coercion b/Lib/test/output/test_coercion
index 8c5f6e0..4209750 100644
--- a/Lib/test/output/test_coercion
+++ b/Lib/test/output/test_coercion
@@ -516,7 +516,7 @@ test_coercion
[1] % None ... exceptions.TypeError
[1] %= None ... exceptions.TypeError
[1] + <MethodNumber 1> ... exceptions.TypeError
-[1] += <MethodNumber 1> ... exceptions.AttributeError
+[1] += <MethodNumber 1> ... exceptions.TypeError
[1] - <MethodNumber 1> ... exceptions.TypeError
[1] -= <MethodNumber 1> ... exceptions.TypeError
[1] * <MethodNumber 1> = [1]
@@ -528,7 +528,7 @@ test_coercion
[1] % <MethodNumber 1> ... exceptions.TypeError
[1] %= <MethodNumber 1> ... exceptions.TypeError
[1] + <CoerceNumber 2> ... exceptions.TypeError
-[1] += <CoerceNumber 2> ... exceptions.AttributeError
+[1] += <CoerceNumber 2> ... exceptions.TypeError
[1] - <CoerceNumber 2> ... exceptions.TypeError
[1] -= <CoerceNumber 2> ... exceptions.TypeError
[1] * <CoerceNumber 2> = [1, 1]