diff --git a/python/mozrelease/mozrelease/paths.py b/python/mozrelease/mozrelease/paths.py index b3d48c4ac7ba..9c186a7fdbb8 100644 --- a/python/mozrelease/mozrelease/paths.py +++ b/python/mozrelease/mozrelease/paths.py @@ -2,7 +2,7 @@ # 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 six.moves.urllib.parse import urlunsplit +from urllib.parse import urlunsplit product_ftp_map = { "fennec": "mobile", diff --git a/python/mozrelease/mozrelease/update_verify.py b/python/mozrelease/mozrelease/update_verify.py index 49fe21db1551..29b970e42ce4 100644 --- a/python/mozrelease/mozrelease/update_verify.py +++ b/python/mozrelease/mozrelease/update_verify.py @@ -6,8 +6,6 @@ import os import re -from six import string_types - from .chunking import getChunk @@ -187,9 +185,9 @@ class UpdateVerifyConfig(object): "Couldn't add release identified by build_id '%s' and from_path '%s': " "already exists in config" % (build_id, from_path) ) - if isinstance(locales, string_types): + if isinstance(locales, str): locales = sorted(list(locales.split())) - if isinstance(patch_types, string_types): + if isinstance(patch_types, str): patch_types = list(patch_types.split()) self.releases.append( {