commit e852b077f0b67202a8b2fbd492bd5eb0e7a63f85
author Mike Frysinger <vapier@chromium.org> Fri May 21 12:39:03 2021 -0400
committer Commit Bot <commit-bot@chromium.org> Sat May 22 21:38:17 2021 +0000
tree 89aef4a8b46a04a59f952f76b0b9ae7e3ed02475
parent 8c20cca5cb2e34e4e72e504e5933acf92934a9b9

clean up usage of the six module

Now that we only support Python 3, we can drop all six usage.

BUG=b:187789302
TEST=CQ passes

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

scripts/upload_symbols.py

diff --git a/scripts/upload_symbols.py b/scripts/upload_symbols.py
index bb803b3..a00006b 100644
--- a/scripts/upload_symbols.py
+++ b/scripts/upload_symbols.py
@@ -9,6 +9,7 @@
 for those executables involved).
 """
 
+import http.client
 import itertools
 import json
 import os
@@ -17,9 +18,7 @@
 import tempfile
 import textwrap
 import time
-
-from six.moves import http_client as httplib
-from six.moves import urllib
+import urllib.parse
 
 from chromite.lib import cache
 from chromite.lib import commandline
@@ -435,7 +434,7 @@
         def ShouldRetryUpload(exception):
           if isinstance(exception, (requests.exceptions.RequestException,
                                     IOError,
-                                    httplib.HTTPException, socket.error)):
+                                    http.client.HTTPException, socket.error)):
             logging.info('Request failed, retrying: %s', exception)
             return True
           return False
@@ -456,7 +455,7 @@
                         s.display_name, e)
         s.status = SymbolFile.ERROR
         failures += 1
-      except (httplib.HTTPException, OSError) as e:
+      except (http.client.HTTPException, OSError) as e:
         logging.warning('could not upload: %s: %s %s', s.display_name,
                         type(e).__name__, e)
         s.status = SymbolFile.ERROR