Changeset: 5b07b029976e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b07b029976e
Modified Files:
NT/makelibdef.py
NT/mkodbcwxs.py
NT/mksqlwxs.py
NT/winconfig.py
buildtools/autogen/autogen.py
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/codegen.py
buildtools/autogen/autogen/msc.py
buildtools/conf/fixlicense.py
clients/examples/python/basics.py
clients/examples/python/sqlsample.py
clients/mapiclient/dotfile.py
sql/benchmarks/hist-uva/ground/create.py
sql/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.unpack_csv.py
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py
sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py
sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
sql/test/BugTracker/Tests/python_escape.SF-1916844.SQL.py
sql/test/Tests/hot-snapshot.py
sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.SQL.py
sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
sql/test/concurrent/Tests/simple_select.SQL.py
sql/test/emptydb-upgrade-chain-hge/Tests/package.py
sql/test/emptydb-upgrade-chain/Tests/package.py
sql/test/emptydb/Tests/package-hge.py
sql/test/emptydb/Tests/package.py
sql/test/malloc_fail/Tests/mallocs.SQL.py
sql/test/mapi/Tests/python_dec38.py
sql/test/mapi/Tests/python_int128.py
sql/test/miscellaneous/Tests/pk_fk_stress.SQL.py
sql/test/remote/Tests/creds.SQL.py
sql/test/remote/Tests/different_user.SQL.py
sql/test/remote/Tests/invalid_creds.SQL.py
sql/test/testdb-upgrade-chain-hge/Tests/package.py
sql/test/testdb-upgrade-chain/Tests/package.py
sql/test/testdb/Tests/package-hge.py
sql/test/testdb/Tests/package.py
sql/test/wlcr/Tests/wlc01.py
sql/test/wlcr/Tests/wlc100.py
sql/test/wlcr/Tests/wlc20.py
sql/test/wlcr/Tests/wlc21.py
sql/test/wlcr/Tests/wlc30.py
sql/test/wlcr/Tests/wlc40.py
sql/test/wlcr/Tests/wlc50.py
sql/test/wlcr/Tests/wlc70.py
sql/test/wlcr/Tests/wlc80.py
sql/test/wlcr/Tests/wlcr00.py
sql/test/wlcr/Tests/wlr01.py
sql/test/wlcr/Tests/wlr10.py
sql/test/wlcr/Tests/wlr100.py
sql/test/wlcr/Tests/wlr110.py
sql/test/wlcr/Tests/wlr20.py
sql/test/wlcr/Tests/wlr30.py
sql/test/wlcr/Tests/wlr35.py
sql/test/wlcr/Tests/wlr40.py
sql/test/wlcr/Tests/wlr50.py
sql/test/wlcr/Tests/wlr70.py
sql/test/wlcr/Tests/wlr80.py
testing/Mfilter.py
testing/cmptests.py
testing/malcheck.py
tools/merovingian/client/Tests/monetdb_status.py
Branch: Jun2020
Log Message:
We now require Python 3.
diffs (truncated from 700 to 300 lines):
diff --git a/NT/makelibdef.py b/NT/makelibdef.py
--- a/NT/makelibdef.py
+++ b/NT/makelibdef.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import fileinput, re
p = re.compile('^\s*\d+\s+[0-9A-F]+\s+[0-9A-F]+\s+(\w+)')
print('LIBRARY R')
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
# python mkodbcwxs.py VERSION makedefs.txt PREFIX >
PREFIX/MonetDB-ODBC-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch
x64/x86 PREFIX/MonetDB-ODBC-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -nologo -sice:ICE03
-sice:ICE60 -sice:ICE82 -ext WixUIExtension PREFIX/MonetDB-ODBC-Installer.wixobj
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
# python mksqlwxs.py VERSION makedefs.txt PREFIX >
PREFIX/MonetDB5-SQL-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\candle.exe" -nologo -arch
x64/x86 PREFIX/MonetDB5-SQL-Installer.wxs
# "c:\Program Files (x86)\WiX Toolset v3.10\bin\light.exe" -nologo -sice:ICE03
-sice:ICE60 -sice:ICE82 -ext WixUIExtension PREFIX/MonetDB5-SQL-Installer.wixobj
diff --git a/NT/winconfig.py b/NT/winconfig.py
--- a/NT/winconfig.py
+++ b/NT/winconfig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/buildtools/autogen/autogen.py b/buildtools/autogen/autogen.py
--- a/buildtools/autogen/autogen.py
+++ b/buildtools/autogen/autogen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,8 +6,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
#
# autogen scans the makefile.ag
# and generates both the makefile.am and makefile.msc
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -4,8 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import os
import posixpath
import sys
diff --git a/buildtools/autogen/autogen/codegen.py
b/buildtools/autogen/autogen/codegen.py
--- a/buildtools/autogen/autogen/codegen.py
+++ b/buildtools/autogen/autogen/codegen.py
@@ -4,8 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import string
import re
import fileinput
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -4,8 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import string
import os
import re
diff --git a/buildtools/conf/fixlicense.py b/buildtools/conf/fixlicense.py
--- a/buildtools/conf/fixlicense.py
+++ b/buildtools/conf/fixlicense.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,8 +6,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import os, sys, getopt, stat
usage = '''\
diff --git a/clients/examples/python/basics.py
b/clients/examples/python/basics.py
--- a/clients/examples/python/basics.py
+++ b/clients/examples/python/basics.py
@@ -4,8 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import logging
#configure the logger, so we can see what is happening
diff --git a/clients/examples/python/sqlsample.py
b/clients/examples/python/sqlsample.py
--- a/clients/examples/python/sqlsample.py
+++ b/clients/examples/python/sqlsample.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,8 +6,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
import pymonetdb
import sys
diff --git a/clients/mapiclient/dotfile.py b/clients/mapiclient/dotfile.py
--- a/clients/mapiclient/dotfile.py
+++ b/clients/mapiclient/dotfile.py
@@ -4,8 +4,6 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-from __future__ import print_function
-
'''
The output of the Stethoscope can be saved in JSON format using the -j flag.
This program converts such a Stethoscope output file into a .dot file
diff --git a/sql/benchmarks/hist-uva/ground/create.py
b/sql/benchmarks/hist-uva/ground/create.py
--- a/sql/benchmarks/hist-uva/ground/create.py
+++ b/sql/benchmarks/hist-uva/ground/create.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
print('create table histogram256_tab (')
for i in range(1,256):
print('\tBIN%d NUMBER NOT NULL,' % i)
diff --git
a/sql/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.unpack_csv.py
b/sql/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.unpack_csv.py
--- a/sql/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.unpack_csv.py
+++ b/sql/test/BugTracker-2009/Tests/parallel_bulk-load.SF-2771052.unpack_csv.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import zipfile, os
archive = 'parallel_bulk-load.SF-2771052.unpack_csv.zip'
diff --git
a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
--- a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
+++ b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import os, socket, sys, tempfile, shutil
try:
from MonetDBtesting import process
diff --git a/sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
b/sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
--- a/sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
+++ b/sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
try:
from MonetDBtesting import process
except ImportError:
diff --git a/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
b/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
--- a/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
+++ b/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import os
import pymonetdb
diff --git a/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
b/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
--- a/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
+++ b/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import pymonetdb, os
dbh =
pymonetdb.connect(port=int(os.getenv('MAPIPORT')),hostname=os.getenv('MAPIHOST'),database=os.getenv('TSTDB'))
diff --git a/sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py
b/sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py
--- a/sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py
+++ b/sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import os, sys, zipfile
try:
from MonetDBtesting import process
diff --git a/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py
b/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py
--- a/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py
+++ b/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
try:
from MonetDBtesting import process
except ImportError:
diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
@@ -4,8 +4,6 @@ Test if server doesn't crash when remote
Current result is an mal error (compilation failed)
"""
-from __future__ import print_function
-
import os, sys, socket, glob, pymonetdb, threading, time, codecs, shutil,
tempfile
try:
from MonetDBtesting import process
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
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
try:
from MonetDBtesting import process
except ImportError:
diff --git
a/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
b/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
---
a/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
+++
b/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import os
import socket
import sys
diff --git
a/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
--- a/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
+++ b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import os
import socket
import sys
diff --git
a/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
b/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
--- a/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
+++ b/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import os
import socket
import sys
diff --git a/sql/test/BugTracker/Tests/python_escape.SF-1916844.SQL.py
b/sql/test/BugTracker/Tests/python_escape.SF-1916844.SQL.py
--- a/sql/test/BugTracker/Tests/python_escape.SF-1916844.SQL.py
+++ b/sql/test/BugTracker/Tests/python_escape.SF-1916844.SQL.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import pymonetdb
import os
diff --git a/sql/test/Tests/hot-snapshot.py b/sql/test/Tests/hot-snapshot.py
--- a/sql/test/Tests/hot-snapshot.py
+++ b/sql/test/Tests/hot-snapshot.py
@@ -10,9 +10,6 @@
# The committed data should exist in the snapshot.
# The uncommitted data should not.
-
-from __future__ import print_function
-
try:
from MonetDBtesting import process
except ImportError:
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
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
###
# Assess that the user can use a granted privilege without having to logout.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
