Bug 1547730 - Use six.moves for urllib.urlparse r=#build

Differential Revision: https://phabricator.services.mozilla.com/D28108

--HG--
extra : rebase_source : 33c707a33e478fb558e58c5b878f6da63b14927b
extra : intermediate-source : aa83f8790d9b9b16c756bc8311e7d57028abf487
extra : source : 8421e3222f669eae250a3b3facf8afa989ccc2c4

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):

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 (

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):