Changeset: ac75058bf8d2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ac75058bf8d2
Modified Files:
testing/Mtest.py.in
Branch: Jan2022
Log Message:
Use print() instead of sys.stdout.write (STDOUT.write).
diffs (truncated from 473 to 300 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -62,12 +62,12 @@ mapiportre = re.compile(r'mapi:monetdb:/
geos_version = '@GEOS_VERSION@'.split('.')
# default is no color (these three functions may get redefined)
-def prred(str, write = sys.stdout.write):
- write(str)
-def prgreen(str, write = sys.stdout.write):
- write(str)
-def prpurple(str, write = sys.stdout.write):
- write(str)
+def prred(str):
+ print(str, end='')
+def prgreen(str):
+ print(str, end='')
+def prpurple(str):
+ print(str, end='')
if isatty:
if os.name != 'nt':
# color output a little
@@ -75,24 +75,24 @@ if isatty:
GREEN = '\033[0;32m'
PURPLE = '\033[1;35m' # actually magenta
BLACK = '\033[0;0m'
- def prred(str, write = sys.stdout.write):
+ def prred(str):
try:
- write(RED)
- write(str)
+ print(RED, end='')
+ print(str, end='')
finally:
- write(BLACK)
- def prgreen(str, write = sys.stdout.write):
+ print(BLACK, end='')
+ def prgreen(str):
try:
- write(GREEN)
- write(str)
+ print(GREEN, end='')
+ print(str, end='')
finally:
- write(BLACK)
- def prpurple(str, write = sys.stdout.write):
+ print(BLACK, end='')
+ def prpurple(str):
try:
- write(PURPLE)
- write(str)
+ print(PURPLE, end='')
+ print(str, end='')
finally:
- write(BLACK)
+ print(BLACK, end='')
else:
try:
import ctypes
@@ -115,36 +115,27 @@ if isatty:
return wattr
reset = get_csbi_attributes(handle)
def prred(str,
- write=sys.stdout.write,
- flush=sys.stdout.flush,
scta=ctypes.windll.kernel32.SetConsoleTextAttribute):
try:
- flush()
+ print(end='', flush=True)
scta(handle, 0x4)
- write(str)
- flush()
+ print(str, end='', flush=True)
finally:
scta(handle, reset)
def prgreen(str,
- write=sys.stdout.write,
- flush=sys.stdout.flush,
scta=ctypes.windll.kernel32.SetConsoleTextAttribute):
try:
- flush()
+ print(end='', flush=True)
scta(handle, 0x2)
- write(str)
- flush()
+ print(str, end='', flush=True)
finally:
scta(handle, reset)
def prpurple(str,
- write=sys.stdout.write,
- flush=sys.stdout.flush,
scta=ctypes.windll.kernel32.SetConsoleTextAttribute):
try:
- flush()
+ print(end='', flush=True)
scta(handle, 0x5)
- write(str)
- flush()
+ print(str, end='', flush=True)
finally:
scta(handle, reset)
@@ -166,7 +157,7 @@ if os.path.exists('/usr/bin/coredumpctl'
pass
def ErrExit(msg):
- sys.stderr.write(msg + '\n')
+ print(msg, file=sys.stderr, flush=True)
sys.exit(1)
def _configure(str):
@@ -580,8 +571,6 @@ class Timer:
self.timer.cancel()
self.timer = None
-STDOUT = sys.stdout
-STDERR = sys.stdout # err
REV = '' # revision (output of hg id), default unknown
black = 'black' # #000000
@@ -621,9 +610,8 @@ random.seed(time.time())
#### AlarmHandler(signum, frame) #
def ErrMsg(TEXT) :
- STDOUT.flush()
- STDERR.write("\n%s: ERROR: %s\n\n" % (THISFILE, TEXT))
- STDERR.flush()
+ print(end='', flush=True)
+ print("\n%s: ERROR: %s\n" % (THISFILE, TEXT), file=sys.stderr,
flush=True)
### ErrMsg(TEXT) #
def ErrXit(TEXT) :
@@ -633,12 +621,11 @@ def ErrXit(TEXT) :
def Warn(TEXT) :
try:
- STDOUT.flush()
+ print(end='', flush=True)
except IOError:
pass
try:
- STDERR.write("\n%s Warning: %s\n\n" % (THISFILE, TEXT))
- STDERR.flush()
+ print("\n%s Warning: %s\n" % (THISFILE, TEXT), file=sys.stderr,
flush=True)
except IOError:
pass
### Warn(TEXT) #
@@ -1129,7 +1116,7 @@ def SkipTest(env, TST, EXT, REASON, leng
TSTDIR = env['TSTDIR']
TEXT = "Skipping test %s%s %s" % (TST, EXT, REASON)
if quiet:
- STDOUT.write("-")
+ print("-", end='')
elif verbose:
Warn(TEXT)
else:
@@ -1147,7 +1134,7 @@ def SkipTest(env, TST, EXT, REASON, leng
s = '%s...%s' % (TST[:l//2 - 2], TST[-(l//2 - 1):])
else:
s = '%-*s' % (length, TST)
- STDOUT.write('%s%s skipped (%s)\n' % (prompt(), s, REASON))
+ print('%s%s skipped (%s)' % (prompt(), s, REASON))
if testweb:
return None
@@ -1289,11 +1276,6 @@ def PerformDir(env, testdir, testlist, a
os.environ['TSTDATAPATH'] = TSTDATAPATH
- #STDERR.flush()
- #for v in 'RELSRCDIR':
- # print(v+" = "+str(env[v]))
- #STDOUT.flush()
-
if 'GDK_DBFARM' in env:
LogDBdir = os.path.join(env['GDK_DBFARM'],TSTDB)
if not env.get('NOCLEAN') and LogDBdir and
os.path.exists(LogDBdir):
@@ -1733,21 +1715,17 @@ def GetBitsAndModsAndThreads(env) :
if not env['TST_MODS']:
ErrMsg("Checking for Modules failed!")
if not env['TST_BITS'] or not env['TST_MODS']:
- STDERR.write(' '.join(cmd) + "\n\n")
- STDERR.write(qOut)
- STDERR.write("\n")
- STDERR.write(qErr)
- STDERR.write("\n")
- STDERR.flush()
+ print(' '.join(cmd) + "\n\n", file=sys.stderr, end='')
+ print(qOut, file=sys.stderr, end='')
+ print.write(file=sys.stderr)
+ print(qErr, file=sys.stderr, flush=True)
rtrn = 1
else:
rtrn = 1
ErrMsg("No output from mserver5 when checking for Bits, Modules &
Threads!?")
if qErr:
- STDERR.write(' '.join(cmd) + "\n\n")
- STDERR.write(qErr)
- STDERR.write("\n")
- STDERR.flush()
+ print(' '.join(cmd) + "\n\n", file=sys.stderr, end='')
+ print(qErr, file=sys.stderr, flush=True)
os.environ['TST_MODS'] = str(env['TST_MODS'])
return rtrn
### GetBitsAndModsAndThreads(env) #
@@ -1949,10 +1927,10 @@ def RunTest(env, TST, COND, oktests, len
if quiet:
pass
elif verbose:
- STDOUT.write('%s%s ' %
- (prompt(), os.path.join(env['TSTDIR'], TST +
EXT)))
+ print('%s%s ' %
+ (prompt(), os.path.join(env['TSTDIR'], TST + EXT)),
end='')
prred('TEST MISSING')
- STDOUT.write('\n')
+ print()
else:
if ttywidth > 0 and length + 10 + 21 >= ttywidth:
# 10 - length of prompt()
@@ -1964,9 +1942,9 @@ def RunTest(env, TST, COND, oktests, len
s = '%s...%s ' % (TST[:l//2 - 2], TST[l//2+1-l:])
else:
s = '%-*s ' % (length, TST)
- STDOUT.write('%s%s' % (prompt(), s))
+ print('%s%s' % (prompt(), s), end='')
prred('TEST MISSING')
- STDOUT.write('\n')
+ print()
return TX,Failed,Failed,elem,reason,links
@@ -2177,7 +2155,7 @@ def RunTest(env, TST, COND, oktests, len
t1 = time.time()
TX = t1 - t0
if not quiet:
- STDOUT.write(" %7.3fs " % TX)
+ print(" %7.3fs " % TX, end='')
if tres == 'timeout':
errcode = F_TIME
@@ -2227,39 +2205,39 @@ def RunTest(env, TST, COND, oktests, len
if tres == 'socket':
if quiet:
- STDOUT.write("\n%s : Socket!\n" % TST)
+ print("\n%s : Socket!" % TST)
elif verbose:
- STDOUT.write("(Socket!) ")
+ print("(Socket!) ", end='')
if tres == 'timeout':
if quiet:
- STDOUT.write("\n%s : Timeout!\n" % TST)
+ print("\n%s : Timeout!" % TST)
elif verbose:
- STDOUT.write("(Timeout!) ")
+ print("(Timeout!) ", end='')
if tres == 'recursion':
if quiet:
- STDOUT.write("\n%s : Recursion!\n" % TST)
+ print("\n%s : Recursion!" % TST)
elif verbose:
- STDOUT.write("(Recursion!) ")
+ print("(Recursion!) ", end='')
if tres == 'segfault':
if quiet:
- STDOUT.write("\n%s : Crashed!\n" % TST)
+ print("\n%s : Crashed!" % TST)
elif verbose:
- STDOUT.write("(Crashed!) ")
+ print("(Crashed!) ", end='')
if tres == 'signal':
if quiet:
- STDOUT.write("\n%s : Signaled!\n" % TST)
+ print("\n%s : Signaled!" % TST)
elif verbose:
- STDOUT.write("(Signaled!) ")
+ print("(Signaled!) ", end='')
if verbose:
- STDOUT.write("\n")
+ print()
try:
- STDOUT.flush()
+ print('', end='', flush=True)
except IOError as err:
Warn("Flushing STDOUT in RunTest failed with #%d: '%s'." %
(err.errno, err.strerror))
@@ -2367,14 +2345,14 @@ def RunTest(env, TST, COND, oktests, len
prgreen('minor')
else:
prred('MAJOR')
- STDOUT.write(' ')
+ print(' ', end='')
if FailedErr == F_OK:
prgreen('OK')
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
