From 676a85b30d8ac113aa9801c78963e95360cebab6 Mon Sep 17 00:00:00 2001
From: Sean Pedigo <seanpedigo@gmail.com>
Date: Wed, 17 Aug 2022 20:53:47 +0000
Subject: [PATCH] Bug 1751990 - Removed usages of six underneath toolkit
 directory r=firefox-build-system-reviewers,glandium

Depends on D152463

Differential Revision: https://phabricator.services.mozilla.com/D137058
---
 .../featuregates/gen_feature_definitions.py           |  1 -
 toolkit/locales/generate_update_locale.py             |  3 ---
 toolkit/mozapps/installer/find-dupes.py               | 11 ++++-------
 toolkit/mozapps/installer/packager.py                 |  7 +++----
 toolkit/mozapps/installer/unify.py                    |  3 +--
 .../installer/windows/nsis/preprocess-locale.py       |  1 -
 6 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/toolkit/components/featuregates/gen_feature_definitions.py b/toolkit/components/featuregates/gen_feature_definitions.py
index b778f4d83364..8c7f32f92840 100755
--- a/toolkit/components/featuregates/gen_feature_definitions.py
+++ b/toolkit/components/featuregates/gen_feature_definitions.py
@@ -7,7 +7,6 @@ import json
 import pytoml
 import re
 import sys
-
 import voluptuous
 import voluptuous.humanize
 from voluptuous import Schema, Optional, Any, All, Required, Length, Range, Msg, Match
diff --git a/toolkit/locales/generate_update_locale.py b/toolkit/locales/generate_update_locale.py
index b1f243f5b378..af00cef8c9da 100644
--- a/toolkit/locales/generate_update_locale.py
+++ b/toolkit/locales/generate_update_locale.py
@@ -6,11 +6,8 @@
 
 from __future__ import unicode_literals, print_function
 
-import six
-
 
 def main(output, locale=None):
     assert locale is not None
     # update.locale is a trivial file but let's be unicode aware anyway.
-    locale = six.ensure_text(locale)
     print(locale, file=output)
diff --git a/toolkit/mozapps/installer/find-dupes.py b/toolkit/mozapps/installer/find-dupes.py
index c0c06408e129..7c865079caed 100644
--- a/toolkit/mozapps/installer/find-dupes.py
+++ b/toolkit/mozapps/installer/find-dupes.py
@@ -6,16 +6,13 @@ from __future__ import absolute_import, unicode_literals, print_function
 
 import sys
 import hashlib
-import re
-import os
 import functools
 from mozbuild.preprocessor import Preprocessor
 from mozbuild.util import DefinesAction
 from mozpack.packager.unpack import UnpackFinder
 from mozpack.files import DeflatedFile
 from collections import OrderedDict
-import six
-from six import StringIO
+from io import StringIO
 import argparse
 import buildconfig
 
@@ -58,8 +55,8 @@ def find_dupes(source, allowed_dupes, bail=True):
         checksum = hashlib.sha1()
         content_size = 0
         for buf in iter(functools.partial(f.open().read, chunk_size), b""):
-            checksum.update(six.ensure_binary(buf))
-            content_size += len(six.ensure_binary(buf))
+            checksum.update(buf)
+            content_size += len(buf)
         m = checksum.digest()
         if m not in checksums:
             if isinstance(f, DeflatedFile):
@@ -73,7 +70,7 @@ def find_dupes(source, allowed_dupes, bail=True):
     num_dupes = 0
     unexpected_dupes = []
     for m, (size, compressed, paths) in sorted(
-        six.iteritems(checksums), key=lambda x: x[1][1]
+        checksums.items(), key=lambda x: x[1][1]
     ):
         if len(paths) > 1:
             _compressed = " (%d compressed)" % compressed if compressed != size else ""
diff --git a/toolkit/mozapps/installer/packager.py b/toolkit/mozapps/installer/packager.py
index 0a1d6a4b7190..ec8d2de343c2 100644
--- a/toolkit/mozapps/installer/packager.py
+++ b/toolkit/mozapps/installer/packager.py
@@ -33,8 +33,7 @@ from collections import OrderedDict
 from createprecomplete import generate_precomplete
 import os
 import plistlib
-import six
-from six import StringIO
+from io import StringIO
 import subprocess
 
 
@@ -58,7 +57,7 @@ class RemovedFiles(GeneratedFile):
 
     def __init__(self, copier):
         self.copier = copier
-        GeneratedFile.__init__(self, b"")
+        GeneratedFile.__init__(self, "")
 
     def handle_line(self, f):
         f = f.strip()
@@ -66,7 +65,7 @@ class RemovedFiles(GeneratedFile):
             return
         if self.copier.contains(f):
             errors.error("Removal of packaged file(s): %s" % f)
-        self.content += six.ensure_binary(f) + b"\n"
+        self.content = f + "\n"
 
 
 def split_define(define):
diff --git a/toolkit/mozapps/installer/unify.py b/toolkit/mozapps/installer/unify.py
index 4afd9a8c0a64..8b93a8dcea52 100644
--- a/toolkit/mozapps/installer/unify.py
+++ b/toolkit/mozapps/installer/unify.py
@@ -4,7 +4,6 @@
 
 import argparse
 import os
-import six
 import buildconfig
 from mozpack.packager.formats import (
     FlatFormatter,
@@ -67,7 +66,7 @@ def main():
         packager.close()
 
         # Transplant jar preloading information.
-        for path, log in six.iteritems(app1_finder.jarlogs):
+        for path, log in app1_finder.jarlogs.items():
             assert isinstance(copier[path], Jarrer)
             copier[path].preload(log)
 
diff --git a/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py b/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py
index 089f712c3893..640ec5856439 100644
--- a/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py
+++ b/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py
@@ -14,7 +14,6 @@
 from codecs import BOM_UTF16_LE
 import io
 from os.path import join, isfile
-import six
 import sys
 from optparse import OptionParser