Use functools.reduce() in difflib instead of __builtin__.reduce() to silence

warnings when running under -3.

diff --git a/Lib/difflib.py b/Lib/difflib.py
index 63b42e9cc7f1fc1a3d8d6d0f4f518f2d0c74f166..7498e6f095d37e7eb62fbd490604597a5b0c80e0 100644 (file)
--- a/Lib/difflib.py
+++ b/Lib/difflib.py
@@ -34,6 +34,7 @@ __all__ = ['get_close_matches', 'ndiff', 'restore', 'SequenceMatcher',
 
 import heapq
 from collections import namedtuple as _namedtuple
+from functools import reduce
 
 Match = _namedtuple('Match', 'a b size')
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 60a783db54e7550826e9f644ad300769d73a4c8e..a59b6619d23ef636ca4dc72ced3ff004d1dcaa58 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,11 +60,11 @@ Library
 
 - Changed code in the following modules/packages to remove warnings raised
   while running under the ``-3`` flag: aifc, asynchat, asyncore, bdb, bsddb,
-  ConfigParser, cookielib, DocXMLRPCServer, email, filecmp, fileinput, inspect,
-  logging, modulefinder, pdb, pickle, profile, pstats, pydoc, re, rlcompleter,
-  SimpleXMLRPCServer, shelve, socket, subprocess, sqlite3, tarfile, Tkinter,
-  test.test_support, textwrap, threading, tokenize, traceback, urlparse,
-  wsgiref, xml, xmlrpclib.
+  ConfigParser, cookielib, difflib, DocXMLRPCServer, email, filecmp, fileinput,
+  inspect, logging, modulefinder, pdb, pickle, profile, pstats, pydoc, re,
+  rlcompleter, SimpleXMLRPCServer, shelve, socket, subprocess, sqlite3,
+  tarfile, Tkinter, test.test_support, textwrap, threading, tokenize,
+  traceback, urlparse, wsgiref, xml, xmlrpclib.
 
 - Issue #3039: Fix tarfile.TarFileCompat.writestr() which always
   raised an AttributeError.