rename example django project, and some small fixes

StreetVoice · Dec 15, 2013 · fb3d0b3 · fb3d0b3
1 parent 1647858
commit fb3d0b3
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 15 deletions.
diff --git a/demo/svcelery_email b/demo/svcelery_email
diff --git a/djcelery_ses/__init__.py b/djcelery_ses/__init__.py
@@ -1 +1 @@
-__version__ = '0.4.2'
+__version__ = '0.5'
diff --git a/djcelery_ses/admin.py b/djcelery_ses/admin.py
@@ -1,7 +1,9 @@
 from django.contrib import admin
 from svcelery_email.models import Blacklist, MessageLog
 
-admin.site.register(Blacklist)
+class BlacklistAdmin(admin.ModelAdmin):
+    pass
+admin.site.register(Blacklist, BlacklistAdmin)
 
 class MessageLogAdmin(admin.ModelAdmin):
     list_display = ('email', 'result', 'created_at')

diff --git a/djcelery_ses/tasks.py b/djcelery_ses/tasks.py
@@ -26,7 +26,7 @@ def send_email(message, **kwargs):
 
     # check blacklist
     try:
-        Blacklist.objects.get(email=message.to[0])
+        Blacklist.objects.get(email=message.to[0], type=0)
         logger.debug("Email already in blacklist.")
         return
     except Blacklist.DoesNotExist:

diff --git a/example/djcelery_ses b/example/djcelery_ses
@@ -0,0 +1 @@
+../djcelery_ses
diff --git a/demo/demo/__init__.py → example/example/__init__.py b/demo/demo/__init__.py → example/example/__init__.py
diff --git a/demo/demo/settings.py → example/example/settings.py b/demo/demo/settings.py → example/example/settings.py
@@ -1,5 +1,5 @@
 """
-Django settings for demo project.
+Django settings for example project.
 
 For more information on this file, see
 https://docs.djangoproject.com/en/1.6/topics/settings/
@@ -49,9 +49,9 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
-ROOT_URLCONF = 'demo.urls'
+ROOT_URLCONF = 'example.urls'
 
-WSGI_APPLICATION = 'demo.wsgi.application'
+WSGI_APPLICATION = 'example.wsgi.application'
 
 
 # Database

diff --git a/demo/demo/urls.py → example/example/urls.py b/demo/demo/urls.py → example/example/urls.py
@@ -4,9 +4,6 @@
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    # Examples:
-    # url(r'^$', 'demo.views.home', name='home'),
-    # url(r'^blog/', include('blog.urls')),
-
+    url(r'^djcelery_ses/', include('djcelery_ses.urls')),
     url(r'^admin/', include(admin.site.urls)),
 )
diff --git a/demo/demo/wsgi.py → example/example/wsgi.py b/demo/demo/wsgi.py → example/example/wsgi.py
@@ -1,5 +1,5 @@
 """
-WSGI config for demo project.
+WSGI config for example project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -8,7 +8,7 @@
 """
 
 import os
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings")
 
 from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()
diff --git a/demo/manage.py → example/manage.py b/demo/manage.py → example/manage.py
@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings")
 
     from django.core.management import execute_from_command_line
 

diff --git a/demo/requirements.txt → example/requirements.txt b/demo/requirements.txt → example/requirements.txt
diff --git a/setup.py b/setup.py
@@ -1,5 +1,5 @@
 from setuptools import setup, find_packages
-from svcelery_email import __version__
+from djcelery_ses import __version__
 
 
 setup(