From: Andrew M. Kuchling <amk@amk.ca>
Date: Mon, 22 Feb 2010 22:21:05 +0000 (+0000)
Subject: Merged revisions 78340 via svnmerge from
X-Git-Tag: v3.1.2rc1~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54e14f227d44aeefe86d59739ee377a1c06d5ca3;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 78340 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78340 | andrew.kuchling | 2010-02-22 17:16:58 -0500 (Mon, 22 Feb 2010) | 1 line

  #6666: fix bug in trace.py that applied the list of ignored dirs only to 1st file
........
---

diff --git a/Lib/trace.py b/Lib/trace.py
index 9ce240fde5f6..e6316b69191b 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -117,7 +117,7 @@ class Ignore:
         self._mods = modules or []
         self._dirs = dirs or []
 
-        self._dirs = map(os.path.normpath, self._dirs)
+        self._dirs = list(map(os.path.normpath, self._dirs))
         self._ignore = { '<string>': 1 }
 
     def names(self, filename, modulename):
diff --git a/Misc/NEWS b/Misc/NEWS
index 0a997733ad9d..aa33a4bf5320 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -82,6 +82,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6666: fix bug in trace.py that applied the list of directories
+  to be ignored only to the first file.  Noted by Bogdan Opanchuk.
+
 - Issue #7597: curses.use_env() can now be called before initscr().
   Noted by Kan-Ru Chen.