summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Peters <tim@python.org>2013-09-06 15:42:47 -0500
committerTim Peters <tim@python.org>2013-09-06 15:42:47 -0500
commitf4ecfae75f9e4e52c07e5561077855aebaa6e77a (patch)
tree24fc14ed1d452b5a254a95367b55704a2fb7e902
parent66ff01fede0a566376d7026b48554e7d75c2300a (diff)
parent23d7d4e85cf5aac97bc8ae4ff0e753d70ad8e6e8 (diff)
downloadcpython-git-f4ecfae75f9e4e52c07e5561077855aebaa6e77a.tar.gz
Merge 3.3 into default.
Issue 18944: fix a 1-character typo in test_set.py. The error caused test_inline_methods() to test much less than intended. Caught (& fixed) by Armin Rigo.
-rw-r--r--Lib/test/test_set.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py
index f8c7180da5..13cefec1a9 100644
--- a/Lib/test/test_set.py
+++ b/Lib/test/test_set.py
@@ -1672,7 +1672,7 @@ class TestVariousIteratorArgs(unittest.TestCase):
for meth in (s.union, s.intersection, s.difference, s.symmetric_difference, s.isdisjoint):
for g in (G, I, Ig, L, R):
expected = meth(data)
- actual = meth(G(data))
+ actual = meth(g(data))
if isinstance(expected, bool):
self.assertEqual(actual, expected)
else: