summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSkip Montanaro <skip@pobox.com>2007-02-11 18:24:37 (GMT)
committerSkip Montanaro <skip@pobox.com>2007-02-11 18:24:37 (GMT)
commit691acf287900669c2540ab9664abcd266c2a6838 (patch)
tree164bddef338132bff1dab5334456c4aae042ade7
parent1fbe3ab5de7fd34c8288c495960361b009a7e8b9 (diff)
downloadcpython-691acf287900669c2540ab9664abcd266c2a6838.zip
cpython-691acf287900669c2540ab9664abcd266c2a6838.tar.gz
cpython-691acf287900669c2540ab9664abcd266c2a6838.tar.bz2
fix trace.py --ignore-dir
-rw-r--r--Lib/trace.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/trace.py b/Lib/trace.py
index 35edac2..364e3f7 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -587,7 +587,7 @@ class Trace:
"""
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
diff --git a/Misc/NEWS b/Misc/NEWS
index aab0758..c42ade8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -128,6 +128,9 @@ Core and builtins
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.