Merge pull request #16 from DingDingFan0207/Dingding/geonode-user-messages

#4276 upgrade user-messages to be compatible with python3 and django1.11

Author: Alessio Fabiani

docs/conf.py

@@ -40,8 +40,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'user-messages'
-copyright = u'2011, Eldarion'
+project = 'user-messages'
+copyright = '2011, Eldarion'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -178,8 +178,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'user-messages.tex', u'user-messages Documentation',
-   u'Eldarion', 'manual'),
+  ('index', 'user-messages.tex', 'user-messages Documentation',
+   'Eldarion', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -211,6 +211,6 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'user-messages', u'user-messages Documentation',
-     [u'Eldarion'], 1)
+    ('index', 'user-messages', 'user-messages Documentation',
+     ['Eldarion'], 1)
 ]

user_messages/context_processors.py

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

user_messages/forms.py

@@ -62,6 +62,10 @@ def clean(self):
         super(NewMessageForm, self).clean()
         users = self.cleaned_data.get("to_users")
         groups = self.cleaned_data.get("to_groups")
+        if users is None and groups is None:
+            # when data in field users/groups is not valid,
+            # cleaned_data function will not include the data or its field
+            raise ValidationError(_("Must have at least one validated user or group."))
         if not any(users) and not any(groups):
             raise ValidationError(_("Must select at least one user or group."))
 

user_messages/migrations/0001_initial.py

@@ -18,7 +18,6 @@
 #
 #########################################################################
 
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 import django.utils.timezone

user_messages/migrations/0002_auto_20171107_1128.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 import django.utils.timezone

user_messages/migrations/0003_auto_20171108_1037.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 from django.conf import settings

user_messages/migrations/0004_auto_20171108_1101.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 

user_messages/models.py

@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models import Q

user_messages/tests/manage.py

@@ -1,12 +1,16 @@
-#!/usr/bin/env python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+import os
+import sys
+import django
+from django.conf import settings
+from django.test.utils import get_runner
 
-if __name__ == "__main__":
-    execute_manager(settings)
 
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+
+if __name__ == "__main__":
+    django.setup()
+    TestRunner = get_runner(settings)
+    test_runner = TestRunner()
+    failures = test_runner.run_tests(['user_messages'])
+    if failures:
+        sys.exit(failures)

user_messages/tests/settings.py

@@ -1,14 +1,68 @@
-DATABASE_ENGINE = "sqlite3"
+import os
 
 ROOT_URLCONF = "user_messages.urls"
 
-TEMPLATE_CONTEXT_PROCESSORS = [
-    "user_messages.context_processors.user_messages"
+SECRET_KEY = " "
+
+AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend', 'guardian.backends.ObjectPermissionBackend')
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': ':memory:',
+    }
+}
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'handlers': {
+        'file': {
+            'level': 'DEBUG',
+            'class': 'logging.FileHandler',
+            'filename': 'debug.log',
+        },
+    },
+    'loggers': {
+        'django': {
+            'handlers': ['file'],
+            'level': 'DEBUG',
+            'propagate': True,
+        },
+    },
+}
+
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [os.path.join(BASE_DIR, 'tests/templates')],
+        'APP_DIRS': False,
+        'OPTIONS': {
+            'context_processors': [
+                "user_messages.context_processors.user_messages"
+            ]
+        }
+    },
 ]
 
 INSTALLED_APPS = [
-    "django.contrib.auth",
-    "django.contrib.contenttypes",
-    "django.contrib.sessions",
+    'django.contrib.auth',
+    'django.contrib.sessions',
+    'django.contrib.sites', 
+    'django.contrib.contenttypes',
     "user_messages",
+    'guardian',
+    'geonode.groups',
+    "taggit",
 ]
+
+
+MIDDLEWARE = [
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+]
+
+USE_TZ = True