From 6ba1280a7ea3bd1fb6858600d5574097952ed1e5 Mon Sep 17 00:00:00 2001
From: Johannes Wilm <mail@johanneswilm.org>
Date: Sat, 16 Jul 2022 23:25:43 +0200
Subject: [PATCH] remove six

---
 avatar/admin.py  | 4 +---
 avatar/forms.py  | 3 +--
 avatar/models.py | 8 ++++----
 avatar/utils.py  | 5 ++---
 avatar/views.py  | 8 +++-----
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/avatar/admin.py b/avatar/admin.py
index 29ff967..4d95177 100644
--- a/avatar/admin.py
+++ b/avatar/admin.py
@@ -1,5 +1,3 @@
-import six
-
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _
 from django.template.loader import render_to_string
@@ -22,7 +20,7 @@ class AvatarAdmin(admin.ModelAdmin):
             {
                 "user": avatar_in.user,
                 "url": avatar_in.avatar.url,
-                "alt": six.text_type(avatar_in.user),
+                "alt": str(avatar_in.user),
                 "size": 80,
             }
         )
diff --git a/avatar/forms.py b/avatar/forms.py
index 9dbe800..a3c6beb 100644
--- a/avatar/forms.py
+++ b/avatar/forms.py
@@ -1,5 +1,4 @@
 import os
-import six
 
 from django import forms
 from django.forms import widgets
@@ -16,7 +15,7 @@ def avatar_img(avatar, size):
         avatar.create_thumbnail(size)
     return mark_safe(
         '<img src="%s" alt="%s" width="%s" height="%s" />'
-        % (avatar.avatar_url(size), six.text_type(avatar), size, size)
+        % (avatar.avatar_url(size), str(avatar), size, size)
     )
 
 
diff --git a/avatar/models.py b/avatar/models.py
index 3d7f353..ea7a711 100644
--- a/avatar/models.py
+++ b/avatar/models.py
@@ -1,7 +1,7 @@
 import binascii
 import os
 import hashlib
-import six
+from io import BytesIO
 from PIL import Image
 
 from django.db import models
@@ -102,8 +102,8 @@ class Avatar(models.Model):
         verbose_name = _("avatar")
         verbose_name_plural = _("avatars")
 
-    def __unicode__(self):
-        return _(six.u("Avatar for %s")) % self.user
+    def __str__(self):
+        return _("Avatar for %s") % self.user
 
     def save(self, *args, **kwargs):
         avatars = Avatar.objects.filter(user=self.user)
@@ -167,7 +167,7 @@ class Avatar(models.Model):
                 if image.mode not in ("RGB", "RGBA"):
                     image = image.convert("RGB")
                 image = image.resize((size, size), settings.AVATAR_RESIZE_METHOD)
-                thumb = six.BytesIO()
+                thumb = BytesIO()
                 image.save(thumb, settings.AVATAR_THUMB_FORMAT, quality=quality)
                 thumb_file = ContentFile(thumb.getvalue())
             else:
diff --git a/avatar/utils.py b/avatar/utils.py
index f09b648..a7da903 100644
--- a/avatar/utils.py
+++ b/avatar/utils.py
@@ -1,5 +1,4 @@
 import hashlib
-import six
 
 from django.core.cache import cache
 from django.template.defaultfilters import slugify
@@ -31,8 +30,8 @@ def get_cache_key(user_or_username, size, prefix):
     """
     if isinstance(user_or_username, get_user_model()):
         user_or_username = get_username(user_or_username)
-    key = six.u("%s_%s_%s") % (prefix, user_or_username, size)
-    return six.u("%s_%s") % (
+    key = "%s_%s_%s" % (prefix, user_or_username, size)
+    return "%s_%s" % (
         slugify(key)[:100],
         hashlib.md5(force_bytes(key)).hexdigest(),
     )
diff --git a/avatar/views.py b/avatar/views.py
index 72b4fd5..7bac181 100644
--- a/avatar/views.py
+++ b/avatar/views.py
@@ -1,5 +1,3 @@
-import six
-
 from django.shortcuts import render, redirect
 from django.utils.translation import gettext as _
 from django.contrib import messages
@@ -148,12 +146,12 @@ def delete(request, extra_context=None, next_override=None, *args, **kwargs):
         if delete_avatar_form.is_valid():
             ids = delete_avatar_form.cleaned_data["choices"]
             for a in avatars:
-                if six.text_type(a.id) in ids:
+                if str(a.id) in ids:
                     avatar_deleted.send(sender=Avatar, user=request.user, avatar=a)
-            if six.text_type(avatar.id) in ids and avatars.count() > len(ids):
+            if str(avatar.id) in ids and avatars.count() > len(ids):
                 # Find the next best avatar, and set it as the new primary
                 for a in avatars:
-                    if six.text_type(a.id) not in ids:
+                    if str(a.id) not in ids:
                         a.primary = True
                         a.save()
                         avatar_updated.send(