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.
........
diff --git a/Lib/trace.py b/Lib/trace.py
index 5f124d9..43a5d33 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -494,8 +494,8 @@
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 @@
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: