summaryrefslogtreecommitdiff
path: root/Lib/trace.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-02-15 21:22:22 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2013-02-15 21:22:22 +0200
commit10f89329adac0a405b5416727c0df6bd4ba6a17d (patch)
tree58043f368eb2ada2c34340226f286948841e7cee /Lib/trace.py
parent990f69e6038f9e8b306708a41ec841b930042973 (diff)
parent23e043fdcd52c2bdcde40b07f21e56ab8a956cff (diff)
downloadcpython-git-10f89329adac0a405b5416727c0df6bd4ba6a17d.tar.gz
#17143: merge with 3.3.
Diffstat (limited to 'Lib/trace.py')
-rw-r--r--Lib/trace.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/trace.py b/Lib/trace.py
index 7eb35ebcb0..09fe9ee0e4 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -58,6 +58,7 @@ import inspect
import gc
import dis
import pickle
+from warnings import warn as _warn
try:
from time import monotonic as _time
except ImportError: