You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-07 12:30:27 +00:00
Merge python EnvironmentError, IOError and WindowsError into OSError.
This commit is contained in:
@@ -9,7 +9,7 @@ if os.name == "nt":
|
||||
def _reg_open_key(key, subkey):
|
||||
try:
|
||||
return winreg.OpenKey(key, subkey)
|
||||
except (WindowsError, OSError):
|
||||
except OSError:
|
||||
if platform.architecture()[0] == "32bit":
|
||||
bitness_sam = winreg.KEY_WOW64_64KEY
|
||||
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:
|
||||
value = winreg.QueryValueEx(hKey, "SdkInstallRoot")[0]
|
||||
return value
|
||||
except (WindowsError, OSError):
|
||||
except OSError:
|
||||
return None
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ def _find_mono_in_reg_old(subkey, bits):
|
||||
if default_clr:
|
||||
return _find_mono_in_reg(subkey + "\\" + default_clr, bits)
|
||||
return None
|
||||
except (WindowsError, EnvironmentError):
|
||||
except OSError:
|
||||
return None
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ def find_msbuild_tools_path_reg():
|
||||
raise ValueError("Cannot find `installationPath` entry")
|
||||
except ValueError as e:
|
||||
print("Error reading output from vswhere: " + e.message)
|
||||
except WindowsError:
|
||||
except OSError:
|
||||
pass # Fine, vswhere not found
|
||||
except (subprocess.CalledProcessError, OSError):
|
||||
pass
|
||||
@@ -109,5 +109,5 @@ def find_msbuild_tools_path_reg():
|
||||
with _reg_open_key(winreg.HKEY_LOCAL_MACHINE, subkey) as hKey:
|
||||
value = winreg.QueryValueEx(hKey, "MSBuildToolsPath")[0]
|
||||
return value
|
||||
except (WindowsError, OSError):
|
||||
except OSError:
|
||||
return ""
|
||||
|
||||
Reference in New Issue
Block a user