- 2020-01-14: Python 3 / Django 2 Compatibility

Author: afabiani

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [2.0.0](https://github.com/GeoNode/geonode-user-messages/releases/tag/2.0.0)
+
+**Featrues**
+
+ - [Python 3](https://pypi.org/project/geonode-user-messages/)
+
 ## [0.1.15](https://github.com/GeoNode/geonode-user-messages/releases/tag/0.1.15)
 
 **Featrues**

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name = "geonode-user-messages",
-    version = "0.1.15",
+    version = "2.0.0c",
     author = "Eldarion",
     author_email = "[email protected]",
     description = "Fork of user-messages: a reusable private user messages application for Django",
@@ -21,7 +21,14 @@
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
-        "Programming Language :: Python",
         "Framework :: Django",
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ]
 )

user_messages/context_processors.py

@@ -3,6 +3,6 @@
 
 def user_messages(request):
     c = {}
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         c["inbox_count"] = Thread.objects.unread_threads(request.user).count()
     return c

user_messages/migrations/0001_initial.py

@@ -37,7 +37,8 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('sent_at', models.DateTimeField(default=django.utils.timezone.now)),
                 ('content', models.TextField()),
-                ('sender', models.ForeignKey(related_name='sent_messages', to=settings.AUTH_USER_MODEL)),
+                ('sender', models.ForeignKey(related_name='sent_messages',
+                                             to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
             options={
                 'ordering': ('sent_at',),
@@ -56,8 +57,10 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('unread', models.BooleanField()),
                 ('deleted', models.BooleanField()),
-                ('thread', models.ForeignKey(to='user_messages.Thread')),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                ('thread', models.ForeignKey(
+                    to='user_messages.Thread', on_delete=models.CASCADE)),
+                ('user', models.ForeignKey(
+                    to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
             ],
         ),
         migrations.AddField(
@@ -68,6 +71,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='message',
             name='thread',
-            field=models.ForeignKey(related_name='messages', to='user_messages.Thread'),
+            field=models.ForeignKey(
+                related_name='messages', to='user_messages.Thread', on_delete=models.CASCADE),
         ),
     ]

user_messages/migrations/0002_auto_20171107_1128.py

@@ -27,7 +27,8 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='message',
             name='sender',
-            field=models.ForeignKey(related_name='sent_messages', verbose_name='Sender', to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(related_name='sent_messages', verbose_name='Sender',
+                                    to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
         ),
         migrations.AlterField(
             model_name='message',

user_messages/migrations/0003_auto_20171108_1037.py

@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
             name='GroupMemberThread',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('group', models.ForeignKey(to='auth.Group')),
+                ('group', models.ForeignKey(to='auth.Group', on_delete=models.CASCADE)),
             ],
         ),
         migrations.RemoveField(
@@ -37,12 +37,14 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='groupmemberthread',
             name='thread',
-            field=models.ForeignKey(to='user_messages.Thread'),
+            field=models.ForeignKey(
+                to='user_messages.Thread', on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='groupmemberthread',
             name='user',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(
+                to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='thread',

user_messages/models.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 from django.db.models import Q
 
@@ -72,13 +72,14 @@ def __str__(self):
 
 
 class GroupMemberThread(models.Model):
-    thread = models.ForeignKey(Thread)
+    thread = models.ForeignKey(Thread, on_delete=models.CASCADE)
     # we could replace ``group`` and ``user`` below with
     # ``member=models.ForeignKey(geonode.groups.models.GroupMember)``
     # but that would mean importing from geonode core apps inside an external
     # app. This is an argument for moving this app into genode.contrib
-    group = models.ForeignKey(Group)
-    user = models.ForeignKey(settings.AUTH_USER_MODEL)
+    group = models.ForeignKey(Group, on_delete=models.CASCADE)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL,
+                             on_delete=models.CASCADE)
     unread = models.BooleanField(
         default=True
     )
@@ -88,9 +89,8 @@ class GroupMemberThread(models.Model):
 
 
 class UserThread(models.Model):
-    
-    thread = models.ForeignKey(Thread)
-    user = models.ForeignKey(settings.AUTH_USER_MODEL)
+    thread = models.ForeignKey(Thread, on_delete=models.CASCADE)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
 
     unread = models.BooleanField(
         default=True
@@ -101,10 +101,11 @@ class UserThread(models.Model):
 
 
 class Message(models.Model):
+    thread = models.ForeignKey(
+        Thread, related_name="messages", on_delete=models.CASCADE)
 
-    thread = models.ForeignKey(Thread, related_name="messages")
-    
-    sender = models.ForeignKey(settings.AUTH_USER_MODEL, related_name="sent_messages", verbose_name=_('Sender'))
+    sender = models.ForeignKey(settings.AUTH_USER_MODEL, related_name="sent_messages", verbose_name=_(
+        'Sender'), on_delete=models.CASCADE)
     sent_at = models.DateTimeField(_('Sent at'), default=timezone.now)
 
     content = models.TextField(_('Content'))

user_messages/tests/test_models.py

@@ -1,7 +1,7 @@
 """Unit tests for user_messages.models."""
 
 from django.contrib.auth import get_user_model
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 
 from geonode.groups.models import GroupProfile

user_messages/tests/test_views.py

@@ -2,7 +2,7 @@
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http.request import QueryDict
 from django.test import TestCase
 import mock

user_messages/views.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.views.decorators.http import require_POST