Changeset: 9a7ed242b2cc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a7ed242b2cc
Modified Files:
sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat
sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat
testing/Mtest.py.in
tools/merovingian/daemon/forkmserver.c
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (85 lines):
diff --git a/sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat
b/sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat
--- a/sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat
+++ b/sql/backends/monet5/UDF/pyapi/pyapi_locatepython2.bat
@@ -10,7 +10,7 @@ setlocal ENABLEEXTENSIONS
set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\2.7\InstallPath"
set VALUE_NAME=""
-FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v
%VALUE_NAME% 2^>nul`) DO (
+FOR /F "usebackq skip=2 tokens=1,2,*" %%A IN (`REG QUERY %KEY_NAME% /v
%VALUE_NAME% 2^>nul`) DO (
set ValueName=%%A
set ValueType=%%B
set ValueValue=%%C
diff --git a/sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat
b/sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat
--- a/sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat
+++ b/sql/backends/monet5/UDF/pyapi3/pyapi_locatepython3.bat
@@ -10,7 +10,7 @@ setlocal ENABLEEXTENSIONS
set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Python\PythonCore\3.7\InstallPath"
set VALUE_NAME=""
-FOR /F "usebackq skip=2 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v
%VALUE_NAME% 2^>nul`) DO (
+FOR /F "usebackq skip=2 tokens=1,2,*" %%A IN (`REG QUERY %KEY_NAME% /v
%VALUE_NAME% 2^>nul`) DO (
set ValueName=%%A
set ValueType=%%B
set ValueValue=%%C
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3009,17 +3009,22 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
Srvr.extend(['--set', 'embedded_r=yes'])
savepath = None
- savepypath = None
- savepyhome = None
+ savepypath = os.environ.get('PYTHONPATH')
+ savepyhome = os.environ.get('PYTHONHOME')
if (COND != None and "HAVE_LIBPY3" in COND) and
CONDITIONALS['HAVE_LIBPY3']:
# enable Python 3 integration in server
if winreg is not None:
+ if env['TST_BITS'] == '32bit':
+ if sys.maxsize > 2**32:
+ regkey =
r'SOFTWARE\Wow6432Node\Python\PythonCore\3.7-32\InstallPath'
+ else:
+ regkey =
r'SOFTWARE\Python\PythonCore\3.7-32\InstallPath'
+ else:
+ regkey = r'SOFTWARE\Python\PythonCore\3.7\InstallPath'
try:
- with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
r'SOFTWARE\Python\PythonCore\3.7\InstallPath') as key:
+ with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, regkey)
as key:
instpath = winreg.QueryValue(key, None)
- savepyhome = os.environ.get('PYTHONHOME')
os.environ['PYTHONHOME'] = instpath
- savepypath = os.environ.get('PYTHONPATH')
os.environ['PYTHONPATH'] = instpath + 'Lib'
savepath = os.environ['PATH']
os.environ['PATH'] = instpath.rstrip('\\') +
os.pathsep + savepath
@@ -3029,12 +3034,14 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
elif (not all_tests or (COND != None and "HAVE_LIBPY" in COND))
and CONDITIONALS['HAVE_LIBPY']:
# enable Python integration in server
if winreg is not None:
+ if env['TST_BITS'] == '32bit' and sys.maxsize > 2**32:
+ regkey =
r'SOFTWARE\Wow6432Node\Python\PythonCore\2.7\InstallPath'
+ else:
+ regkey = r'SOFTWARE\Python\PythonCore\2.7\InstallPath'
try:
- with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
r'SOFTWARE\Python\PythonCore\2.7\InstallPath') as key:
+ with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, regkey)
as key:
instpath = winreg.QueryValue(key, None)
- savepyhome = os.environ.get('PYTHONHOME')
os.environ['PYTHONHOME'] = instpath
- savepypath = os.environ.get('PYTHONPATH')
os.environ['PYTHONPATH'] = instpath + 'Lib'
savepath = os.environ['PATH']
os.environ['PATH'] = instpath.rstrip('\\') +
os.pathsep + savepath
diff --git a/tools/merovingian/daemon/forkmserver.c
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -476,7 +476,7 @@ forkMserver(char *database, sabdb** stat
kv = findConfKey(ckv, "embedpy");
if (kv->val != NULL && strcmp(kv->val, "no") != 0)
- embeddedpy = "embedded_py=true";
+ embeddedpy = "embedded_py=2";
kv = findConfKey(ckv, "embedpy3");
if (kv->val != NULL && strcmp(kv->val, "no") != 0) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
