diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py index 2e3a6bd046fd..a578ff5bd2a0 100644 --- a/python/mozbuild/mozpack/chrome/manifest.py +++ b/python/mozbuild/mozpack/chrome/manifest.py @@ -7,14 +7,10 @@ from __future__ import absolute_import, print_function, unicode_literals import re import os -try: - from urlparse import urlparse -except ImportError: - from urllib.parse import urlparse - import mozpack.path as mozpath from mozpack.chrome.flags import Flags from mozpack.errors import errors +from six.moves.urllib.parse import urlparse class ManifestEntry(object): diff --git a/python/mozbuild/mozpack/packager/formats.py b/python/mozbuild/mozpack/packager/formats.py index 8b998bb97e12..6ae684f99c30 100644 --- a/python/mozbuild/mozpack/packager/formats.py +++ b/python/mozbuild/mozpack/packager/formats.py @@ -13,7 +13,7 @@ from mozpack.chrome.manifest import ( ManifestMultiContent, ) from mozpack.errors import errors -from urlparse import urlparse +from six.moves.urllib.parse import urlparse import mozpack.path as mozpath from mozpack.files import ManifestFile from mozpack.copier import ( diff --git a/python/mozbuild/mozpack/packager/unpack.py b/python/mozbuild/mozpack/packager/unpack.py index 197f3a1e4bcd..d1b65372ee33 100644 --- a/python/mozbuild/mozpack/packager/unpack.py +++ b/python/mozbuild/mozpack/packager/unpack.py @@ -24,7 +24,7 @@ from mozpack.copier import ( ) from mozpack.packager import SimplePackager from mozpack.packager.formats import FlatFormatter -from urlparse import urlparse +from six.moves.urllib.parse import urlparse class UnpackFinder(BaseFinder):