Merge branch 'release/jakarta' into build/jakarta/2020.330

Author: gempa-jabe

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Jakarta
 
+## Release 2020.330 patch1
+
+* cmake
+
+  * Port FindNumpy macro to Python3
+
+* scbulletin, scdumpobject
+
+  * Fix crash at start
+
 ## Release 2020.330
 
 ```SC_API_VERSION 13.0.0```

Modules/FindNumpy.cmake

@@ -5,19 +5,19 @@
 # PYTHON_NUMPY_INCLUDE_DIR  - directory where the arrayobject.h header file can be found
 
 IF(PYTHON_EXECUTABLE)
-    FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/det_npp.py "try: import numpy; print numpy.get_include()\nexcept: pass\n")
-    EXEC_PROGRAM("${PYTHON_EXECUTABLE}"
-	ARGS "\"${CMAKE_CURRENT_BINARY_DIR}/det_npp.py\""
-	OUTPUT_VARIABLE NUMPY_PATH
-    )
-    FILE(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/det_npp.py)
+	FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/det_npp.py "from __future__ import print_function\ntry: import numpy; print(numpy.get_include())\nexcept: pass\n")
+	EXEC_PROGRAM("${PYTHON_EXECUTABLE}"
+		ARGS "\"${CMAKE_CURRENT_BINARY_DIR}/det_npp.py\""
+		OUTPUT_VARIABLE NUMPY_PATH
+	)
+	FILE(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/det_npp.py)
 ENDIF(PYTHON_EXECUTABLE)
 
 FIND_PATH(PYTHON_NUMPY_INCLUDE_DIR numpy/arrayobject.h
-  "${NUMPY_PATH}/"
-  DOC "Directory where the numpy/arrayobject.h header file can be found. This file is part of the numpy package"
+	"${NUMPY_PATH}/"
+	DOC "Directory where the numpy/arrayobject.h header file can be found. This file is part of the numpy package"
 )
 
 IF(PYTHON_NUMPY_INCLUDE_DIR)
-    SET (PYTHON_NUMPY_FOUND 1 CACHE INTERNAL "Python numpy development package is available")
+	SET (PYTHON_NUMPY_FOUND 1 CACHE INTERNAL "Python numpy development package is available")
 ENDIF(PYTHON_NUMPY_INCLUDE_DIR)

src/trunk/apps/python/scbulletin-lib.py

@@ -1038,8 +1038,7 @@ def run(self):
 
 
 def main():
-    argv = [ bytes(a.encode()) for a in sys.argv ]
-    app = BulletinApp(len(argv), argv)
+    app = BulletinApp(len(sys.argv), sys.argv)
     return app()
 
 

src/trunk/apps/python/scdumpobject.py

@@ -6,8 +6,7 @@
 class ObjectDumper(Client.Application):
 
     def __init__(self):
-        argv = [bytes(a.encode()) for a in sys.argv]
-        Client.Application.__init__(self, len(argv), argv)
+        Client.Application.__init__(self, len(sys.argv), sys.argv)
         self.setMessagingEnabled(True)
         self.setDatabaseEnabled(True, False)
         self.setMessagingUsername("")