From 629749b2573684dc8596445c4ae88b619aa77f8f Mon Sep 17 00:00:00 2001 From: Noemi Erli Date: Fri, 15 Jun 2018 23:55:02 +0300 Subject: [PATCH] Backed out changeset 44827df784b2 (bug 1468328) for bustages on builds/worker/workspace/build/src/python/mozbuild/mozpack/chrome/manifest.py on a CLOSED TREE --- python/mozbuild/mozbuild/codecoverage/manifest_handler.py | 6 +----- python/mozbuild/mozpack/chrome/manifest.py | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/python/mozbuild/mozbuild/codecoverage/manifest_handler.py b/python/mozbuild/mozbuild/codecoverage/manifest_handler.py index 1c49bb147855..a061fc2493f0 100644 --- a/python/mozbuild/mozbuild/codecoverage/manifest_handler.py +++ b/python/mozbuild/mozbuild/codecoverage/manifest_handler.py @@ -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, diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py index fa8e73544699..c91b99cf1d59 100644 --- a/python/mozbuild/mozpack/chrome/manifest.py +++ b/python/mozbuild/mozpack/chrome/manifest.py @@ -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