Merge pull request #23 from maykinmedia/feature/fix-export

🐛 fix export action exception

Author: alextreme

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: Tests and PyPI publishing
 on:
   push:
     branches:
-      - main
+      - master
     tags:
       - '*'
   pull_request:
@@ -16,12 +16,16 @@ jobs:
     strategy:
       matrix:
         python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        django: ["3.2", "4.2"]
+        django: ["3.2", "4.2", "5.2"]
         exclude:
           - python: "3.11"
             django: "3.2"
           - python: "3.12"
             django: "3.2"
+          - python: "3.8"
+            django: "5.2"
+          - python: "3.9"
+            django: "5.2"
 
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -104,3 +104,6 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# JetBrains
+.idea/

pyproject.toml

@@ -17,6 +17,7 @@ classifiers = [
     "Framework :: Django",
     "Framework :: Django :: 3.2",
     "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.2",
     "Intended Audience :: Developers",
     "Operating System :: Unix",
     "Operating System :: MacOS",

regex_redirects/actions.py

@@ -32,20 +32,15 @@ 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" % opts.replace(
-            ".", "_"
+        response["Content-Disposition"] = (
+            "attachment; filename=%s.csv" % opts.model_name.replace(".", "_")
         )
 
         writer = csv.writer(response)
         if header:
             writer.writerow(list(field_names))
         for obj in queryset:
-            writer.writerow(
-                [
-                    getattr(obj, field).encode("utf-8", "replace")
-                    for field in field_names
-                ]
-            )
+            writer.writerow([getattr(obj, field) for field in field_names])
         return response
 
     export_as_csv.short_description = description

regex_redirects/tests.py

@@ -1,6 +1,8 @@
+from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.urls import reverse
 
 from .middleware import (
     DJANGO_REGEX_REDIRECTS_CACHE_KEY,
@@ -149,3 +151,35 @@ def test_fallback_redirects(self):
             status_code=301,
             target_status_code=404,
         )
+
+
+class RedirectExportAdminActionTest(TestCase):
+
+    def setUp(self):
+
+        self.superuser = User.objects.create_superuser("exporter_man")
+        self.client.force_login(self.superuser)
+
+        self.redirect_1 = Redirect.objects.create(
+            old_path="/initial", new_path="/new_target"
+        )
+        self.redirect_2 = Redirect.objects.create(
+            old_path=r"/news/index/(\d+)/(.*)/",
+            new_path="/my/news/$2/",
+            regular_expression=True,
+        )
+
+        self.url = reverse("admin:regex_redirects_redirect_changelist")
+
+    def test_simple(self):
+        data = {
+            "action": "export_as_csv",
+            "_selected_action": [self.redirect_1.pk, self.redirect_2.pk],
+        }
+
+        response = self.client.post(self.url, data)
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(
+            response.get("Content-Disposition"), "attachment; filename=redirect.csv"
+        )

testapp/__init__.py

@@ -0,0 +1,64 @@
+from pathlib import Path
+
+BASE_DIR = Path(__file__).resolve(strict=True).parent
+
+SECRET_KEY = "so-secret-i-cant-believe-you-are-looking-at-this"
+
+USE_TZ = True
+
+DEBUG = True
+
+APPEND_SLASH = False
+
+SITE_ID = 1
+
+ALLOWED_HOSTS = [
+    "example.com",
+]
+
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": BASE_DIR / "regex_redirects.db",
+    }
+}
+
+INSTALLED_APPS = [
+    "django.contrib.contenttypes",
+    "django.contrib.auth",
+    "django.contrib.sessions",
+    "django.contrib.sites",
+    "django.contrib.messages",
+    "django.contrib.admin",
+    "regex_redirects",
+    "testapp",
+]
+
+MIDDLEWARE = [
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "regex_redirects.middleware.RedirectFallbackMiddleware",
+]
+
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
+            ],
+        },
+    },
+]
+
+ROOT_URLCONF = "testapp.urls"

testapp/settings.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+from django.urls import path
+
+urlpatterns = [
+    path("admin/", admin.site.urls),
+]

testapp/urls.py

@@ -1,7 +1,8 @@
 [tox]
 envlist =
     py{38,39,310}-django{32,42}
-    py3{11,12}-django{41,42}
+    py310-django52
+    py3{11,12}-django{41,42,52}
     isort
     black
     flake8
@@ -19,11 +20,15 @@ python =
 DJANGO =
     3.2: django32
     4.2: django42
+    5.2: django52
 
 [testenv]
+setenv =
+    DJANGO_SETTINGS_MODULE=testapp.settings
 deps=
   django32: Django~=3.2.0
   django42: Django~=4.2.0
+  django52: Django~=5.2.0
 commands =
   python manage.py test regex_redirects
 
@@ -35,7 +40,7 @@ commands = isort --check-only --diff .
 [testenv:black]
 extras = tests
 skipsdist = True
-commands = black --check regex_redirects testsettings.py manage.py
+commands = black --check regex_redirects testapp manage.py
 
 [testenv:flake8]
 extras = tests