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.
........
diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py
index 471425d..4a469e7 100644
--- a/Lib/sqlite3/test/types.py
+++ b/Lib/sqlite3/test/types.py
@@ -226,7 +226,7 @@
sqlite.converters["FOO"] = lambda x: "[%s]" % x
sqlite.converters["BAR"] = lambda x: "<%s>" % x
- sqlite.converters["EXC"] = lambda x: 5/0
+ sqlite.converters["EXC"] = lambda x: 5 // 0
sqlite.converters["B1B1"] = lambda x: "MARKER"
def tearDown(self):
diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py
index 8a1130d..42559e3 100644
--- a/Lib/sqlite3/test/userfunctions.py
+++ b/Lib/sqlite3/test/userfunctions.py
@@ -38,7 +38,7 @@
def func_returnblob():
return buffer("blob")
def func_raiseexception():
- 5/0
+ 5 // 0
def func_isstring(v):
return type(v) is unicode
@@ -67,7 +67,7 @@
class AggrExceptionInInit:
def __init__(self):
- 5/0
+ 5 // 0
def step(self, x):
pass
@@ -80,7 +80,7 @@
pass
def step(self, x):
- 5/0
+ 5 // 0
def finalize(self):
return 42
@@ -93,7 +93,7 @@
pass
def finalize(self):
- 5/0
+ 5 // 0
class AggrCheckType:
def __init__(self):