migrate to python3 (#114)

bclary · Apr 28, 2020 · 4d1bf92 · 4d1bf92
1 parent 74be359
commit 4d1bf92
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 21 deletions.
diff --git a/bin/device_group_report b/bin/device_group_report
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import sys

diff --git a/bin/start_android_hardware_testing.sh b/bin/start_android_hardware_testing.sh
@@ -3,4 +3,4 @@
 . /etc/bitbar/bitbar.env
 . /home/bitbar/mozilla-bitbar-devicepool/venv/bin/activate
 export PYTHONPATH=/home/bitbar/mozilla-bitbar-devicepool
-python /home/bitbar/mozilla-bitbar-devicepool/mozilla_bitbar_devicepool/main.py start-test-run-manager --update-bitbar
+python3 /home/bitbar/mozilla-bitbar-devicepool/mozilla_bitbar_devicepool/main.py start-test-run-manager --update-bitbar
diff --git a/mozilla_bitbar_devicepool/__init__.py b/mozilla_bitbar_devicepool/__init__.py
@@ -5,8 +5,6 @@
 # mozilla_bitbar_devicepool
 # https://mozilla.testdroid.com/cloud/swagger-ui.html
 
-from __future__ import absolute_import
-
 # we need to run basicConfig before any other module does
 import logging
 
@@ -15,7 +13,7 @@
 
 import copy
 import os
-import urlparse
+import urllib.parse
 import requests
 from testdroid import Testdroid
 
@@ -104,7 +102,7 @@ def download_file(url, dest, max_attempts=3):
     :max_attempts: integer number of times to attempt download.
                    Defaults to 3.
     """
-    parse_result = urlparse.urlparse(url)
+    parse_result = urllib.parse.urlparse(url)
     if not parse_result.scheme or parse_result.scheme.startswith('file'):
         local_file = open(parse_result.path)
         with local_file:

diff --git a/mozilla_bitbar_devicepool/configuration.py b/mozilla_bitbar_devicepool/configuration.py
@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import
-
 import os
 import threading
 import time

diff --git a/mozilla_bitbar_devicepool/device_groups.py b/mozilla_bitbar_devicepool/device_groups.py
@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import
-
 from mozilla_bitbar_devicepool import (
     TESTDROID,
     get_filter,

diff --git a/mozilla_bitbar_devicepool/devices.py b/mozilla_bitbar_devicepool/devices.py
@@ -2,7 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import
 
 from mozilla_bitbar_devicepool import (
     TESTDROID,

diff --git a/mozilla_bitbar_devicepool/files.py b/mozilla_bitbar_devicepool/files.py
@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import
-
 from mozilla_bitbar_devicepool import (
     TESTDROID,
     get_filter,

diff --git a/mozilla_bitbar_devicepool/frameworks.py b/mozilla_bitbar_devicepool/frameworks.py
@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import
-
 from mozilla_bitbar_devicepool import (
     TESTDROID,
     get_filter,

diff --git a/mozilla_bitbar_devicepool/main.py b/mozilla_bitbar_devicepool/main.py
@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import
-
 import argparse
 import os
 import sys

diff --git a/mozilla_bitbar_devicepool/projects.py b/mozilla_bitbar_devicepool/projects.py
@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import
-
 from mozilla_bitbar_devicepool import (
     TESTDROID,
     get_filter,

diff --git a/mozilla_bitbar_devicepool/runs.py b/mozilla_bitbar_devicepool/runs.py
@@ -2,8 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from __future__ import absolute_import
-
 import json
 
 from mozilla_bitbar_devicepool import (