Merge pull request #17 from travislbrundage/py3

Syntax updates for flake8, indicate project is Python 3.7 ready

Author: Alessio Fabiani

setup.py

@@ -4,18 +4,18 @@
 
 
 setup(
-    name = "geonode-user-messages",
-    version = "2.0.0",
-    author = "Eldarion",
-    author_email = "[email protected]",
-    description = "Fork of user-messages: a reusable private user messages application for Django",
-    long_description = open("README.rst").read(),
-    license = "BSD",
-    url = "http://github.com/GeoNode/geonode-user-messages",
+    name="geonode-user-messages",
+    version="2.0.0",
+    author="Eldarion",
+    author_email="[email protected]",
+    description="Fork of user-messages: a reusable private user messages application for Django",
+    long_description=open("README.rst").read(),
+    license="BSD",
+    url="http://github.com/GeoNode/geonode-user-messages",
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
-    classifiers = [
+    classifiers=[
         "Development Status :: 3 - Alpha",
         "Environment :: Web Environment",
         "Intended Audience :: Developers",
@@ -30,5 +30,6 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ]
 )

user_messages/forms.py

@@ -35,9 +35,10 @@ def __init__(self, *args, **kwargs):
             group_list_all = []
             try:
                 group_list_all = self.sender.group_list_all().values('group')
-            except:
+            except Exception:
                 pass
-            public_groups = GroupProfile.objects.exclude(access="public-invite").exclude(access="private").values('group')
+            public_groups = GroupProfile.objects.exclude(
+                access="public-invite").exclude(access="private").values('group')
 
             self.fields["to_groups"].queryset = GroupProfile.objects.filter(
                 Q(group__isnull=True) | Q(group__in=groups) |
@@ -80,5 +81,5 @@ def __init__(self, *args, **kwargs):
         super(MessageReplyForm, self).__init__(*args, **kwargs)
 
     def save(self):
-        return Message.objects.new_reply(self.thread, self.user,
-            self.cleaned_data["content"])
+        return Message.objects.new_reply(
+            self.thread, self.user, self.cleaned_data["content"])

user_messages/managers.py

@@ -5,7 +5,7 @@
 
 
 class ThreadManager(Manager):
-    
+
     def active_threads(self, user):
         """Return all active threads where the user is involved.
 
@@ -46,7 +46,7 @@ def sorted_unread_threads(self, user):
 
 
 class MessageManager(Manager):
-    
+
     def new_reply(self, thread, user, content):
         """Generate a new message for the input thread.
 

user_messages/models.py

@@ -13,7 +13,7 @@
 
 
 class Thread(models.Model):
-    
+
     subject = models.CharField(
         _('Subject'), max_length=150
     )
@@ -33,15 +33,15 @@ class Thread(models.Model):
     )
 
     objects = ThreadManager()
-    
+
     def get_absolute_url(self):
         return reverse("messages_thread_detail", kwargs={"thread_id": self.pk})
 
     @property
     @cached_attribute
     def first_message(self):
         return self.messages.all()[0]
-    
+
     @property
     @cached_attribute
     def latest_message(self):
@@ -91,7 +91,7 @@ class GroupMemberThread(models.Model):
 class UserThread(models.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
     )
@@ -103,17 +103,17 @@ class UserThread(models.Model):
 class Message(models.Model):
     thread = models.ForeignKey(
         Thread, related_name="messages", on_delete=models.CASCADE)
-    
+
     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'))
-    
+
     objects = MessageManager()
-    
+
     class Meta:
         ordering = ("sent_at",)
-    
+
     def get_absolute_url(self):
         return self.thread.get_absolute_url()

user_messages/tests/settings.py

@@ -49,7 +49,7 @@
 INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.sessions',
-    'django.contrib.sites', 
+    'django.contrib.sites',
     'django.contrib.contenttypes',
     "user_messages",
     'guardian',

user_messages/tests/test_forms.py

@@ -72,8 +72,8 @@ def test_new_message_form_no_subject(self):
             {
                 "subject": "",
                 "content": "dummy content",
-                "to_users": [2,],
-                "to_groups": [1,],
+                "to_users": [2, ],
+                "to_groups": [1, ],
             },
             current_user=self.first_user
         )
@@ -84,8 +84,8 @@ def test_new_message_form_no_content(self):
             {
                 "subject": "dummy subject",
                 "content": "",
-                "to_users": [2,],
-                "to_groups": [1,],
+                "to_users": [2, ],
+                "to_groups": [1, ],
             },
             current_user=self.first_user
         )
@@ -108,7 +108,7 @@ def test_new_message_form_only_single_users(self):
             {
                 "subject": "dummy subject",
                 "content": "dummy content",
-                "to_users": [self.second_user.id,],
+                "to_users": [self.second_user.id, ],
                 "to_groups": [],
             },
             current_user=self.first_user
@@ -132,7 +132,7 @@ def test_new_message_form_same_user(self):
             {
                 "subject": "dummy subject",
                 "content": "dummy content",
-                "to_users": [self.first_user.id,],
+                "to_users": [self.first_user.id, ],
                 "to_groups": [],
             },
             current_user=self.first_user
@@ -145,7 +145,7 @@ def test_new_message_form_non_existent_user(self):
             {
                 "subject": "dummy subject",
                 "content": "dummy content",
-                "to_users": [10000,],
+                "to_users": [10000, ],
                 "to_groups": [],
             },
             current_user=self.first_user

user_messages/tests/test_managers.py

@@ -8,7 +8,6 @@
 
 from user_messages import models
 from user_messages import managers
-#from user_messages.signals import message_sent
 
 
 class Base(TestCase):
@@ -123,7 +122,7 @@ def setUp(self):
             from_user=self.first_user,
             subject="first message of the third thread",
             content="test",
-            to_groups=[self.first_group_profile,]
+            to_groups=[self.first_group_profile, ]
         )
         self.second_message = models.Message.objects.new_message(
             from_user=self.first_user,

user_messages/tests/test_views.py

@@ -125,10 +125,6 @@ def test_thread_detail_post(self):
             self.assertRedirects(response, reverse("messages_inbox"))
 
     def test_message_create_no_args_get_renders(self):
-        mock_initial = {
-            "to_users": [None],
-            "to_groups": [None],
-        }
         response = self.client.get(reverse("message_create_multiple"))
         self.assertEqual(response.status_code, 200)
 

user_messages/views.py

@@ -19,7 +19,7 @@ def inbox(request, template_name="user_messages/inbox.html"):
         template_name,
         context={
             "threads_all": Thread.objects.sorted_active_threads(request.user),
-            "threads_unread" : Thread.objects.sorted_unread_threads(
+            "threads_unread": Thread.objects.sorted_unread_threads(
                 request.user),
         }
     )
@@ -33,7 +33,6 @@ def thread_detail(request, thread_id,
         pk=thread_id
     )
     if request.method == "POST":
-        #form = form_class(request.POST, user=request.user, thread=thread)
         form = MessageReplyForm(request.POST, user=request.user, thread=thread)
         if form.is_valid():
             form.save()