Merged revisions 83525 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83525 | georg.brandl | 2010-08-02 14:36:24 +0200 (Mo, 02 Aug 2010) | 1 line

  Get rid of spurious "threading" entries in trace output.
........
This commit is contained in:
Georg Brandl 2010-08-02 21:38:08 +00:00
parent fb2c459ab2
commit 11ce4d98f2

View file

@ -494,8 +494,8 @@ class Trace:
import __main__
dict = __main__.__dict__
if not self.donothing:
sys.settrace(self.globaltrace)
threading.settrace(self.globaltrace)
sys.settrace(self.globaltrace)
try:
exec cmd in dict, dict
finally:
@ -507,8 +507,8 @@ class Trace:
if globals is None: globals = {}
if locals is None: locals = {}
if not self.donothing:
sys.settrace(self.globaltrace)
threading.settrace(self.globaltrace)
sys.settrace(self.globaltrace)
try:
exec cmd in globals, locals
finally: