Update scripts for Py3 compatibility.

H-uru · May 18, 2020 · 1324efc · 1324efc
1 parent 178e44d
commit 1324efc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Sources/Plasma/Apps/plClient/external/create_resource_dat.py b/Sources/Plasma/Apps/plClient/external/create_resource_dat.py
@@ -75,7 +75,7 @@ def create_resource_dat(resfilepath, inrespath):
 		datFile.write(struct.pack("<I",len(resourceList)))
 		for res in resourceList:
 			with open(res, "rb") as resFile:
-				name = os.path.basename(res)
+				name = os.path.basename(res).encode("utf-8")
 				datFile.write(struct.pack("<I", len(name)))
 				datFile.write(name)
 				datFile.write(struct.pack("<I", os.path.getsize(res)))

diff --git a/cmake/FindPythonModule.cmake b/cmake/FindPythonModule.cmake
@@ -14,7 +14,7 @@ function(find_python_module module)
 		# A module's location is usually a directory, but for binary modules
 		# it's a .so file.
 		execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"
-			"import re, ${module}; print re.compile('/__init__.py.*').sub('',${module}.__file__)"
+			"import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))"
 			RESULT_VARIABLE _${module}_status
 			OUTPUT_VARIABLE _${module}_location
 			ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)