зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1714688 - Removed 'if PY3' logic from testing/mozbase r=mhentges
Python2 is no longer used in testing/mozbase Differential Revision: https://phabricator.services.mozilla.com/D118040
This commit is contained in:
Родитель
84e4f09a3f
Коммит
2241c4ace7
|
@ -17,11 +17,6 @@ import mozinfo
|
||||||
|
|
||||||
import mozunit
|
import mozunit
|
||||||
|
|
||||||
PY3 = sys.version_info[0] == 3
|
|
||||||
|
|
||||||
if PY3:
|
|
||||||
# reload() has been moved to importlib in Python 3
|
|
||||||
# see https://docs.python.org/3.5/library/importlib.html#importlib.reload
|
|
||||||
from importlib import reload
|
from importlib import reload
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ import zipfile
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from six import PY3, reraise
|
from six import reraise
|
||||||
|
|
||||||
import mozfile
|
import mozfile
|
||||||
import mozinfo
|
import mozinfo
|
||||||
|
@ -57,10 +57,8 @@ class UninstallError(Exception):
|
||||||
|
|
||||||
|
|
||||||
def _readPlist(path):
|
def _readPlist(path):
|
||||||
if PY3:
|
|
||||||
with open(path, "rb") as fp:
|
with open(path, "rb") as fp:
|
||||||
return plistlib.load(fp)
|
return plistlib.load(fp)
|
||||||
return plistlib.readPlist(path)
|
|
||||||
|
|
||||||
|
|
||||||
def get_binary(path, app_name):
|
def get_binary(path, app_name):
|
||||||
|
|
Загрузка…
Ссылка в новой задаче