Backed out 13 changesets (bug 1620744) for causing diffoscope failure…

…s firefox/browser/chrome/browser/content/browser/built_in_addons.json

CLOSED TREE

Backed out changeset 6beda54bcb9b (bug 1620744)
Backed out changeset a1e97f0b91ef (bug 1620744)
Backed out changeset b8faa0184d4f (bug 1620744)
Backed out changeset 3bc8fda68107 (bug 1620744)
Backed out changeset 8e95b21b2ae3 (bug 1620744)
Backed out changeset 1de09de1a802 (bug 1620744)
Backed out changeset 622a2f7414fa (bug 1620744)
Backed out changeset 3372c9ab721c (bug 1620744)
Backed out changeset 0997313a9f99 (bug 1620744)
Backed out changeset 2fa34749bbfa (bug 1620744)
Backed out changeset 6d597d2eb792 (bug 1620744)
Backed out changeset 78e78f7c7b26 (bug 1620744)
Backed out changeset 6e4d85b19f88 (bug 1620744)

Makefile.in

@@ -140,7 +140,7 @@ endif
 
 ifdef MOZ_ANDROID_FAT_AAR_ARCHITECTURES
 recurse_android-fat-aar-artifact:
-	$(call py3_action,fat_aar,\
+	$(call py_action,fat_aar,\
     $(addprefix --armeabi-v7a $(MOZ_FETCHES_DIR)/,$(MOZ_ANDROID_FAT_AAR_ARMEABI_V7A)) \
     $(addprefix --arm64-v8a $(MOZ_FETCHES_DIR)/,$(MOZ_ANDROID_FAT_AAR_ARM64_V8A)) \
     $(addprefix --x86 $(MOZ_FETCHES_DIR)/,$(MOZ_ANDROID_FAT_AAR_X86)) \
@@ -196,14 +196,14 @@ endif
 .PHONY: symbolsfullarchive
 symbolsfullarchive: prepsymbolsarchive
 	$(RM) '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'
-	$(call py3_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip' \
+	$(call py_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip' \
                                      $(abspath $(DIST)/crashreporter-symbols) \
                                      --full-archive)
 
 .PHONY: symbolsarchive
 symbolsarchive: prepsymbolsarchive
 	$(RM) '$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip'
-	$(call py3_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' \
+	$(call py_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' \
                                      $(abspath $(DIST)/crashreporter-symbols))
 
 ifdef MOZ_CRASHREPORTER
@@ -229,7 +229,7 @@ update-packaging:
 
 .PHONY: package-generated-sources
 package-generated-sources:
-	$(call py3_action,package_generated_sources,'$(DIST)/$(PKG_PATH)$(GENERATED_SOURCE_FILE_PACKAGE)')
+	$(call py_action,package_generated_sources,'$(DIST)/$(PKG_PATH)$(GENERATED_SOURCE_FILE_PACKAGE)')
 
 ifdef JS_STANDALONE
 # Delegate js-specific rules to js

browser/app/Makefile.in

@@ -56,7 +56,7 @@ endif
 # steps. See bug 1431342.
 libs:: $(srcdir)/profile/channel-prefs.js
 	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
-	$(call py3_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
+	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 

browser/installer/Makefile.in

@@ -173,7 +173,7 @@ endif
 
 package-compare::
 	cd $(DIST); find $(PKGCOMP_FIND_OPTS) '$(FINDPATH)' -type f | sort > bin-list.txt
-	$(call py3_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST)) | grep '^$(BINPATH)' | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
+	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST)) | grep '^$(BINPATH)' | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
 	-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt
 	rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
 

browser/installer/windows/Makefile.in

@@ -53,7 +53,7 @@ $(CONFIG_DIR)/setup.exe::
 	$(MKDIR) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)
-	$(call py3_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
+	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
 	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
 	  --preprocess-locale $(topsrcdir) \

build/variables.py

@@ -25,8 +25,7 @@ def buildid_header(output):
 def get_program_output(*command):
     try:
         with open(os.devnull) as stderr:
-            return subprocess.check_output(command, stderr=stderr,
-                                           universal_newlines=True)
+            return subprocess.check_output(command, stderr=stderr)
     except Exception:
         return ''
 

config/makefiles/rust.mk

@@ -297,7 +297,7 @@ ifndef MOZ_TSAN
 ifeq ($(OS_ARCH), Linux)
 ifeq (,$(rustflags_sancov))
 ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-	$(call py3_action,check_binary,--target --networking $@)
+	$(call py_action,check_binary,--target --networking $@)
 endif
 endif
 endif

config/rules.mk

@@ -474,7 +474,7 @@ ifdef MSMANIFEST_TOOL
 endif	# MSVC with manifest tool
 else # !WINNT || GNU_CC
 	$(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) $($(notdir $@)_OBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
-	$(call py3_action,check_binary,--target $@)
+	$(call py_action,check_binary,--target $@)
 endif # WINNT && !GNU_CC
 
 ifdef ENABLE_STRIP
@@ -505,7 +505,7 @@ else
 endif # HOST_CPP_PROG_LINK
 endif
 ifndef CROSS_COMPILE
-	$(call py3_action,check_binary,--host $@)
+	$(call py_action,check_binary,--host $@)
 endif
 
 #
@@ -530,7 +530,7 @@ ifdef MSMANIFEST_TOOL
 endif	# MSVC with manifest tool
 else
 	$(call EXPAND_CC_OR_CXX,$@) $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) -o $@ $($@_OBJS) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
-	$(call py3_action,check_binary,--target $@)
+	$(call py_action,check_binary,--target $@)
 endif # WINNT && !GNU_CC
 
 ifdef ENABLE_STRIP
@@ -552,7 +552,7 @@ else
 endif
 endif
 ifndef CROSS_COMPILE
-	$(call py3_action,check_binary,--host $@)
+	$(call py_action,check_binary,--host $@)
 endif
 
 $(LIBRARY): $(OBJS) $(STATIC_LIBS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
@@ -610,7 +610,7 @@ ifndef INCREMENTAL_LINKER
 	$(RM) $@
 endif
 	$(MKSHLIB) $($@_OBJS) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
-	$(call py3_action,check_binary,--target $@)
+	$(call py_action,check_binary,--target $@)
 
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 ifdef MSMANIFEST_TOOL
@@ -702,7 +702,7 @@ define syms_template
 syms:: $(2)
 $(2): $(1)
 ifdef MOZ_CRASHREPORTER
-	$$(call py3_action,dumpsymbols,$$(abspath $$<) $$(abspath $$@) $$(DUMP_SYMBOLS_FLAGS))
+	$$(call py_action,dumpsymbols,$$(abspath $$<) $$(abspath $$@) $$(DUMP_SYMBOLS_FLAGS))
 endif
 endef
 
@@ -936,7 +936,7 @@ endif
 endif
 
 libs realchrome:: $(FINAL_TARGET)/chrome
-	$(call py3_action,jar_maker,\
+	$(call py_action,jar_maker,\
 	  $(QUIET) -d $(FINAL_TARGET) \
 	  $(MAKE_JARS_FLAGS) $(DEFINES) $(ACDEFINES) \
 	  $(JAR_MANIFEST))
@@ -979,7 +979,7 @@ ifndef MOZ_DEBUG
 endif
 endif
 	@echo 'Packaging $(XPI_PKGNAME).xpi...'
-	$(call py3_action,zip,-C $(FINAL_TARGET) ../$(XPI_PKGNAME).xpi '*')
+	$(call py_action,zip,-C $(FINAL_TARGET) ../$(XPI_PKGNAME).xpi '*')
 endif
 
 # See comment above about moving this out of the tools tier.
@@ -1159,7 +1159,7 @@ PP_TARGETS_ALL_RESULTS := $(sort $(foreach tier,$(PP_TARGETS_TIERS),$(PP_TARGETS
 $(PP_TARGETS_ALL_RESULTS):
 	$(if $(filter-out $(notdir $@),$(notdir $(<:.in=))),$(error Looks like $@ has an unexpected dependency on $< which breaks PP_TARGETS))
 	$(RM) '$@'
-	$(call py3_action,preprocessor,--depend $(MDDEPDIR)/$(@F).pp $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) '$<' -o '$@')
+	$(call py_action,preprocessor,--depend $(MDDEPDIR)/$(@F).pp $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) '$<' -o '$@')
 
 $(filter %.css,$(PP_TARGETS_ALL_RESULTS)): PP_TARGET_FLAGS+=--marker %
 

layout/tools/reftest/reftest/__init__.py

@@ -6,7 +6,6 @@
 
 import os
 import re
-import six
 
 RE_COMMENT = re.compile(r'\s+#')
 RE_HTTP = re.compile(r'HTTP\((\.\.(\/\.\.)*)\)')
@@ -97,14 +96,14 @@ def add_test(file, annotations, referenced_test=None):
         if self.finder:
             lines = self.finder.get(path).read().splitlines()
         else:
-            with open(path, 'r', encoding='utf-8') as fh:
+            with open(path, 'r') as fh:
                 lines = fh.read().splitlines()
 
         urlprefix = ''
         defaults = []
         for i, line in enumerate(lines):
             lineno = i + 1
-            line = six.ensure_text(line)
+            line = line.decode('utf-8')
 
             # Entire line is a comment.
             if line.startswith('#'):

mobile/android/geckoview/src/androidTest/assets/moz.build

@@ -19,6 +19,7 @@ for addon in addons:
 
     GENERATED_FILES += [xpi]
     GENERATED_FILES[xpi].script = '../../../../../../toolkit/mozapps/extensions/test/create_xpi.py'
+    GENERATED_FILES[xpi].py2 = True
     GENERATED_FILES[xpi].inputs = [indir]
 
     TEST_HARNESS_FILES.testing.mochitest.tests.junit += ['!%s' % xpi]

moz.build

@@ -164,6 +164,7 @@ if not CONFIG['JS_STANDALONE'] or not CONFIG['MOZ_BUILD_APP']:
 
     GENERATED_FILES['buildid.h'].script = 'build/variables.py:buildid_header'
     GENERATED_FILES['source-repo.h'].script = 'build/variables.py:source_repo_header'
+    GENERATED_FILES['source-repo.h'].py2 = True
 
     DIRS += [
         'build',

mozglue/build/Makefile.in

@@ -8,7 +8,7 @@ include $(topsrcdir)/config/config.mk
 
 ifeq (WINNT,$(OS_TARGET))
 mozglue.def: $(srcdir)/mozglue.def.in $(GLOBAL_DEPS)
-	$(call py3_action,preprocessor,$(if $(MOZ_REPLACE_MALLOC),-DMOZ_REPLACE_MALLOC) $(ACDEFINES) $< -o $@)
+	$(call py_action,preprocessor,$(if $(MOZ_REPLACE_MALLOC),-DMOZ_REPLACE_MALLOC) $(ACDEFINES) $< -o $@)
 
 GARBAGE += mozglue.def
 

mozglue/dllservices/gen_dll_blocklist_defs.py

@@ -278,7 +278,9 @@ def add_list_flags(elem):
 
         # Sort the list on entry name so that the blocklist code may use
         # binary search if it so chooses.
-        return sorted(filtered_list, key=lambda e: e.get_name())
+        filtered_list.sort(key=lambda e: e.get_name())
+
+        return filtered_list
 
     @staticmethod
     def get_fd(outspec_leaf_name):
@@ -369,7 +371,11 @@ def write(self, src_file, exec_env):
 
 class PETimeStamp(object):
     def __init__(self, ts):
-        max_timestamp = (2 ** 32) - 1
+        # Since we can't specify the long literal suffix in python 3, we'll
+        # compute max_timestamp this way to ensure that it is defined as a
+        # long in python 2
+        max_timestamp = (long(2) ** 32) - 1
+        assert isinstance(max_timestamp, long)
         if ts < 0 or ts > max_timestamp:
             raise ValueError('Invalid timestamp value')
         self._value = ts
@@ -407,7 +413,7 @@ def __init__(self, *args):
             elif isinstance(args[0], PETimeStamp):
                 self._ver = args[0]
             else:
-                self._ver = int(args[0])
+                self._ver = long(args[0])
         elif len(args) == 4:
             self.validate_iterable(args)
 
@@ -427,14 +433,14 @@ def validate_iterable(self, arg):
 
     def build_long(self, args):
         self.validate_iterable(args)
-        return (int(args[0]) << 48) | (int(args[1]) << 32) | \
-            (int(args[2]) << 16) | int(args[3])
+        return (long(args[0]) << 48) | (long(args[1]) << 32) | \
+            (long(args[2]) << 16) | long(args[3])
 
     def is_timestamp(self):
         return isinstance(self._ver, PETimeStamp)
 
     def __str__(self):
-        if isinstance(self._ver, int):
+        if isinstance(self._ver, long):
             if self._ver == Version.ALL_VERSIONS:
                 return 'DllBlockInfo::ALL_VERSIONS'
 

mozglue/dllservices/moz.build

@@ -53,6 +53,7 @@ GENERATED_FILES += [
 blocklist_defs = GENERATED_FILES[blocklist_files]
 blocklist_defs.script = 'gen_dll_blocklist_defs.py:gen_blocklists'
 blocklist_defs.inputs = ['WindowsDllBlocklistDefs.in']
+blocklist_defs.py2 = True
 EXPORTS.mozilla += ['!' + hdr for hdr in blocklist_files]
 
 FINAL_LIBRARY = 'mozglue'

netwerk/dns/prepare_tlds.py

@@ -126,6 +126,8 @@ def dafsa_words():
 
   """ words_to_bin() returns a bytes while words_to_cxx() returns string """
   if output_format == "bin":
+    if sys.version_info[0] >= 3:
+      output = output.buffer
     output.write(words_to_bin(dafsa_words()))
   else:
     output.write(words_to_cxx(dafsa_words()))

netwerk/dns/tests/unit/data/moz.build

@@ -10,5 +10,6 @@ fake_remote_dafsa = GENERATED_FILES['fake_remote_dafsa.bin']
 fake_remote_dafsa.script = '../../../prepare_tlds.py'
 fake_remote_dafsa.inputs = ['fake_public_suffix_list.dat']
 fake_remote_dafsa.flags = ['bin']
+fake_remote_dafsa.py2 = True
 
 TEST_HARNESS_FILES.xpcshell.netwerk.dns.tests.unit.data += ['!fake_remote_dafsa.bin']

python/mozbuild/mozbuild/action/check_binary.py

@@ -56,7 +56,7 @@
 def get_output(*cmd):
     env = dict(os.environ)
     env[b'LC_ALL'] = b'C'
-    return subprocess.check_output(cmd, env=env, universal_newlines=True).splitlines()
+    return subprocess.check_output(cmd, env=env).splitlines()
 
 
 class Skip(RuntimeError):
@@ -86,7 +86,7 @@ def iter_symbols(binary):
     # platforms for static libraries, but its format is different for
     # Windows .obj files, so the following won't work for them, but
     # it currently doesn't matter.
-    if ty == UNKNOWN and open(binary, 'rb').read(8) == b'!<arch>\n':
+    if ty == UNKNOWN and open(binary).read(8) == '!<arch>\n':
         ty = ELF
     if ty in (ELF, MACHO):
         for line in get_output(buildconfig.substs['LLVM_OBJDUMP'], '-t',

python/mozbuild/mozbuild/action/dumpsymbols.py

@@ -80,8 +80,8 @@ def dump_symbols(target, tracking_file, count_ctors=False):
     if count_ctors:
         args.append('--count-ctors')
     print('Running: %s' % ' '.join(args))
-    out_files = subprocess.check_output(args, universal_newlines=True)
-    with open(tracking_file, 'w', encoding='utf-8', newline='\n') as fh:
+    out_files = subprocess.check_output(args)
+    with open(tracking_file, 'w') as fh:
         fh.write(out_files)
         fh.flush()
 

python/mozbuild/mozbuild/action/fat_aar.py

@@ -10,7 +10,6 @@
 from __future__ import absolute_import, unicode_literals, print_function
 
 import argparse
-import six
 import sys
 
 from collections import (
@@ -71,7 +70,7 @@ def fat_aar(distdir, aars_paths, no_process=False, no_compatibility_check=False)
                     diffs['{}!/{}'.format(path, r)][fingerprint].append(arch)
 
             else:
-                fingerprint = sha1(six.ensure_binary(fileobj.open().read())).hexdigest()
+                fingerprint = sha1(fileobj.open().read()).hexdigest()
                 # There's no need to distinguish `target.maven.zip` from `assets/omni.ja` here,
                 # since in practice they will never overlap.
                 diffs[path][fingerprint].append(arch)
@@ -100,9 +99,9 @@ def format_diffs(ds):
         return '\n'.join(sorted(
             '  {archs} -> {fingerprint}'.format(archs=', '.join(sorted(archs)),
                                                 fingerprint=fingerprint)
-            for fingerprint, archs in ds.items()))
+            for fingerprint, archs in ds.iteritems()))
 
-    for p, ds in sorted(diffs.items()):
+    for p, ds in sorted(diffs.iteritems()):
         if len(ds) <= 1:
             # Only one hash across all inputs: roll on.
             continue
@@ -114,7 +113,7 @@ def format_diffs(ds):
 
         not_allowed[p] = ds
 
-    for p, ds in not_allowed.items():
+    for p, ds in not_allowed.iteritems():
         print('Disallowed: Path "{path}" has architecture-specific versions:\n{ds_repr}'.format(
                  path=p, ds_repr=format_diffs(ds)))
 

python/mozbuild/mozbuild/action/generate_symbols_file.py

@@ -7,7 +7,7 @@
 import argparse
 import buildconfig
 import os
-from io import StringIO
+from StringIO import StringIO
 from mozbuild.preprocessor import Preprocessor
 from mozbuild.util import DefinesAction
 

python/mozbuild/mozbuild/action/process_define_files.py

@@ -63,7 +63,7 @@ def define_for_name(name, val):
                             return define
                         defines = '\n'.join(sorted(
                             define_for_name(name, val)
-                            for name, val in config.defines['ALLDEFINES'].items()))
+                            for name, val in config.defines['ALLDEFINES'].iteritems()))
                         l = l[:m.start('cmd') - 1] \
                             + defines + l[m.end('name'):]
                     elif cmd == 'define':