From ae824fb2fc2770c84cc34c1956e4c76c8c972860 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 20 Oct 2023 23:32:40 +0545 Subject: cleanup: convert exceptions to OSError 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 Commit-Queue: Mike Frysinger Tested-by: Mike Frysinger --- repo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'repo') diff --git a/repo b/repo index 6b39f227..a9ae4fa7 100755 --- a/repo +++ b/repo @@ -627,7 +627,7 @@ def get_gitc_manifest_dir(): match = re.match("gitc_dir=(?P.*)", line) if match: _gitc_manifest_dir = match.group("gitc_manifest_dir") - except IOError: + except OSError: pass return _gitc_manifest_dir @@ -1277,7 +1277,7 @@ class Requirements: try: with open(path, "rb") as f: data = f.read() - except EnvironmentError: + except OSError: # NB: EnvironmentError is used for Python 2 & 3 compatibility. # If we couldn't open the file, assume it's an old source tree. return None -- cgit v1.2.3-54-g00ecf