autoupdate: fix linter errors
BUG=chromium:1003986
TEST=./autoupdate_unittest.py
TEST=./devserver_integration_test.py
Change-Id: Ie1f16b82bdeaa9aab6ebaeee20be2be7ada95013
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/1838131
Tested-by: Amin Hassani <ahassani@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/autoupdate.py b/autoupdate.py
index 56cb859..f3109e5 100644
--- a/autoupdate.py
+++ b/autoupdate.py
@@ -12,9 +12,10 @@
import os
import threading
import time
-import urlparse
-import cherrypy
+from six.moves import urllib
+
+import cherrypy # pylint: disable=import-error
import build_util
import common_util
@@ -43,7 +44,7 @@
def _ChangeUrlPort(url, new_port):
"""Return the URL passed in with a different port"""
- scheme, netloc, path, query, fragment = urlparse.urlsplit(url)
+ scheme, netloc, path, query, fragment = urllib.parse.urlsplit(url)
host_port = netloc.split(':')
if len(host_port) == 1:
@@ -54,11 +55,12 @@
print(host_port)
netloc = '%s:%s' % tuple(host_port)
- return urlparse.urlunsplit((scheme, netloc, path, query, fragment))
+ # pylint: disable=too-many-function-args
+ return urllib.parse.urlunsplit((scheme, netloc, path, query, fragment))
def _NonePathJoin(*args):
"""os.path.join that filters None's from the argument list."""
- return os.path.join(*filter(None, args))
+ return os.path.join(*[x for x in args if x is not None])
class HostInfo(object):