summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_trace.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-08-02 18:40:55 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-08-02 18:40:55 (GMT)
commit3efafd77498def137f4afbcf2abee9aa2aed460a (patch)
treee491bca6f159d278f142478ad73b287cd20b958d /Lib/test/test_trace.py
parent5ff2745fed91dca3dca20360945562df70ed7767 (diff)
downloadcpython-3efafd77498def137f4afbcf2abee9aa2aed460a.zip
cpython-3efafd77498def137f4afbcf2abee9aa2aed460a.tar.gz
cpython-3efafd77498def137f4afbcf2abee9aa2aed460a.tar.bz2
Merged revisions 77942,79023 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77942 | ezio.melotti | 2010-02-03 07:37:26 +0200 (Wed, 03 Feb 2010) | 1 line #7092: Silence more py3k warnings. Patch by Florent Xicluna. ........ r79023 | ezio.melotti | 2010-03-17 15:52:48 +0200 (Wed, 17 Mar 2010) | 1 line #7092: silence some more py3k warnings. ........
Diffstat (limited to 'Lib/test/test_trace.py')
-rw-r--r--Lib/test/test_trace.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py
index ea75a9e..8e3d483 100644
--- a/Lib/test/test_trace.py
+++ b/Lib/test/test_trace.py
@@ -401,7 +401,7 @@ class RaisingTraceFuncTestCase(unittest.TestCase):
we're testing, so that the 'exception' trace event fires."""
if self.raiseOnEvent == 'exception':
x = 0
- y = 1/x
+ y = 1 // x
else:
return 1