mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 07:15:46 +00:00
Backed out changeset 44827df784b2 (bug 1468328) for bustages on builds/worker/workspace/build/src/python/mozbuild/mozpack/chrome/manifest.py on a CLOSED TREE
This commit is contained in:
parent
0882b7cd66
commit
629749b257
@ -3,11 +3,7 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
from collections import defaultdict
|
||||
|
||||
try:
|
||||
import urlparse
|
||||
except ImportError:
|
||||
import urllib.parse as urlparse
|
||||
import urlparse
|
||||
|
||||
from mozpack.chrome.manifest import (
|
||||
Manifest,
|
||||
|
@ -6,12 +6,7 @@ from __future__ import absolute_import
|
||||
|
||||
import re
|
||||
import os
|
||||
|
||||
try:
|
||||
import urlparse
|
||||
except ImportError:
|
||||
import urllib.parse as urlparse
|
||||
|
||||
from urlparse import urlparse
|
||||
import mozpack.path as mozpath
|
||||
from mozpack.chrome.flags import Flags
|
||||
from mozpack.errors import errors
|
||||
|
Loading…
Reference in New Issue
Block a user