ref(pyupgrade): complete removal of six (#23744)

examples/oauth2_consumer_webserver/app.py

@@ -1,6 +1,5 @@
 import json  # noqa
 import os
-import six
 
 from flask import Flask, redirect, url_for, request, session
 from flask_oauth import OAuth
@@ -54,7 +53,7 @@ def index():
             # Unauthorized - bad token
             session.pop("access_token", None)
             return redirect(url_for("login"))
-        return "{}\n{}".format(six.text_type(e), e.read())
+        return "{}\n{}".format(str(e), e.read())
 
     return ("<h1>Hi, {}!</h1>" "<pre>{}</pre>").format(
         json.loads(session["user"])["email"], json.dumps(json.loads(res.read()), indent=2)

requirements-base.txt

@@ -50,7 +50,6 @@ rfc3986-validator==0.1.1
 sentry-relay>=0.8.1,<0.9.0
 sentry-sdk>=0.19.5,<0.20.0
 simplejson>=3.11.0,<3.12.0
-six>=1.13.0
 sqlparse>=0.2.0,<0.3.0
 statsd>=3.1.0,<3.2.0
 structlog==17.1.0

src/bitfield/admin.py

@@ -1,4 +1,3 @@
-import six
 from django.contrib.admin import FieldListFilter
 from django.contrib.admin.options import IncorrectLookupParameters
 from django.core.exceptions import ValidationError
@@ -18,7 +17,7 @@ class BitFieldListFilter(FieldListFilter):
         super().__init__(field, request, params, model, model_admin, field_path)
 
     def queryset(self, request, queryset):
-        _filter = {p: bitor(F(p), v) for p, v in six.iteritems(self.used_parameters)}
+        _filter = {p: bitor(F(p), v) for p, v in self.used_parameters.items()}
         try:
             return queryset.filter(**_filter)
         except ValidationError as e:

src/bitfield/models.py

@@ -1,5 +1,3 @@
-import six
-
 from django.db.models.fields import BigIntegerField
 
 from bitfield.query import BitQueryExactLookupStub
@@ -132,7 +130,7 @@ class BitField(BigIntegerField):
             # Regression for #1425: fix bad data that was created resulting
             # in negative values for flags.  Compute the value that would
             # have been visible ot the application to preserve compatibility.
-            if isinstance(value, six.integer_types) and value < 0:
+            if isinstance(value, int) and value < 0:
                 new_value = 0
                 for bit_number, _ in enumerate(self.flags):
                     new_value |= value & (2 ** bit_number)

src/bitfield/types.py

@@ -1,8 +1,3 @@
-import six
-
-from six import string_types
-
-
 def cmp(a, b):
     return (a > b) - (a < b)
 
@@ -146,7 +141,7 @@ class BitHandler:
         )
 
     def __str__(self):
-        return six.text_type(self._value)
+        return str(self._value)
 
     def __int__(self):
         return self._value
@@ -239,7 +234,7 @@ class BitHandler:
             yield (k, getattr(self, k).is_set)
 
     def get_label(self, flag):
-        if isinstance(flag, string_types):
+        if isinstance(flag, str):
             flag = self._keys.index(flag)
         if isinstance(flag, Bit):
             flag = flag.number

src/sentry/api/validators/sentry_apps/schema.py

@@ -242,7 +242,6 @@ def validate_ui_element_schema(instance):
         )
         # pre-validators might have unexpected errors if the format is not what they expect in the check
         # if that happens, we should eat the error and let the main validator find the schema error
-        pass
     validate(instance, SCHEMA)
 
 

src/sentry/assistant/manager.py

@@ -1,16 +1,13 @@
-import six
-
-
 class AssistantManager:
     def __init__(self):
         self._guides = {}
 
     def add(self, guides):
-        for k, v in six.iteritems(guides):
+        for k, v in guides.items():
             self._guides[k] = v
 
     def get_valid_ids(self):
-        return list(v["id"] for k, v in six.iteritems(self._guides))
+        return list(v["id"] for k, v in self._guides.items())
 
     def get_guide_id(self, guide):
         guide = self._guides.get(guide)

src/sentry/attachments/base.py

@@ -1,4 +1,3 @@
-from six import string_types
 import zlib
 
 from sentry.utils import metrics
@@ -37,7 +36,7 @@ class CachedAttachment:
         self.name = name
         self.content_type = content_type
         self.type = type or "event.attachment"
-        assert isinstance(self.type, string_types), self.type
+        assert isinstance(self.type, str), self.type
         self.rate_limited = rate_limited
 
         if size is not None:

src/sentry/auth/authenticators/base.py

@@ -88,7 +88,6 @@ class AuthenticatorInterface:
         """
         # This method needs to be empty for the default
         # `requires_activation` property to make sense.
-        pass
 
     def enroll(self, user):
         """Invoked to enroll a user for this interface.  If already enrolled

src/sentry/bgtasks/api.py

@@ -1,4 +1,3 @@
-import six
 import time
 import random
 import logging
@@ -72,7 +71,7 @@ def get_task(task_name):
 
 
 def spawn_bgtasks(role):
-    for import_name, cfg in six.iteritems(settings.BGTASKS):
+    for import_name, cfg in settings.BGTASKS.items():
         task = get_task(import_name)
         # This is already running
         if task.name in tasks:
@@ -85,7 +84,7 @@ def spawn_bgtasks(role):
 
 
 def shutdown_bgtasks():
-    for task_name, task in list(six.iteritems(tasks)):
+    for task_name, task in list(tasks.items()):
         task.stop()
         tasks.pop(task_name, None)