From 3d8a78a06fbc62d1ae7b436808836f817dd86f95 Mon Sep 17 00:00:00 2001 From: Daniel Varga Date: Fri, 31 Jan 2020 03:30:45 +0200 Subject: [PATCH] Backed out changeset 6851f568b173 (bug 1611006) for causing nightly bustages a=backout --- python/mozbuild/mozbuild/action/buildlist.py | 10 +++------- python/mozbuild/mozbuild/action/langpack_manifest.py | 6 +++--- python/mozbuild/mozbuild/action/node.py | 5 +---- python/mozbuild/mozbuild/test/python.ini | 4 ---- python/mozbuild/mozbuild/test/python2.ini | 4 ++++ python/mozbuild/mozpack/manifests.py | 4 +--- python/mozversioncontrol/mozversioncontrol/__init__.py | 3 --- taskcluster/docker/debian-build/Dockerfile | 1 - toolkit/locales/l10n.mk | 4 ++-- 9 files changed, 14 insertions(+), 27 deletions(-) diff --git a/python/mozbuild/mozbuild/action/buildlist.py b/python/mozbuild/mozbuild/action/buildlist.py index b2b74656c17b..ab9b90bbf125 100644 --- a/python/mozbuild/mozbuild/action/buildlist.py +++ b/python/mozbuild/mozbuild/action/buildlist.py @@ -7,11 +7,10 @@ if the entry does not already exist. Usage: buildlist.py [ ...] ''' -from __future__ import absolute_import, print_function, unicode_literals +from __future__ import absolute_import, print_function import sys import os -import io from mozbuild.util import ( ensureParentDir, @@ -27,7 +26,7 @@ def addEntriesToListFile(listFile, entries): lock = lock_file(listFile + ".lck") try: if os.path.exists(listFile): - f = io.open(listFile) + f = open(listFile) existing = set(x.strip() for x in f.readlines()) f.close() else: @@ -35,10 +34,7 @@ def addEntriesToListFile(listFile, entries): for e in entries: if e not in existing: existing.add(e) - - # Manifest files are always generated with UNIX-style line-endings, even - # on Windows. - with io.open(listFile, 'w', newline='\n') as f: + with open(listFile, 'wb') as f: f.write("\n".join(sorted(existing))+"\n") finally: del lock # Explicitly release the lock_file to free it diff --git a/python/mozbuild/mozbuild/action/langpack_manifest.py b/python/mozbuild/mozbuild/action/langpack_manifest.py index 4395235913ac..6c3d9433b588 100644 --- a/python/mozbuild/mozbuild/action/langpack_manifest.py +++ b/python/mozbuild/mozbuild/action/langpack_manifest.py @@ -8,7 +8,7 @@ # the locale directory, chrome registry entries and other information # necessary to produce the complete manifest file for a language pack. ### -from __future__ import absolute_import, print_function, unicode_literals +from __future__ import absolute_import, print_function import argparse import sys @@ -380,7 +380,7 @@ def get_version_maybe_buildid(min_version): ### def create_webmanifest(locstr, min_app_ver, max_app_ver, app_name, l10n_basedir, langpack_eid, defines, chrome_entries): - locales = list(map(lambda loc: loc.strip(), locstr.split(','))) + locales = map(lambda loc: loc.strip(), locstr.split(',')) main_locale = locales[0] author = build_author_string( @@ -431,7 +431,7 @@ def create_webmanifest(locstr, min_app_ver, max_app_ver, app_name, 'chrome_resources': cr } - return json.dumps(manifest, indent=2, ensure_ascii=False) + return json.dumps(manifest, indent=2, ensure_ascii=False, encoding='utf8') def main(args): diff --git a/python/mozbuild/mozbuild/action/node.py b/python/mozbuild/mozbuild/action/node.py index 6ea15c837550..73f13ac48503 100644 --- a/python/mozbuild/mozbuild/action/node.py +++ b/python/mozbuild/mozbuild/action/node.py @@ -8,7 +8,6 @@ import buildconfig import pipes import subprocess import sys -import six SCRIPT_ALLOWLIST = [ buildconfig.topsrcdir + "/devtools/client/shared/build/build.js" @@ -72,7 +71,6 @@ def execute_node_cmd(node_cmd_list): # (intentionally or inadvertently) remove deps. Do we want this? deps = [] for line in stdout.splitlines(): - line = six.ensure_text(line) if 'dep:' in line: deps.append(line.replace('dep:', '')) else: @@ -113,8 +111,7 @@ def generate(output, node_script, *files): and building again.""", file=sys.stderr) sys.exit(1) - node_script = six.ensure_text(node_script) - if not isinstance(node_script, six.text_type): + if not isinstance(node_script, (str, unicode)): print("moz.build file didn't pass a valid node script name to execute", file=sys.stderr) sys.exit(1) diff --git a/python/mozbuild/mozbuild/test/python.ini b/python/mozbuild/mozbuild/test/python.ini index 8865934ccc7c..90e8eae2b5ba 100644 --- a/python/mozbuild/mozbuild/test/python.ini +++ b/python/mozbuild/mozbuild/test/python.ini @@ -1,10 +1,6 @@ [DEFAULT] subsuite = mozbuild -[action/test_buildlist.py] -[action/test_langpack_manifest.py] -[action/test_node.py] -[action/test_process_install_manifest.py] [configure/test_checks_configure.py] [configure/test_compile_checks.py] [configure/test_configure.py] diff --git a/python/mozbuild/mozbuild/test/python2.ini b/python/mozbuild/mozbuild/test/python2.ini index 3ba89d34779e..6623b9d7ddd3 100644 --- a/python/mozbuild/mozbuild/test/python2.ini +++ b/python/mozbuild/mozbuild/test/python2.ini @@ -2,6 +2,10 @@ subsuite = mozbuild skip-if = python == 3 +[action/test_buildlist.py] +[action/test_langpack_manifest.py] +[action/test_node.py] +[action/test_process_install_manifest.py] [analyze/test_graph.py] skip-if = (os == "win") [backend/test_build.py] diff --git a/python/mozbuild/mozpack/manifests.py b/python/mozbuild/mozpack/manifests.py index 730175772741..0c9be14121fe 100644 --- a/python/mozbuild/mozpack/manifests.py +++ b/python/mozbuild/mozpack/manifests.py @@ -128,9 +128,7 @@ class InstallManifest(object): version) for line in fileobj: - # Explicitly strip on \n so we don't strip out the FIELD_SEPARATOR - # as well. - line = line.rstrip('\n') + line = line.rstrip() fields = line.split(self.FIELD_SEPARATOR) diff --git a/python/mozversioncontrol/mozversioncontrol/__init__.py b/python/mozversioncontrol/mozversioncontrol/__init__.py index 23218e3d052a..259f5a4b2c88 100644 --- a/python/mozversioncontrol/mozversioncontrol/__init__.py +++ b/python/mozversioncontrol/mozversioncontrol/__init__.py @@ -276,9 +276,6 @@ class HgRepository(Repository): self._client = hglib.client.hgclient(self.path, encoding=b'UTF-8', configs=None, connect=False) - # Work around py3 compat issues in python-hglib - self._client._env = ensure_subprocess_env(self._client._env) - @property def name(self): return 'hg' diff --git a/taskcluster/docker/debian-build/Dockerfile b/taskcluster/docker/debian-build/Dockerfile index fa27f68c0b15..978975b5f902 100644 --- a/taskcluster/docker/debian-build/Dockerfile +++ b/taskcluster/docker/debian-build/Dockerfile @@ -7,7 +7,6 @@ VOLUME /builds/worker/workspace VOLUME /builds/worker/tooltool-cache ENV XZ_OPT=-T0 -ENV LANG=C.UTF-8 # %ARG TASKCLUSTER_ROOT_URL # %ARG DOCKER_IMAGE_PACKAGES diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk index 7bfd5cd35e74..7021da4274a3 100644 --- a/toolkit/locales/l10n.mk +++ b/toolkit/locales/l10n.mk @@ -218,8 +218,8 @@ package-langpack-%: XPI_NAME=locale-$* package-langpack-%: AB_CD=$* package-langpack-%: $(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH) - $(call py3_action,langpack_manifest,--locales $(AB_CD) --min-app-ver $(MOZ_APP_VERSION) --max-app-ver $(MOZ_APP_MAXVERSION) --app-name '$(MOZ_APP_DISPLAYNAME)' --l10n-basedir '$(L10NBASEDIR)' --defines $(LANGPACK_DEFINES) --langpack-eid '$(MOZ_LANGPACK_EID)' --input $(DIST)/xpi-stage/locale-$(AB_CD)) - $(call py3_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) -x **/*.manifest -x **/*.js -x **/*.ini $(LANGPACK_FILE) $(PKG_ZIP_DIRS) manifest.json) + $(call py_action,langpack_manifest,--locales $(AB_CD) --min-app-ver $(MOZ_APP_VERSION) --max-app-ver $(MOZ_APP_MAXVERSION) --app-name '$(MOZ_APP_DISPLAYNAME)' --l10n-basedir '$(L10NBASEDIR)' --defines $(LANGPACK_DEFINES) --langpack-eid '$(MOZ_LANGPACK_EID)' --input $(DIST)/xpi-stage/locale-$(AB_CD)) + $(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) -x **/*.manifest -x **/*.js -x **/*.ini $(LANGPACK_FILE) $(PKG_ZIP_DIRS) manifest.json) # This variable is to allow the wget-en-US target to know which ftp server to download from ifndef EN_US_BINARY_URL