Bug 1714690 - Removed usages of six from components directory. r=firefox-build-system-reviewers,nalexander

Differenti Revision: https://phabricator.services.mozilla.com/D136759

Depends on D136699

Differential Revision: https://phabricator.services.mozilla.com/D152463

toolkit/components/featuregates/test/python/test_gen_feature_definitions.py

@@ -6,14 +6,8 @@ from textwrap import dedent
 
 import mozunit
 import pytoml
-import six
 import voluptuous
-
-
-if six.PY3:
-    from io import StringIO
-else:
-    from StringIO import StringIO
+from io import StringIO
 
 
 FEATURE_GATES_ROOT_PATH = path.abspath(

toolkit/components/telemetry/build_scripts/mozparsers/parse_histograms.py

@@ -11,7 +11,6 @@ import re
 import runpy
 import sys
 import atexit
-import six
 from . import shared_telemetry_utils as utils
 
 from ctypes import c_int
@@ -601,22 +600,22 @@ class Histogram:
             "low": int,
             "high": int,
             "keyed": bool,
-            "expires_in_version": six.string_types,
-            "kind": six.string_types,
-            "description": six.string_types,
-            "releaseChannelCollection": six.string_types,
+            "expires_in_version": str,
+            "kind": str,
+            "description": str,
+            "releaseChannelCollection": str,
         }
 
         # For list fields we check the items types.
         type_checked_list_fields = {
             "bug_numbers": int,
-            "alert_emails": six.string_types,
-            "labels": six.string_types,
-            "record_in_processes": six.string_types,
-            "keys": six.string_types,
-            "products": six.string_types,
-            "operating_systems": six.string_types,
-            "record_into_store": six.string_types,
+            "alert_emails": str,
+            "labels": str,
+            "record_in_processes": str,
+            "keys": str,
+            "products": str,
+            "operating_systems": str,
+            "record_into_store": str,
         }
 
         # For the server-side, where _strict_type_checks==False, we want to

toolkit/components/telemetry/build_scripts/mozparsers/parse_scalars.py

@@ -4,7 +4,6 @@
 
 import io
 import re
-import six
 import yaml
 import atexit
 from . import shared_telemetry_utils as utils
@@ -113,16 +112,16 @@ class ScalarType:
         # The required and optional fields in a scalar type definition.
         REQUIRED_FIELDS = {
             "bug_numbers": list,  # This contains ints. See LIST_FIELDS_CONTENT.
-            "description": six.string_types,
-            "expires": six.string_types,
-            "kind": six.string_types,
+            "description": str,
+            "expires": str,
+            "kind": str,
             "notification_emails": list,  # This contains strings. See LIST_FIELDS_CONTENT.
             "record_in_processes": list,
             "products": list,
         }
 
         OPTIONAL_FIELDS = {
-            "release_channel_collection": six.string_types,
+            "release_channel_collection": str,
             "keyed": bool,
             "keys": list,
             "operating_systems": list,
@@ -132,12 +131,12 @@ class ScalarType:
         # The types for the data within the fields that hold lists.
         LIST_FIELDS_CONTENT = {
             "bug_numbers": int,
-            "notification_emails": six.string_types,
-            "record_in_processes": six.string_types,
-            "products": six.string_types,
-            "keys": six.string_types,
-            "operating_systems": six.string_types,
-            "record_into_store": six.string_types,
+            "notification_emails": str,
+            "record_in_processes": str,
+            "products": str,
+            "keys": str,
+            "operating_systems": str,
+            "record_into_store": str,
         }
 
         # Concatenate the required and optional field definitions.

toolkit/components/telemetry/build_scripts/mozparsers/parse_user_interactions.py

@@ -4,7 +4,6 @@
 
 import io
 import re
-import six
 import yaml
 import atexit
 
@@ -96,7 +95,7 @@ class UserInteractionType:
         # The required and optional fields in a UserInteraction definition.
         REQUIRED_FIELDS = {
             "bug_numbers": list,  # This contains ints. See LIST_FIELDS_CONTENT.
-            "description": six.string_types,
+            "description": str,
         }
 
         # The types for the data within the fields that hold lists.