Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge python EnvironmentError, IOError and WindowsError into OSError.

Browse Source
This commit is contained in:
Marcel Admiraal 2020-09-02 15:58:07 +01:00
parent 39228830ce
commit cba4a93a34
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
methods.py
View File

@ -185,7 +185,7 @@ def write_modules(module_list):
unregister_cpp += "#ifdef MODULE_" + name.upper() + "_ENABLED\n" unregister_cpp += "#ifdef MODULE_" + name.upper() + "_ENABLED\n"
unregister_cpp += "\tunregister_" + name + "_types();\n" unregister_cpp += "\tunregister_" + name + "_types();\n"
unregister_cpp += "#endif\n" unregister_cpp += "#endif\n"
except IOError: except OSError:
pass pass
modules_cpp = """// register_module_types.gen.cpp modules_cpp = """// register_module_types.gen.cpp
@ -522,7 +522,7 @@ def generate_cpp_hint_file(filename):
try: try:
with open(filename, "w") as fd: with open(filename, "w") as fd:
fd.write("#define GDCLASS(m_class, m_inherits)\n") fd.write("#define GDCLASS(m_class, m_inherits)\n")
except IOError: except OSError:
print("Could not write cpp.hint file.") print("Could not write cpp.hint file.")

10
modules/mono/build_scripts/mono_reg_utils.py
View File

@ -9,7 +9,7 @@ if os.name == "nt":
def _reg_open_key(key, subkey): def _reg_open_key(key, subkey):
try: try:
return winreg.OpenKey(key, subkey) return winreg.OpenKey(key, subkey)
except (WindowsError, OSError): except OSError:
if platform.architecture()[0] == "32bit": if platform.architecture()[0] == "32bit":
bitness_sam = winreg.KEY_WOW64_64KEY bitness_sam = winreg.KEY_WOW64_64KEY
else: else:
@ -37,7 +37,7 @@ def _find_mono_in_reg(subkey, bits):
with _reg_open_key_bits(winreg.HKEY_LOCAL_MACHINE, subkey, bits) as hKey: with _reg_open_key_bits(winreg.HKEY_LOCAL_MACHINE, subkey, bits) as hKey:
value = winreg.QueryValueEx(hKey, "SdkInstallRoot")[0] value = winreg.QueryValueEx(hKey, "SdkInstallRoot")[0]
return value return value
except (WindowsError, OSError): except OSError:
return None return None
@ -48,7 +48,7 @@ def _find_mono_in_reg_old(subkey, bits):
if default_clr: if default_clr:
return _find_mono_in_reg(subkey + "\\" + default_clr, bits) return _find_mono_in_reg(subkey + "\\" + default_clr, bits)
return None return None
except (WindowsError, EnvironmentError): except OSError:
return None return None
@ -97,7 +97,7 @@ def find_msbuild_tools_path_reg():
raise ValueError("Cannot find `installationPath` entry") raise ValueError("Cannot find `installationPath` entry")
except ValueError as e: except ValueError as e:
print("Error reading output from vswhere: " + e.message) print("Error reading output from vswhere: " + e.message)
except WindowsError: except OSError:
pass # Fine, vswhere not found pass # Fine, vswhere not found
except (subprocess.CalledProcessError, OSError): except (subprocess.CalledProcessError, OSError):
pass pass
@ -109,5 +109,5 @@ def find_msbuild_tools_path_reg():
with _reg_open_key(winreg.HKEY_LOCAL_MACHINE, subkey) as hKey: with _reg_open_key(winreg.HKEY_LOCAL_MACHINE, subkey) as hKey:
value = winreg.QueryValueEx(hKey, "MSBuildToolsPath")[0] value = winreg.QueryValueEx(hKey, "MSBuildToolsPath")[0]
return value return value
except (WindowsError, OSError): except OSError:
return "" return ""

2
platform_methods.py
View File

@ -55,7 +55,7 @@ def run_in_subprocess(builder_function):
finally: finally:
try: try:
os.remove(json_path) os.remove(json_path)
except (OSError, IOError) as e: except OSError as e:
# Do not fail the entire build if it cannot delete a temporary file # Do not fail the entire build if it cannot delete a temporary file
print( print(
"WARNING: Could not delete temporary file: path=%r; [%s] %s" % (json_path, e.__class__.__name__, e) "WARNING: Could not delete temporary file: path=%r; [%s] %s" % (json_path, e.__class__.__name__, e)