diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-16 18:15:12 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-16 18:15:12 (GMT) |
| commit | bee325387b21b859054002a052149646399b52de (patch) | |
| tree | 76d4edea625f87c01c50e3ac4d63d5582107868c /Lib | |
| parent | d8b690f7ae57169d95f1cb4b3a0bccf5adfe6a30 (diff) | |
| download | cpython-bee325387b21b859054002a052149646399b52de.zip cpython-bee325387b21b859054002a052149646399b52de.tar.gz cpython-bee325387b21b859054002a052149646399b52de.tar.bz2 | |
Merged revisions 63361-63373,63375,63377-63380 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63361 | alexandre.vassalotti | 2008-05-16 03:14:08 -0400 (Fri, 16 May 2008) | 2 lines
Rename the test file of reprlib.
........
r63364 | georg.brandl | 2008-05-16 05:34:48 -0400 (Fri, 16 May 2008) | 2 lines
Make generator repr consistent with function and code object repr.
........
r63365 | georg.brandl | 2008-05-16 05:47:29 -0400 (Fri, 16 May 2008) | 2 lines
#2869: remove parameter from signature.
........
r63366 | christian.heimes | 2008-05-16 06:23:31 -0400 (Fri, 16 May 2008) | 1 line
Fixed #2870: cmathmodule.c compile error
........
r63367 | christian.heimes | 2008-05-16 07:28:56 -0400 (Fri, 16 May 2008) | 1 line
Following Amaury's advice
........
r63368 | georg.brandl | 2008-05-16 09:10:15 -0400 (Fri, 16 May 2008) | 2 lines
#2890: support os.O_ASYNC and fcntl.FASYNC.
........
r63369 | georg.brandl | 2008-05-16 09:18:50 -0400 (Fri, 16 May 2008) | 2 lines
#2845: fix copy2's docs.
........
r63370 | georg.brandl | 2008-05-16 09:24:29 -0400 (Fri, 16 May 2008) | 2 lines
Don't allow keyword arguments to reversed().
........
r63373 | georg.brandl | 2008-05-16 09:41:26 -0400 (Fri, 16 May 2008) | 2 lines
Document O_ASYNC addition.
........
r63380 | georg.brandl | 2008-05-16 13:33:13 -0400 (Fri, 16 May 2008) | 2 lines
Fix reprlib docs.
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_enumerate.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_generators.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_genexps.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_reprlib.py (renamed from Lib/test/test_repr.py) | 0 |
4 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_enumerate.py b/Lib/test/test_enumerate.py index 8cebf44..f5c5689 100644 --- a/Lib/test/test_enumerate.py +++ b/Lib/test/test_enumerate.py @@ -138,6 +138,8 @@ class TestReversed(unittest.TestCase): for data in 'abc', range(5), tuple(enumerate('abc')), A(), range(1,17,5): self.assertEqual(list(data)[::-1], list(reversed(data))) self.assertRaises(TypeError, reversed, {}) + # don't allow keyword arguments + self.assertRaises(TypeError, reversed, [], a=1) def test_range_optimization(self): x = range(1) diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index e27eadd..56f23db 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -927,7 +927,7 @@ Test the __name__ attribute and the repr() >>> g.__name__ 'f' >>> repr(g) # doctest: +ELLIPSIS -'<f generator object at ...>' +'<generator object f at ...>' """ # conjoin is a simple backtracking generator, named in honor of Icon's diff --git a/Lib/test/test_genexps.py b/Lib/test/test_genexps.py index c8abbcc..593c1c5 100644 --- a/Lib/test/test_genexps.py +++ b/Lib/test/test_genexps.py @@ -92,7 +92,7 @@ Verify that parenthesis are required when used as a keyword argument value Verify that parenthesis are required when used as a keyword argument value >>> dict(a = (i for i in range(10))) #doctest: +ELLIPSIS - {'a': <<genexpr> generator object at ...>} + {'a': <generator object <genexpr> at ...>} Verify early binding for the outermost for-expression diff --git a/Lib/test/test_repr.py b/Lib/test/test_reprlib.py index 442c048..442c048 100644 --- a/Lib/test/test_repr.py +++ b/Lib/test/test_reprlib.py |