Merge pull request #646 from deschler/remove-six

fix: Remove six (old compat layer for python2)

.github/workflows/test.yml

@@ -95,7 +95,7 @@ jobs:
           if [[ $DB == postgres ]]; then
             pip install -q psycopg2-binary
           fi
-          pip install coverage six pytest pytest-django pytest-cov $(./get-django-version.py ${{ matrix.django }})
+          pip install coverage pytest pytest-django pytest-cov $(./get-django-version.py ${{ matrix.django }})
       - name: Run tests
         run: |
           pytest --cov-report term

modeltranslation/fields.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-import six
 from django import VERSION
 from django import forms
 from django.core.exceptions import ImproperlyConfigured
@@ -280,7 +278,7 @@ def deconstruct(self):
             kwargs.update({'null': True})
         if 'db_column' in kwargs:
             kwargs['db_column'] = self.db_column
-        return six.text_type(self.name), path, args, kwargs
+        return self.name, path, args, kwargs
 
     def clone(self):
         from django.utils.module_loading import import_string

modeltranslation/management/commands/sync_translation_fields.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Detect new translatable fields in all models and sync database structure.
 
@@ -13,7 +12,6 @@
 from django.core.management.base import BaseCommand
 from django.core.management.color import no_style
 from django.db import connection
-from six import moves
 
 from modeltranslation.settings import AVAILABLE_LANGUAGES
 from modeltranslation.translator import translator
@@ -27,7 +25,7 @@ def ask_for_confirmation(sql_sentences, model_full_name, interactive):
     while True:
         prompt = '\nAre you sure that you want to execute the previous SQL: (y/n) [n]: '
         if interactive:
-            answer = moves.input(prompt).strip()
+            answer = input(prompt).strip()
         else:
             answer = 'y'
         if answer == '':

modeltranslation/manager.py

@@ -1,25 +1,21 @@
-# -*- coding: utf-8 -*-
 """
 The idea of MultilingualManager is taken from
 django-linguo by Zach Mathew
 
 https://github.com/zmathew/django-linguo
 """
 import itertools
+from functools import reduce
 
 from django import VERSION
 from django.contrib.admin.utils import get_model_from_relation
 from django.core.exceptions import FieldDoesNotExist
 from django.db import models
 from django.db.models.expressions import Col
 from django.db.models.lookups import Lookup
-from django.db.models.query import (
-    QuerySet,
-    ValuesIterable,
-    create_namedtuple_class,
-)
+from django.db.models.query import QuerySet, ValuesIterable
+from django.db.models.utils import create_namedtuple_class
 from django.utils.tree import Node
-from six import moves
 
 from modeltranslation import settings
 from modeltranslation.fields import TranslationField
@@ -126,7 +122,7 @@ def append_lookup_keys(model, fields):
             new_field = (field,)
         new_fields.append(new_field)
 
-    return moves.reduce(set.union, new_fields, set())
+    return reduce(set.union, new_fields, set())
 
 
 def rewrite_order_lookup_key(model, lookup_key):

modeltranslation/translator.py

@@ -7,7 +7,6 @@
 from django.db.models.base import ModelBase
 from django.db.models.signals import post_init
 from django.utils.functional import cached_property
-from six import with_metaclass
 
 from modeltranslation import settings as mt_settings
 from modeltranslation.fields import (
@@ -52,7 +51,7 @@ def __new__(cls, name, bases, attrs):
         return super(FieldsAggregationMetaClass, cls).__new__(cls, name, bases, attrs)
 
 
-class TranslationOptions(with_metaclass(FieldsAggregationMetaClass, object)):
+class TranslationOptions(metaclass=FieldsAggregationMetaClass):
     """
     Translatable fields are declared by registering a model using
     ``TranslationOptions`` class with appropriate ``fields`` attribute.

modeltranslation/utils.py

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
 from contextlib import contextmanager
 
-import six
 from django.utils.encoding import force_str
 from django.utils.translation import get_language as _get_language
 from django.utils.translation import get_language_info
@@ -54,7 +52,7 @@ def _build_localized_verbose_name(verbose_name, lang):
     return force_str('%s [%s]') % (force_str(verbose_name), lang)
 
 
-build_localized_verbose_name = lazy(_build_localized_verbose_name, six.text_type)
+build_localized_verbose_name = lazy(_build_localized_verbose_name, str)
 
 
 def _join_css_class(bits, offset):

pyproject.toml

@@ -11,7 +11,6 @@ packages = [
 [tool.poetry.dependencies]
 python = ">=3.7,<4"
 django = ">=2.2"
-six = "^1.15.0"
 
 [tool.poetry.dev-dependencies]
 pdbpp = "^0.10.2"
@@ -26,3 +25,9 @@ django-types = "^0.15.0"
 [tool.black]
 line-length = 100
 skip-string-normalization = true
+
+[tool.isort]
+line_length = 100
+multi_line_output = 3
+skip_gitignore = true
+include_trailing_comma = true

setup.cfg

@@ -28,7 +28,6 @@ license = New BSD
 [options]
 install_requires =
     Django>=2.2
-    six
     importlib-metadata; python_version<"3.8"
 packages =
     modeltranslation