Merged revisions 55514-55544 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55526 | neal.norwitz | 2007-05-22 23:42:22 -0700 (Tue, 22 May 2007) | 1 line
reduce was removed a while ago
........
r55544 | guido.van.rossum | 2007-05-23 19:23:53 -0700 (Wed, 23 May 2007) | 2 lines
Fix test_inspect. It seems my previous "fix" was due to a stale .pyc file.
........
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 46e008a..6fe1437 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -219,7 +219,7 @@
fodderFile = mod2
def test_wrapped_decorator(self):
- self.assertSourceEqual(mod2.wrapped, 14, 17)
+ self.assertSourceEqual(mod2.wrapped, 16, 17)
def test_replacing_decorator(self):
self.assertSourceEqual(mod2.gone, 9, 10)
diff --git a/Misc/NEWS b/Misc/NEWS
index edaf711..5fc8c5b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -135,7 +135,7 @@
backticks (ie, `x`), <>
- Removed these Python builtins:
- apply(), callable(), coerce(), file()
+ apply(), callable(), coerce(), file(), reduce()
- Removed these Python methods:
{}.has_key