Silence warnings in csv about using reduce() when run under -3 by using

functools.reduce() instead.

diff --git a/Lib/csv.py b/Lib/csv.py
index 7210dacf9480d2f653f98d43d3a15509f978daf1..4f6e5c03a27bcce4dec8ab139a0a0743953bd925 100644 (file)
--- a/Lib/csv.py
+++ b/Lib/csv.py
@@ -4,6 +4,7 @@ csv.py - read/write/investigate CSV files
 """
 
 import re
+from functools import reduce
 from _csv import Error, __version__, writer, reader, register_dialect, \
                  unregister_dialect, get_dialect, list_dialects, \
                  field_size_limit, \

diff --git a/Misc/NEWS b/Misc/NEWS
index a59b6619d23ef636ca4dc72ced3ff004d1dcaa58..a2669c6c2bd111514ccfc65111d035db37ba8d2e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,10 +60,10 @@ 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, 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,
+  ConfigParser, cookielib, csv, 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