Remove and replace pkg_resources and distutils with modern equivalents

newsletter/__init__.py

@@ -1,7 +1,7 @@
-from pkg_resources import get_distribution, DistributionNotFound
+from importlib.metadata import version, PackageNotFoundError
 
 try:
-    __version__ = get_distribution("django-newsletter").version
-except DistributionNotFound:
+    __version__ = version("django-newsletter")
+except PackageNotFoundError:
     # package is not installed
     __version__ = None

newsletter/migrations/0009_alter_article_id_alter_attachment_id_and_more.py

@@ -0,0 +1,54 @@
+# Generated by Django 5.0.6 on 2024-05-08 15:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("newsletter", "0008_longer_subscription_name"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="article",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="attachment",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="message",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="newsletter",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="submission",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="subscription",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
+        ),
+    ]

newsletter/models.py

@@ -1,4 +1,5 @@
 import logging
+import sys
 import os
 import time
 from datetime import datetime
@@ -17,7 +18,7 @@
 from django.utils.timezone import now
 from django.urls import reverse
 
-from distutils.version import LooseVersion
+# from distutils.version import LooseVersion
 
 from .fields import DynamicImageField
 from .utils import (
@@ -740,8 +741,11 @@ def get_absolute_url(self):
 def get_address(name, email):
     # Converting name to ascii for compatibility with django < 1.9.
     # Remove this when django 1.8 is no longer supported.
-    if LooseVersion(django.get_version()) < LooseVersion('1.9'):
-        name = name.encode('ascii', 'ignore').decode('ascii').strip()
+    # if LooseVersion(django.get_version()) < LooseVersion('1.9'):
+    #     name = name.encode('ascii', 'ignore').decode('ascii').strip()
+    # Assuming django.get_version() returns a string like '1.8.18'
+    django_version = tuple(map(int, django.get_version().split('.')))
+    name = name.encode('ascii', 'ignore').decode('ascii').strip() if django_version < (1, 9) else name
     if name:
         return f'{name} <{email}>'
     else: