Merge pull request #7 from kehindeadewusi/django-2.0

Django 2.0

Author: kehindeadewusi

.gitignore

@@ -1 +1,5 @@
 *.pyc
+.idea
+.vscode/
+
+

announcements/management.py

@@ -1,5 +1,4 @@
-from django.db.models import get_models, signals
-
+from django.db.models import signals
 
 try:
     from notification import models as notification
@@ -11,6 +10,6 @@ def create_notice_types(app, created_models, verbosity, **kwargs):
         """
         notification.create_notice_type("announcement", "Announcement", "you have received an announcement")
 
-    signals.post_syncdb.connect(create_notice_types, sender=notification)
+    signals.post_migrate.connect(create_notice_types, sender=notification)
 except ImportError:
-    print "Skipping creation of NoticeTypes as notification app not found"
+    print("Skipping creation of NoticeTypes as notification app not found")

announcements/migrations/0001_initial.py

@@ -0,0 +1,34 @@
+# Generated by Django 2.1 on 2018-09-11 22:44
+
+import datetime
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Announcement',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=50, verbose_name='title')),
+                ('content', models.TextField(verbose_name='content')),
+                ('creation_date', models.DateTimeField(default=datetime.datetime.now, verbose_name='creation_date')),
+                ('site_wide', models.BooleanField(default=False, verbose_name='site wide')),
+                ('members_only', models.BooleanField(default=False, verbose_name='members only')),
+                ('creator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='creator')),
+            ],
+            options={
+                'verbose_name': 'announcement',
+                'verbose_name_plural': 'announcements',
+            },
+        ),
+    ]

announcements/migrations/__init__.py

@@ -2,15 +2,9 @@
 
 from django.db import models
 from django.conf import settings
-from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
-try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
-
 
 class AnnouncementManager(models.Manager):
     """
@@ -48,7 +42,7 @@ class Announcement(models.Model):
     """
     title = models.CharField(_("title"), max_length=50)
     content = models.TextField(_("content"))
-    creator = models.ForeignKey(User, verbose_name=_("creator"))
+    creator = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_("creator"), on_delete=models.CASCADE)
     creation_date = models.DateTimeField(_("creation_date"), default=datetime.now)
     site_wide = models.BooleanField(_("site wide"), default=False)
     members_only = models.BooleanField(_("members only"), default=False)
@@ -57,9 +51,8 @@ class Announcement(models.Model):
 
     def get_absolute_url(self):
         return ("announcement_detail", [str(self.pk)])
-    get_absolute_url = models.permalink(get_absolute_url)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     class Meta:

announcements/models.py

@@ -1,5 +1,5 @@
-from django.conf.urls.defaults import *
-from django.views.generic import list_detail
+from django.urls import path
+from django.views.generic.list import ListView
 
 from announcements.models import Announcement
 from announcements.views import *
@@ -9,10 +9,10 @@
     "queryset": Announcement.objects.all(),
 }
 
-urlpatterns = patterns("",
-    url(r"^(?P<object_id>\d+)/$", list_detail.object_detail,
+urlpatterns = [
+    path('<int:object_id>/', ListView.as_view(),
         announcement_detail_info, name="announcement_detail"),
-    url(r"^(?P<object_id>\d+)/hide/$", announcement_hide,
+    path('<int:object_id>/hide/', announcement_hide,
         name="announcement_hide"),
-    url(r"^$", announcement_list, name="announcement_home"),
-)
+    path('', announcement_list, name="announcement_home"),
+]

announcements/urls.py

@@ -1,13 +1,9 @@
 from django.http import HttpResponseRedirect
-from django.views.generic import list_detail
+from django.views.generic.list import ListView
 from django.shortcuts import get_object_or_404
 
 from announcements.models import Announcement, current_announcements_for_request
 
-try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
 
 
 def announcement_list(request):
@@ -17,7 +13,7 @@ def announcement_list(request):
     announcements.
     """
     queryset = current_announcements_for_request(request)
-    return list_detail.object_list(request, **{
+    return ListView.as_view(request, **{
         "queryset": queryset,
         "allow_empty": True,
     })

announcements/views.py

@@ -0,0 +1,29 @@
+Metadata-Version: 1.1
+Name: django-announcements
+Version: 0.1.2
+Summary: Announcements for your Django powered website.
+Home-page: http://code.google.com/p/django-announcements
+Author: Brian Rosner
+Author-email: [email protected]
+License: MIT
+Description: Some sites need the ability to broadcast an announcement to all of their
+        users. django-announcements was created precisely for this reason. How you
+        present the announcement is up to you as the site-developer. When working with
+        announcements that are presented on the website one feature is that they are
+        only viewed once. A session variable will hold which announcements an user has
+        viewed and exclude that from their display. announcements supports two
+        different types of filtering of announcements:
+        
+         * site-wide (this can be presented to anonymous users)
+         * non site-wide (these can be used a strictly a mailing if so desired)
+         * members only (announcements are filtered based on the value of
+           ``request.user``)
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 3 - Alpha
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Framework :: Django

django_announcements.egg-info/PKG-INFO

@@ -0,0 +1,22 @@
+AUTHORS
+MANIFEST.in
+README
+announcements/__init__.py
+announcements/admin.py
+announcements/context_processors.py
+announcements/feeds.py
+announcements/forms.py
+announcements/management.py
+announcements/models.py
+announcements/tests.py
+announcements/urls.py
+announcements/views.py
+announcements/templates/notification/announcement/full.txt
+announcements/templatetags/__init__.py
+announcements/templatetags/announcement_tags.py
+django_announcements.egg-info/PKG-INFO
+django_announcements.egg-info/SOURCES.txt
+django_announcements.egg-info/dependency_links.txt
+django_announcements.egg-info/top_level.txt
+docs/index.txt
+docs/usage.txt

django_announcements.egg-info/SOURCES.txt

@@ -0,0 +1 @@
+

django_announcements.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+announcements