commit b32cc4724042105d8824f55bae7abd5535318571
author Mike Frysinger <vapier@chromium.org> Fri May 15 00:17:54 2020 -0400
committer Commit Bot <commit-bot@chromium.org> Fri May 15 15:59:51 2020 +0000
tree c9cc220f354da557f5f34c426feace6bb95656b1
parent 1b8d31ed6855efd3c47bb55e83db03eefd80715a

lint: collapse merged exceptions

Python 3 has merged a number of exceptions into OSError.
Newer pylint warns when both are caught.

BUG=chromium:1006448
TEST=CQ passes

Change-Id: If401991269079d6bd7a358b387928a986c5ddc37
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2203763
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/upload_symbols.py

diff --git a/scripts/upload_symbols.py b/scripts/upload_symbols.py
index 06f073a..5f3209d 100644
--- a/scripts/upload_symbols.py
+++ b/scripts/upload_symbols.py
@@ -457,7 +457,7 @@
                         s.display_name, e)
         s.status = SymbolFile.ERROR
         failures += 1
-      except (httplib.HTTPException, IOError, socket.error) as e:
+      except (httplib.HTTPException, OSError) as e:
         logging.warning('could not upload: %s: %s %s', s.display_name,
                         type(e).__name__, e)
         s.status = SymbolFile.ERROR