[Python-checkins] r53737 - in python/branches/release25-maint: Lib/trace.py Misc/NEWS

[skip.montanaro]

Author: skip.montanaro
Date: Sun Feb 11 19:41:56 2007
New Revision: 53737

Modified:
   python/branches/release25-maint/Lib/trace.py
   python/branches/release25-maint/Misc/NEWS
Log:
backport: fix trace.py --ignore-dir

Modified: python/branches/release25-maint/Lib/trace.py
==============================================================================
--- python/branches/release25-maint/Lib/trace.py	(original)
+++ python/branches/release25-maint/Lib/trace.py	Sun Feb 11 19:41:56 2007
@@ -587,7 +587,7 @@
         """
         if why == 'call':
             code = frame.f_code
-            filename = code.co_filename
+            filename = frame.f_globals.get('__file__', None)
             if filename:
                 # XXX modname() doesn't work right for packages, so
                 # the ignore support won't work right for packages

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Sun Feb 11 19:41:56 2007
@@ -169,6 +169,9 @@
 Library
 -------
 
+- Patch 1571379: Make trace's --ignore-dir facility work in the face of
+  relative directory names.
+
 - Bug #1600860: Search for shared python library in LIBDIR, not lib/python/config,
   on "linux" and "gnu" systems.