commit 46877ad0d0d81461a54b76b9a62bc7ce66427856
author Achuith Bhandarkar <achuith@chromium.org> Thu Sep 26 15:54:02 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Oct 02 02:50:19 2019 +0000
tree 1af36820c5b1a41af7ed388197d81a0ec2ce38b9
parent 0b4843bcac17fb64673a5fe7578ace0bb8cc3003

downloader: Fix lint errors.

Also get rid of mox.

BUG=chromium:403086
TEST=unittests, cros flash

Change-Id: I39072ebfae90f16894701303cc6ba132428ddc1b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/1827369
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

downloader.py

diff --git a/downloader.py b/downloader.py
old mode 100755
new mode 100644
index 8afdda9..4138b09
--- a/downloader.py
+++ b/downloader.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 # Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -18,6 +17,15 @@
 import threading
 from datetime import datetime
 
+try:
+  import android_build
+except ImportError:
+  # Ignore android_build import failure. This is to support devserver running
+  # inside a ChromeOS device triggered by cros flash. Most ChromeOS test images
+  # do not have google-api-python-client module and they don't need to support
+  # Android updating, therefore, ignore the import failure here.
+  android_build = None
+
 import build_artifact
 import common_util
 import log_util
@@ -27,19 +35,9 @@
 
 try:
   from chromite.lib import gs
-except ImportError as e:
+except ImportError:
   gs = None
 
-try:
-  import android_build
-except ImportError as e:
-  # Ignore android_build import failure. This is to support devserver running
-  # inside a ChromeOS device triggered by cros flash. Most ChromeOS test images
-  # do not have google-api-python-client module and they don't need to support
-  # Android updating, therefore, ignore the import failure here.
-  android_build = None
-
-
 class DownloaderException(Exception):
   """Exception that aggregates all exceptions raised during async download.
 
@@ -107,7 +105,7 @@
   def TouchTimestampForStaged(directory_path):
     file_name = os.path.join(directory_path, Downloader._TIMESTAMP_FILENAME)
     # Easiest python version of |touch file_name|
-    with file(file_name, 'a'):
+    with open(file_name, 'a'):
       os.utime(file_name, None)
 
   @staticmethod