Kaydet (Commit) 4a67a674 authored tarafından Skip Montanaro's avatar Skip Montanaro

backport: fix trace.py --ignore-dir

üst d84f68b1
...@@ -587,7 +587,7 @@ class Trace: ...@@ -587,7 +587,7 @@ class Trace:
""" """
if why == 'call': if why == 'call':
code = frame.f_code code = frame.f_code
filename = code.co_filename filename = frame.f_globals.get('__file__', None)
if filename: if filename:
# XXX modname() doesn't work right for packages, so # XXX modname() doesn't work right for packages, so
# the ignore support won't work right for packages # the ignore support won't work right for packages
......
...@@ -169,6 +169,9 @@ Extension Modules ...@@ -169,6 +169,9 @@ Extension Modules
Library 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, - Bug #1600860: Search for shared python library in LIBDIR, not lib/python/config,
on "linux" and "gnu" systems. on "linux" and "gnu" systems.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment