From 61544f0e2c8eee56a5ce354e2410e3dd2b461afd Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Tue, 10 Sep 2019 11:26:36 -0400 Subject: [PATCH] Fix paver for python 3. --- pavelib/prereqs.py | 4 ++-- pavelib/utils/test/utils.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py index aca2b025a7..345ffb73cc 100644 --- a/pavelib/prereqs.py +++ b/pavelib/prereqs.py @@ -224,7 +224,7 @@ def uninstall_python_packages(): # So that we don't constantly uninstall things, use a hash of the packages # to be uninstalled. Check it, and skip this if we're up to date. hasher = hashlib.sha1() - hasher.update(repr(PACKAGES_TO_UNINSTALL)) + hasher.update(repr(PACKAGES_TO_UNINSTALL).encode('utf-8')) expected_version = hasher.hexdigest() state_file_path = os.path.join(PREREQS_STATE_DIR, "Python_uninstall.sha1") create_prereqs_cache_dir() @@ -257,7 +257,7 @@ def uninstall_python_packages(): # Write our version. with io.open(state_file_path, "wb") as state_file: - state_file.write(expected_version) + state_file.write(expected_version.encode('utf-8')) def package_in_frozen(package_name, frozen_output): diff --git a/pavelib/utils/test/utils.py b/pavelib/utils/test/utils.py index 0e5d08961d..9f8d143d81 100644 --- a/pavelib/utils/test/utils.py +++ b/pavelib/utils/test/utils.py @@ -131,7 +131,7 @@ def check_firefox_version(): # Firefox will be run as a local process expected_firefox_ver = "Mozilla Firefox " + str(MINIMUM_FIREFOX_VERSION) - firefox_ver_string = subprocess.check_output("firefox --version", shell=True).strip() + firefox_ver_string = subprocess.check_output("firefox --version", shell=True).strip().decode('utf-8') firefox_version_regex = re.compile(r"Mozilla Firefox (\d+.\d+)") try: firefox_ver = float(firefox_version_regex.search(firefox_ver_string).group(1))