Remove six and Python 2 compat code (#257)

* Remove six

* Remove character encoding

* Remove UnicodeMixin

* Include Python 3.12

* Tests against Python 3.12 in CI

* Update version

Closes gh-255
Closes gh-202

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v1

HISTORY.rst

@@ -3,6 +3,12 @@
 History
 =======
 
+2.3.0
+-----
+
+* Remove `six` dependency
+* Start testing against Python 3.12
+
 2.2.0
 -----
 

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # django-organizations documentation build configuration file, created by
 # sphinx-quickstart on Wed Feb 22 12:22:14 2012.

example/accounts/migrations/0001_initial.py

@@ -9,7 +9,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
@@ -65,7 +64,6 @@ class Migration(migrations.Migration):
                 "ordering": ["name"],
                 "abstract": False,
             },
-            bases=(organizations.base.UnicodeMixin, models.Model),
         ),
         migrations.CreateModel(
             name="AccountUser",
@@ -117,7 +115,6 @@ class Migration(migrations.Migration):
                 "abstract": False,
                 "unique_together": {("user", "organization")},
             },
-            bases=(organizations.base.UnicodeMixin, models.Model),
         ),
         migrations.CreateModel(
             name="AccountOwner",
@@ -164,7 +161,6 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "organization owners",
                 "abstract": False,
             },
-            bases=(organizations.base.UnicodeMixin, models.Model),
         ),
         migrations.CreateModel(
             name="AccountInvitation",
@@ -226,7 +222,6 @@ class Migration(migrations.Migration):
                 ),
             ],
             options={"abstract": False},
-            bases=(organizations.base.UnicodeMixin, models.Model),
         ),
         migrations.AddField(
             model_name="account",

example/vendors/migrations/0001_initial.py

@@ -9,7 +9,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
@@ -78,7 +77,6 @@ class Migration(migrations.Migration):
                 "ordering": ["name"],
                 "abstract": False,
             },
-            bases=(organizations.base.UnicodeMixin, models.Model),
         ),
         migrations.CreateModel(
             name="VendorUser",
@@ -134,7 +132,6 @@ class Migration(migrations.Migration):
                 "abstract": False,
                 "unique_together": {("user", "organization")},
             },
-            bases=(organizations.base.UnicodeMixin, models.Model),
         ),
         migrations.CreateModel(
             name="VendorOwner",
@@ -181,7 +178,6 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "organization owners",
                 "abstract": False,
             },
-            bases=(organizations.base.UnicodeMixin, models.Model),
         ),
         migrations.CreateModel(
             name="VendorInvitation",
@@ -243,7 +239,6 @@ class Migration(migrations.Migration):
                 ),
             ],
             options={"abstract": False},
-            bases=(organizations.base.UnicodeMixin, models.Model),
         ),
         migrations.AddField(
             model_name="vendor",

manage.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """
 Management command entry point for working with migrations
 """

noxfile.py

@@ -15,7 +15,7 @@
 ALL_INTERPRETERS = (DEFAULT_INTERPRETER,)
 
 
-DEV_INSTALL_REQUIREMENTS = ("six", "django-autoslug")
+DEV_INSTALL_REQUIREMENTS = ["django-autoslug"]
 
 
 def get_path(*names):

setup.cfg

@@ -30,7 +30,6 @@ packages = find:
 package_dir=
     =src
 install_requires =
-    six
     Django>=3.2.0
     django-extensions>=2.0.8
 python_requires = >=3.8

setup.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 See setup.cfg for packaging settings
 """

src/organizations/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = "Ben Lopatin"
 __email__ = "[email protected]"
-__version__ = "2.2.0"
+__version__ = "2.3.0"

src/organizations/abstract.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 import warnings
 
@@ -7,12 +6,12 @@
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-import six
 
 from organizations.base import AbstractBaseInvitation
 from organizations.base import AbstractBaseOrganization
 from organizations.base import AbstractBaseOrganizationOwner
 from organizations.base import AbstractBaseOrganizationUser
+from organizations.base import with_metaclass
 from organizations.base import OrgMeta
 from organizations.fields import AutoCreatedField
 from organizations.fields import AutoLastModifiedField
@@ -68,7 +67,7 @@ class Meta:
 
 
 class AbstractOrganization(
-    six.with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseOrganization)
+    with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseOrganization)
 ):
     """
     Abstract Organization model.
@@ -182,7 +181,7 @@ def is_owner(self, user):
 
 
 class AbstractOrganizationUser(
-    six.with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseOrganizationUser)
+    with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseOrganizationUser)
 ):
     """
     Abstract OrganizationUser model
@@ -231,7 +230,7 @@ def get_absolute_url(self):
 
 
 class AbstractOrganizationOwner(
-    six.with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseOrganizationOwner)
+    with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseOrganizationOwner)
 ):
     """
     Abstract OrganizationOwner model
@@ -262,7 +261,7 @@ def save(self, *args, **kwargs):
 
 
 class AbstractOrganizationInvitation(
-    six.with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseInvitation)
+    with_metaclass(OrgMeta, SharedBaseModel, AbstractBaseInvitation)
 ):
     """
     Abstract OrganizationInvitationBase model

src/organizations/admin.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from django.contrib import admin
 

src/organizations/app_settings.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from django.conf import settings
 from django.contrib.auth.models import User

src/organizations/apps.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from django.apps import AppConfig
 

src/organizations/backends/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from importlib import import_module
 from typing import Optional  # noqa

src/organizations/backends/defaults.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 """Backend classes should provide common interface"""
 

src/organizations/backends/forms.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from django import forms
 from django.contrib.auth.forms import UserCreationForm

src/organizations/backends/modeled.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 """
 Invitations that use an invitation model

src/organizations/base.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 import uuid
 
@@ -9,22 +8,21 @@
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-import six
-
 from organizations import signals
 from organizations.managers import ActiveOrgManager
 from organizations.managers import OrgManager
 
 USER_MODEL = getattr(settings, "AUTH_USER_MODEL", "auth.User")
 
 
-class UnicodeMixin:
-    """
-    Python 2 and 3 string representation support.
+# Extracted from six
+def with_metaclass(meta, *bases):
+    class metaclass(type):
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+
+    return type.__new__(metaclass, "temporary_class", (), {})
 
-    Legacy cruft. Removing entirely even from migrations affects the
-    meta class creation.
-    """
 
 
 class OrgMeta(ModelBase):
@@ -47,7 +45,7 @@ class OrgMeta(ModelBase):
 
     def __new__(cls, name, bases, attrs):  # noqa
         # Borrowed from Django-polymorphic
-        # Workaround compatibility issue with six.with_metaclass() and custom
+        # Workaround compatibility issue with with_metaclass() and custom
         # Django model metaclasses:
         if not attrs and name == "NewBase":
             return super(OrgMeta, cls).__new__(cls, name, bases, attrs)
@@ -242,7 +240,7 @@ def is_member(self, user):
         return True if user in self.users.all() else False
 
 
-class OrganizationBase(six.with_metaclass(OrgMeta, AbstractBaseOrganization)):
+class OrganizationBase(with_metaclass(OrgMeta, AbstractBaseOrganization)):
     class Meta(AbstractBaseOrganization.Meta):
         abstract = True
 
@@ -293,7 +291,7 @@ def name(self):
             return str(self.user)
 
 
-class OrganizationUserBase(six.with_metaclass(OrgMeta, AbstractBaseOrganizationUser)):
+class OrganizationUserBase(with_metaclass(OrgMeta, AbstractBaseOrganizationUser)):
     class Meta(AbstractBaseOrganizationUser.Meta):
         abstract = True
 
@@ -310,7 +308,7 @@ def __str__(self):
         return "{0}: {1}".format(self.organization, self.organization_user)
 
 
-class OrganizationOwnerBase(six.with_metaclass(OrgMeta, AbstractBaseOrganizationOwner)):
+class OrganizationOwnerBase(with_metaclass(OrgMeta, AbstractBaseOrganizationOwner)):
     class Meta(AbstractBaseOrganizationOwner.Meta):
         abstract = True
 
@@ -378,6 +376,6 @@ def invitation_token(self):
         raise NotImplementedError
 
 
-class OrganizationInvitationBase(six.with_metaclass(OrgMeta, AbstractBaseInvitation)):
+class OrganizationInvitationBase(with_metaclass(OrgMeta, AbstractBaseInvitation)):
     class Meta(AbstractBaseInvitation.Meta):
         abstract = True

src/organizations/base_admin.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from django.contrib import admin
 

src/organizations/exceptions.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 class OwnershipRequired(Exception):
     """

src/organizations/fields.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Most of this code extracted and borrowed from django-model-utils
 

src/organizations/forms.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from django import forms
 from django.contrib.auth import get_user_model

src/organizations/managers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from django.db import models
 

src/organizations/migrations/0001_initial.py

@@ -11,7 +11,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
@@ -65,7 +64,6 @@ class Migration(migrations.Migration):
                 "ordering": ["name"],
                 "abstract": False,
             },
-            bases=(organizations.base.UnicodeMixin, models.Model),
         ),
         migrations.CreateModel(
             name="OrganizationOwner",
@@ -105,7 +103,6 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "organization owners",
                 "abstract": False,
             },
-            bases=(organizations.base.UnicodeMixin, models.Model),
         ),
         migrations.CreateModel(
             name="OrganizationUser",
@@ -155,7 +152,6 @@ class Migration(migrations.Migration):
                 "ordering": ["organization", "user"],
                 "abstract": False,
             },
-            bases=(organizations.base.UnicodeMixin, models.Model),
         ),
         migrations.AddField(
             model_name="organizationowner",

src/organizations/migrations/0002_model_update.py

@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 from django.db import migrations
 
 import organizations.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("organizations", "0001_initial")]
 
     operations = [

src/organizations/migrations/0003_field_fix_and_editable.py

@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 from django.db import migrations
 
 import organizations.fields
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("organizations", "0002_model_update")]
 
     operations = [