Bug 1547730 - Use six.moves for urllib.urlparse r=#build
☠☠ backed out by ee4b88439111 ☠ ☠
authorJustin Wood <Callek@gmail.com>
Mon, 15 Apr 2019 16:57:21 -0400
changeset 533012 6c9f98dacbde5f8bd5a810e17ca3013812e814f2
parent 533011 3037f5bf1019d1eb730e31857e1a8d4d4216eadb
child 533013 03bdcaab1623f0b867ba989663b31477f74b6d60
push id11276
push userrgurzau@mozilla.com
push dateMon, 20 May 2019 13:11:24 +0000
treeherdermozilla-beta@847755a7c325 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1547730
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1547730 - Use six.moves for urllib.urlparse r=#build Differential Revision: https://phabricator.services.mozilla.com/D28108
python/mozbuild/mozpack/chrome/manifest.py
python/mozbuild/mozpack/packager/formats.py
python/mozbuild/mozpack/packager/unpack.py
--- a/python/mozbuild/mozpack/chrome/manifest.py
+++ b/python/mozbuild/mozpack/chrome/manifest.py
@@ -2,24 +2,20 @@
 # 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 __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):
     '''
     Base class for all manifest entry types.
     Subclasses may define the following class or member variables:
         - localized: indicates whether the manifest entry is used for localized
           data.
--- a/python/mozbuild/mozpack/packager/formats.py
+++ b/python/mozbuild/mozpack/packager/formats.py
@@ -8,17 +8,17 @@ from mozpack.chrome.manifest import (
     Manifest,
     ManifestInterfaces,
     ManifestChrome,
     ManifestBinaryComponent,
     ManifestResource,
     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 (
     FileRegistry,
     FileRegistrySubtree,
     Jarrer,
 )
 
--- a/python/mozbuild/mozpack/packager/unpack.py
+++ b/python/mozbuild/mozpack/packager/unpack.py
@@ -19,17 +19,17 @@ from mozpack.chrome.manifest import (
 )
 from mozpack.mozjar import JarReader
 from mozpack.copier import (
     FileRegistry,
     FileCopier,
 )
 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):
     '''
     Special Finder object that treats the source package directory as if it
     were in the flat chrome format, whatever chrome format it actually is in.
 
     This means that for example, paths like chrome/browser/content/... match