android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2025-06-26 20:17:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: convert exceptions to OSError

Browse Source 
In Python 3, these exceptions were merged into OSError, so switch
everything over to that.

Change-Id: If876a28b692de5aa5c62a3bdc8c000793ce52c63
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/390376
Reviewed-by: Aravind Vasudevan <aravindvasudev@google.com>
Commit-Queue: Mike Frysinger <vapier@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Jason R. Coombs
2023-10-20 23:32:40 +05:45
committed by LUCI
parent 034950b9ee
commit ae824fb2fc
7 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
subcmds/sync.py
View File

@ -21,7 +21,6 @@ import multiprocessing
import netrc
import optparse
import os
import socket
import sys
import tempfile
import time
@ -1376,7 +1375,7 @@ later is required to fix a server side protocol bug.
else:
try:
info = netrc.netrc()
except IOError:
except OSError:
# .netrc file does not exist or could not be opened.
pass
else:
@ -1435,7 +1434,7 @@ later is required to fix a server side protocol bug.
try:
with open(smart_sync_manifest_path, "w") as f:
f.write(manifest_str)
except IOError as e:
except OSError as e:
raise SmartSyncError(
"error: cannot write manifest to %s:\n%s"
% (smart_sync_manifest_path, e),
@ -1446,7 +1445,7 @@ later is required to fix a server side protocol bug.
raise SmartSyncError(
"error: manifest server RPC call failed: %s" % manifest_str
)
except (socket.error, IOError, xmlrpc.client.Fault) as e:
except (OSError, xmlrpc.client.Fault) as e:
raise SmartSyncError(
"error: cannot connect to manifest server %s:\n%s"
% (manifest.manifest_server, e),
@ -1931,7 +1930,7 @@ class _FetchTimes:
try:
with open(self._path) as f:
self._saved = json.load(f)
except (IOError, ValueError):
except (OSError, ValueError):
platform_utils.remove(self._path, missing_ok=True)
self._saved = {}
@ -1947,7 +1946,7 @@ class _FetchTimes:
try:
with open(self._path, "w") as f:
json.dump(self._seen, f, indent=2)
except (IOError, TypeError):
except (OSError, TypeError):
platform_utils.remove(self._path, missing_ok=True)
@ -1994,7 +1993,7 @@ class LocalSyncState:
try:
with open(self._path) as f:
self._state = json.load(f)
except (IOError, ValueError):
except (OSError, ValueError):
platform_utils.remove(self._path, missing_ok=True)
self._state = {}
@ -2004,7 +2003,7 @@ class LocalSyncState:
try:
with open(self._path, "w") as f:
json.dump(self._state, f, indent=2)
except (IOError, TypeError):
except (OSError, TypeError):
platform_utils.remove(self._path, missing_ok=True)
def PruneRemovedProjects(self):
@ -2137,7 +2136,7 @@ class PersistentTransport(xmlrpc.client.Transport):
try:
p.feed(data)
except xml.parsers.expat.ExpatError as e:
raise IOError(
raise OSError(
f"Parsing the manifest failed: {e}\n"
f"Please report this to your manifest server admin.\n"
f'Here is the full response:\n{data.decode("utf-8")}'