From: Brett Cannon <bcannon@gmail.com>
Date: Sat, 9 Aug 2008 23:39:11 +0000 (+0000)
Subject: Silence warnings in csv about using reduce() when run under -3 by using
X-Git-Tag: v2.6b3~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fc5631be6bb192db6cd5bd9b4305ab801ca3092;p=thirdparty%2FPython%2Fcpython.git

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 7210dacf9480..4f6e5c03a27b 100644
--- 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 a59b6619d23e..a2669c6c2bd1 100644
--- 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