NVDA helper and watchdog/Python 3: with file -> with open function. Re …

…nvaccess#9038.
josephsl · Jun 4, 2019 · 8076c2b · 8076c2b
1 parent 35f7975
commit 8076c2b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/source/NVDAHelper.py b/source/NVDAHelper.py
@@ -412,7 +412,8 @@ def __init__(self):
 		pipeRead = self._duplicateAsInheritable(pipeReadOrig)
 		winKernel.closeHandle(pipeReadOrig)
 		# stdout/stderr of the loader process should go to nul.
-		with file("nul", "w") as nul:
+		# #9038 (Py3 review required): File() function is gone, replaced by open().
+		with open("nul", "w") as nul:
 			nulHandle = self._duplicateAsInheritable(msvcrt.get_osfhandle(nul.fileno()))
 		# Set the process to start with the appropriate std* handles.
 		si = winKernel.STARTUPINFO(dwFlags=winKernel.STARTF_USESTDHANDLES, hSTDInput=pipeRead, hSTDOutput=nulHandle, hSTDError=nulHandle)

diff --git a/source/watchdog.py b/source/watchdog.py
@@ -156,7 +156,8 @@ def _crashHandler(exceptionInfo):
 	# Write a minidump.
 	dumpPath = os.path.abspath(os.path.join(globalVars.appArgs.logFileName, "..", "nvda_crash.dmp"))
 	try:
-		with file(dumpPath, "w") as mdf:
+		# #9038 (Py3 review required): file() function is gone, replaced by open().
+		with open(dumpPath, "w") as mdf:
 			mdExc = MINIDUMP_EXCEPTION_INFORMATION(ThreadId=threadId,
 				ExceptionPointers=exceptionInfo, ClientPointers=False)
 			if not ctypes.windll.DbgHelp.MiniDumpWriteDump(