Backed out changeset 6851f568b173 (bug 1611006) for causing nightly bustages a=backout

python/mozbuild/mozbuild/action/buildlist.py

@@ -7,11 +7,10 @@ if the entry does not already exist.
 
 Usage: buildlist.py <filename> <entry> [<entry> ...]
 '''
-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

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

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)

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]

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]

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)
 

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'

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

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