From 21897d7f7331e99971fd8795ea248c050e3bc7ae Mon Sep 17 00:00:00 2001
From: Alex de Landgraaf <alex@maykinmedia.nl>
Date: Fri, 31 Mar 2023 14:05:59 +0200
Subject: [PATCH] Upgrade Django 2.2/3.2 Py3.9

---
 regex_redirects/actions.py |  5 ++---
 regex_redirects/tests.py   |  3 +--
 setup.py                   |  2 +-
 tox.ini                    | 10 ++++------
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/regex_redirects/actions.py b/regex_redirects/actions.py
index 7297b53..20d7915 100644
--- a/regex_redirects/actions.py
+++ b/regex_redirects/actions.py
@@ -3,7 +3,6 @@
 import csv
 
 from django.http import HttpResponse
-import six
 
 
 # Admin action for a generic "CSV Export"
@@ -31,13 +30,13 @@ def export_as_csv(modeladmin, request, queryset):
             field_names = field_names - excludeset
 
         response = HttpResponse(content_type='text/csv')
-        response['Content-Disposition'] = 'attachment; filename=%s.csv' % six.text_type(opts).replace('.', '_')
+        response['Content-Disposition'] = 'attachment; filename=%s.csv' % opts.replace('.', '_')
 
         writer = csv.writer(response)
         if header:
             writer.writerow(list(field_names))
         for obj in queryset:
-            writer.writerow([six.text_type(getattr(obj, field)).encode('utf-8', 'replace') for field in field_names])
+            writer.writerow([getattr(obj, field).encode('utf-8', 'replace') for field in field_names])
         return response
     export_as_csv.short_description = description
     return export_as_csv
diff --git a/regex_redirects/tests.py b/regex_redirects/tests.py
index 4157a12..6b87244 100644
--- a/regex_redirects/tests.py
+++ b/regex_redirects/tests.py
@@ -5,7 +5,6 @@
 from django.conf import settings
 from django.test import TestCase
 from django.test.utils import override_settings
-from django.utils import six
 from django.core.cache import cache
 
 from .models import Redirect
@@ -21,7 +20,7 @@ def setUp(self):
     def test_model(self):
         r1 = Redirect.objects.create(
             old_path='/initial', new_path='/new_target')
-        self.assertEqual(six.text_type(r1), "/initial ---> /new_target")
+        self.assertEqual(str(r1) , "/initial ---> /new_target")
 
     def test_redirect(self):
         redirect = Redirect.objects.create(
diff --git a/setup.py b/setup.py
index 509dc70..88684ba 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='django-regex-redirects',
-    version='0.3.1',
+    version='0.4.0',
     author=u'Alex de Landgraaf',
     author_email='alex@maykinmedia.nl',
     packages=find_packages(),
diff --git a/tox.ini b/tox.ini
index 8e52059..4e77f80 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,13 @@
 [tox]
 envlist =
-    {py27,py34,py35}-django-1.10
-    {py27,py34,py35,py36}-django-1.11
-    {py35,py36}-django-2.0
+    {py39}-django-2.2
+    {py39}-django-3.2
 skip_missing_interpreters = true
 
 [testenv]
 deps=
-  django-1.10: Django>=1.10,<1.11
-  django-1.11: Django>=1.11,<2.0
-  django-2.0: Django>=2.0,<2.1
+  django-2.2: Django>=2.0,<2.3
+  django-3.2: Django>=3.0,<3.3
   master: https://github.com/django/django/archive/master.tar.gz
   coverage
   coveralls