Changeset: 7f4071c618b9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f4071c618b9
Modified Files:
sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py
sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py
sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.SQL.py
sql/test/remote/Tests/ssbm.SQL.py
Branch: Apr2019
Log Message:
Python 3 compatibility.
diffs (68 lines):
diff --git a/sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py
b/sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py
--- a/sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py
+++ b/sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py
@@ -13,6 +13,10 @@ q = []
q.append(("create table bug3261 (probeid int, markername varchar(64));\n"
"copy %d records into bug3261 from stdin using delimiters "
"'\\t','\\n','' null as 'null';\n") % (1455 * 3916))
+try:
+ xrange
+except NameError:
+ xrange = range # Python 3
for i in xrange(1,1456):
v = 'rmm%d' % i
for j in xrange(3916):
diff --git
a/sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py
b/sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py
---
a/sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py
+++
b/sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py
@@ -46,7 +46,7 @@ seqname = res[0][0]
try:
run(c1, 'drop sequence ' + seqname, False)
run(c1, 'insert into t(val) values (30), (40)')
-except Exception, e:
+except Exception as e:
print(e, file=sys.stderr)
print(query(c1, 'select * from t'))
run(c1, 'drop table t')
@@ -59,7 +59,7 @@ run(c1, 'insert into t2(val) values (10)
try:
run(c1, 'drop sequence myseq')
run(c1, 'insert into t2(val) values (30), (40)')
-except Exception, e:
+except Exception as e:
print(e, file=sys.stderr)
print(query(c1, 'select * from t2'))
run(c1, 'drop table t2')
diff --git a/sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.SQL.py
b/sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.SQL.py
--- a/sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.SQL.py
+++ b/sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.SQL.py
@@ -20,7 +20,7 @@ def query(conn, sql):
cur = conn.cursor()
try:
cur.execute(sql)
- except pymonetdb.OperationalError, e:
+ except pymonetdb.OperationalError as e:
print("!", e)
return
r = cur.fetchall()
@@ -31,7 +31,7 @@ def run(conn, sql):
print(sql)
try:
r = conn.execute(sql)
- except pymonetdb.OperationalError, e:
+ except pymonetdb.OperationalError as e:
print("!", e)
return
print('# OK')
diff --git a/sql/test/remote/Tests/ssbm.SQL.py
b/sql/test/remote/Tests/ssbm.SQL.py
--- a/sql/test/remote/Tests/ssbm.SQL.py
+++ b/sql/test/remote/Tests/ssbm.SQL.py
@@ -105,7 +105,7 @@ if os.path.exists(lineorderdir):
if not os.path.exists(lineorderdir):
os.makedirs(lineorderdir)
inputData = open(lineordertbl, 'r').read().split('\n')
-linesperslice = len(inputData) / nworkers + 1
+linesperslice = len(inputData) // nworkers + 1
i = 0
for lines in range(0, len(inputData), linesperslice):
outputData = inputData[lines:lines+linesperslice]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
