Changeset: f9b94247ae68 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f9b94247ae68
Modified Files:
testing/Mtest.py.in
testing/process.py
Branch: Jun2020
Log Message:
Modernize: use text instead of universal_newlines.
diffs (truncated from 367 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
@@ -1475,7 +1475,7 @@ def ApproveOutput (env, TST) :
f = openutf8(patch + '.0', 'w')
proc = process.Popen(['diff', '-Bb', '-I^[#=]', '-I^MAPI *=',
'-U0',
stableOUTPUT, testOUTPUT],
- stdout = f, universal_newlines = True)
+ stdout=f, text=True)
proc.wait()
f.close()
if os.path.getsize(patch + ".0"):
@@ -1519,12 +1519,12 @@ def ApproveOutput (env, TST) :
if not verbose:
patchcmd.append('--quiet')
proc = process.Popen(patchcmd + [stableOUTPUT, patch + '.1'],
- universal_newlines = True)
+ text=True)
proc.wait()
f = openutf8(patch, 'w')
proc = process.Popen(['diff', '-u', stableOUTPUT + '.ORG',
stableOUTPUT],
- stdout = f, universal_newlines = True)
+ stdout=f, text=True)
proc.wait()
f.close()
remove(stableOUTPUT + ".ORG")
@@ -1544,7 +1544,7 @@ def ApproveOutput (env, TST) :
elif f != thefile and test.match(f):
remove(os.path.join(dir or os.curdir, f + '.rej'))
remove(os.path.join(dir or os.curdir, f + '.orig'))
- proc = process.Popen(patchcmd + ['--forward',
os.path.join(dir or os.curdir, f)], stdin = openutf8(patch), universal_newlines
= True)
+ proc = process.Popen(patchcmd + ['--forward',
os.path.join(dir or os.curdir, f)], stdin=openutf8(patch), text=True)
proc.wait()
if os.path.exists(os.path.join(dir or os.curdir, f
+ '.rej')):
list.append(f)
@@ -1638,9 +1638,9 @@ def returnCode(proc, f = None):
if procdebug:
print('Starting: coredumpctl -q info %d' % proc.pid)
p = process.Popen(['coredumpctl', '-q' ,'info',
str(proc.pid)],
- stdout = process.PIPE,
- stderr = process.PIPE,
- universal_newlines = True)
+ stdout=process.PIPE,
+ stderr=process.PIPE,
+ text=True)
out, err = p.communicate()
if not err and out:
f.write(out)
@@ -1660,9 +1660,9 @@ def returnCode(proc, f = None):
if procdebug:
print('Starting: coredumpctl -q info %d' % proc.pid)
p = process.Popen(['coredumpctl', '-q' ,'info',
str(proc.pid)],
- stdout = process.PIPE,
- stderr = process.PIPE,
- universal_newlines = True)
+ stdout=process.PIPE,
+ stderr=process.PIPE,
+ text=True)
out, err = p.communicate()
if not err and out:
f.write(out)
@@ -1700,8 +1700,8 @@ def GetBitsAndModsAndThreads(env) :
if procdebug:
print('GetBitsAndModsAndThreads: starting process "%s" (inpipe,
outpipe, errpipe)\n' % '" "'.join(cmd))
setpgrp = True
- proc = process.Popen(cmd, stdin = process.PIPE, stdout = process.PIPE,
- stderr = process.PIPE, universal_newlines = True)
+ proc = process.Popen(cmd, stdin=process.PIPE, stdout=process.PIPE,
+ stderr=process.PIPE, text=True)
proc.killed = False
proc.onechild = True
t = Timer(float(par['TIMEOUT']), killProc, args = [proc, proc.stderr, cmd])
@@ -1720,7 +1720,7 @@ def GetBitsAndModsAndThreads(env) :
if procdebug:
print('GetBitsAndModsAndThreads: starting process "%s"
(inpipe, outpipe, errpipe)\n' % '" "'.join(cmd))
clnt = process.Popen(cmd, stdin=process.PIPE, stdout=process.PIPE,
- stderr=process.PIPE, universal_newlines=True)
+ stderr=process.PIPE, text=True)
input = '''\
c := mdb.modules();
modsid := algebra.unique(c);
@@ -2420,9 +2420,9 @@ def RunTest(env, TST, BusyPorts, COND, o
if procdebug:
print('RunTest: starting process "%s"\n' % '" "'.join(cmd))
setpgrp = True
- proc = process.Popen(cmd, stdout = process.PIPE,
- stderr = process.PIPE,
- universal_newlines = True)
+ proc = process.Popen(cmd, stdout=process.PIPE,
+ stderr=process.PIPE,
+ text=True)
proc.killed = False
proc.onechild = False
t = Timer(float(par['TIMEOUT']), killProc, args = [proc])
@@ -2456,7 +2456,7 @@ def RunTest(env, TST, BusyPorts, COND, o
'-U%s' % par['CONTEXT'],
'%s%s.FILTERED' % (TST, STABLEout),
'%s.test.out.FILTERED' % TST])
- proc = process.Popen(cmd, universal_newlines = True)
+ proc = process.Popen(cmd, text=True)
proc.wait()
diff_html = openutf8('%s.err.diff.html' % TST,"w")
@@ -2489,9 +2489,9 @@ def RunTest(env, TST, BusyPorts, COND, o
if procdebug:
print('RunTest: starting process "%s"\n' % '" "'.join(cmd))
setpgrp = True
- proc = process.Popen(cmd, stdout = process.PIPE,
- stderr = process.PIPE,
- universal_newlines = True)
+ proc = process.Popen(cmd, stdout=process.PIPE,
+ stderr=process.PIPE,
+ text=True)
proc.killed = False
proc.onechild = False
t = Timer(float(par['TIMEOUT']), killProc, args = [proc])
@@ -2525,7 +2525,7 @@ def RunTest(env, TST, BusyPorts, COND, o
'-U%s' % par['CONTEXT'],
'%s%s.FILTERED' % (TST, STABLEerr),
'%s.test.err.FILTERED' % TST])
- proc = process.Popen(cmd, universal_newlines = True)
+ proc = process.Popen(cmd, text=True)
proc.wait()
FailedOut, FailedErr = CategorizeResult(TST, max(sockerr, errcode),
outmissing, errmissing)
@@ -2711,8 +2711,8 @@ def getkids():
# return a dictionary with process IDs as key and a list of child
# processes as value
p = process.Popen(['ps', '-lu', os.getenv('USER')],
- stdout = process.PIPE, stderr = process.PIPE,
- universal_newlines = True)
+ stdout=process.PIPE, stderr=process.PIPE,
+ text=True)
out, err = p.communicate()
if err:
return {}
@@ -2796,14 +2796,14 @@ def killProc(proc, outfile = None, cmd =
if cdb:
p = process.Popen([cdb, '-pv', '-p', str(proc.pid),
'-y',
'%scache*;srv*http://msdl.microsoft.com/download/symbols' % sym, '-lines',
'-c', '~*kP;!locks;q'],
- stdout = process.PIPE, universal_newlines = True)
+ stdout=process.PIPE, text=True)
out, err = p.communicate()
else:
out = ''
else:
try:
- p = process.Popen(['pstack', str(proc.pid)], stdout = process.PIPE,
- universal_newlines = True)
+ p = process.Popen(['pstack', str(proc.pid)], stdout=process.PIPE,
+ text=True)
try:
# pstack (gdb) sometimes hangs when trying to get the
# stack trace: kill it mercilessly if it does
@@ -2831,8 +2831,8 @@ def killProc(proc, outfile = None, cmd =
if procdebug:
print('killProc: starting process "taskkill" "/F" "/T" "/PID"
"%s"\n' % str(proc.pid))
p = process.Popen(['taskkill','/F','/T','/PID',str(proc.pid)],
- stdout = process.PIPE, stderr = process.PIPE,
- universal_newlines = True)
+ stdout=process.PIPE, stderr=process.PIPE,
+ text=True)
out, err = p.communicate()
if procdebug:
print('killProc: process exited "taskkill" "/F" "/T" "/PID" "%s"
(%s)\n' % (str(proc.pid), proc.returncode))
@@ -2886,11 +2886,11 @@ class ServerClass:
pass
if os.name == "nt":
proc = process.Popen(self.cmd, stdin=open(os.devnull),
stdout=self.outfile,
- stderr=self.errfile, universal_newlines=True,
+ stderr=self.errfile, text=True,
creationflags=process.CREATE_NEW_PROCESS_GROUP)
else:
proc = process.Popen(self.cmd, stdin=open(os.devnull),
stdout=self.outfile,
- stderr=self.errfile, universal_newlines=True)
+ stderr=self.errfile, text=True)
# maybe buffer output as it comes to avoid deadlock
if self.outfile == process.PIPE:
proc.stdout = process._BufferedPipe(proc.stdout)
@@ -2954,8 +2954,8 @@ def RunIt(cmd, onechild, TestIn, TestOut
if procdebug:
print('RunIt: starting process "%s"\n' % '" "'.join(cmd))
setpgrp = True
- proc = process.Popen(cmd, stdin = TestIn, stdout = TestOut,
- stderr = TestErr, universal_newlines = True)
+ proc = process.Popen(cmd, stdin=TestIn, stdout=TestOut,
+ stderr=TestErr, text=True)
proc.killed = False
proc.onechild = onechild
t = Timer(TimeOut, killProc, args = [proc, TestErr, cmd])
@@ -3300,8 +3300,8 @@ def Check(command, input) :
if procdebug:
print('Check: starting process "%s" (inpipe,outpipe,errpipe)\n' % '"
"'.join(command))
setpgrp = True
- proc = process.Popen(command, stdin = process.PIPE, stdout = process.PIPE,
- stderr = process.PIPE, universal_newlines = True)
+ proc = process.Popen(command, stdin=process.PIPE, stdout=process.PIPE,
+ stderr=process.PIPE, text=True)
proc.killed = False
proc.onechild = True
t = Timer(float(par['TIMEOUT']), killProc, args = [proc])
@@ -3505,9 +3505,9 @@ if os.name == "nt":
r = re.compile('^Microsoft Windows (.*)\[Version
([0-9]+\.[0-9]+)([^\[0-9].*)\]$')
if procdebug:
print('starting process "cmd" "/c" "ver" (inpipe,outpipe)\n')
- proc = process.Popen('cmd /c ver', stdin = process.PIPE,
- stdout = process.PIPE, stderr = process.PIPE,
- universal_newlines = True)
+ proc = process.Popen('cmd /c ver', stdin=process.PIPE,
+ stdout=process.PIPE, stderr=process.PIPE,
+ text=True)
qOut, qErr = proc.communicate()
if procdebug:
print('process exited "cmd" "/c" "ver" (%s)\n' % proc.returncode)
@@ -3667,8 +3667,8 @@ def main(argv) :
r_noecho = '--no-echo'
if CheckExec('R'):
proc = process.Popen(['R', '--version'],
- stdout = process.PIPE, stderr = process.PIPE,
- universal_newlines = True)
+ stdout=process.PIPE, stderr=process.PIPE,
+ text=True)
r_out, r_err = proc.communicate()
res = re.search(r'R version (?P<major>\d+)\.', r_out)
if res is not None and int(res.group('major')) < 4:
@@ -3676,8 +3676,8 @@ def main(argv) :
if CONDITIONALS['HAVE_LIBR']:
proc = process.Popen(['R', r_noecho, '--no-save',
'--no-restore',
'-e',
'print(Sys.getenv("R_LIBS_USER"))'],
- stdout = process.PIPE, stderr =
process.PIPE,
- universal_newlines = True)
+ stdout=process.PIPE, stderr=process.PIPE,
+ text=True)
r_out, r_err = proc.communicate()
res = re.search(r'\[\d+\] "(?P<dir>.*)"', r_out)
if res is not None:
@@ -3855,7 +3855,7 @@ def main(argv) :
if CheckExec('python'):
proc = process.Popen(['python', '-c', 'import sys;
print(sys.version[:1])'],
stdout=process.PIPE, stderr=process.PIPE,
- universal_newlines=True)
+ text=True)
pyout, pyerr = proc.communicate()
if proc.returncode == 0 and pyout:
python_version = pyout.strip()
@@ -3869,7 +3869,7 @@ def main(argv) :
try:
proc = process.Popen([py3, '-c', 'import pymonetdb'],
stdout=process.PIPE, stderr=process.PIPE,
- universal_newlines=True)
+ text=True)
pyout, pyerr = proc.communicate()
if proc.returncode == 0:
CONDITIONALS['HAVE_PY3MONETDB'] = '#'
@@ -3894,13 +3894,13 @@ def main(argv) :
if 'PYTHON3' in os.environ:
proc = process.Popen([os.environ['PYTHON3'], '-c', 'import scipy'],
stdout=process.PIPE, stderr=process.PIPE,
- universal_newlines=True)
+ text=True)
pyout, pyerr = proc.communicate()
if proc.returncode == 0:
CONDITIONALS['HAVE_LIBSCIPY3'] = '#'
# proc = process.Popen([os.environ['PYTHON3'], '-c', 'import pandas'],
# stdout=process.PIPE, stderr=process.PIPE,
- # universal_newlines=True)
+ # text=True)
# pyout, pyerr = proc.communicate()
# if proc.returncode == 0:
# CONDITIONALS['HAVE_LIBPANDAS3'] = '#'
@@ -3908,8 +3908,8 @@ def main(argv) :
CONDITIONALS['HAVE_DATA_PATH'] = '#'
if CheckExec('perl'):
proc = process.Popen(['perl', '-e', 'use MonetDB::CLI::MapiPP; use
DBI;'],
- stdout = process.PIPE, stderr = process.PIPE,
- universal_newlines = True)
+ stdout=process.PIPE, stderr=process.PIPE,
+ text=True)
perl_out, perl_err = proc.communicate()
if proc.returncode == 0:
CONDITIONALS['HAVE_PERL'] = '#'
@@ -3921,8 +3921,8 @@ def main(argv) :
phpcmd.extend(['-d', 'include_path=%s' %
os.environ['PHP_INCPATH']])
phpcmd.extend(['-r', "require 'monetdb/php_monetdb.php';"])
proc = process.Popen(phpcmd,
- stdout = process.PIPE, stderr = process.PIPE,
- universal_newlines = True)
+ stdout=process.PIPE, stderr=process.PIPE,
+ text=True)
php_out, php_err = proc.communicate()
if proc.returncode == 0:
CONDITIONALS['HAVE_PHP'] = '#'
@@ -3931,8 +3931,8 @@ def main(argv) :
if CheckExec('ruby'):
# also check ruby version; we require >= 1.9 for "require_relative"
proc = process.Popen(['ruby', '--version'],
- stdout = process.PIPE, stderr = process.PIPE,
- universal_newlines = True)
+ stdout=process.PIPE, stderr=process.PIPE,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
