Not supporting 1.6 anymore or py2.6

Author: paltman

pinax/notifications/compat.py

@@ -1,34 +1,8 @@
-import django
-
-from django.conf import settings
-
-
-# Django 1.5 add support for custom auth user model
-if django.VERSION >= (1, 5):
-    AUTH_USER_MODEL = settings.AUTH_USER_MODEL
-else:
-    AUTH_USER_MODEL = "auth.User"
-
-
-def old_get_user_model():
-    return User
-
 try:
     from django.contrib.contenttypes.fields import GenericForeignKey
 except ImportError:
     from django.contrib.contenttypes.generic import GenericForeignKey  # noqa
 
-try:
-    import importlib
-except ImportError:
-    from django.utils import importlib  # noqa
-
-try:
-    from django.contrib.auth import get_user_model
-except ImportError:
-    from django.contrib.auth.models import User
-    get_user_model = old_get_user_model
-
 try:
     from urllib import quote
 except ImportError:

pinax/notifications/conf.py

@@ -1,9 +1,11 @@
 from __future__ import unicode_literals
 
+import importlib
+
 from django.conf import settings  # noqa
 from django.core.exceptions import ImproperlyConfigured
 
-from .compat import get_model, importlib
+from .compat import get_model
 
 from appconf import AppConf
 

pinax/notifications/engine.py

@@ -5,15 +5,16 @@
 import base64
 
 from django.core.mail import mail_admins
-from django.contrib.sites.models import Site
 from django.utils.six.moves import cPickle as pickle  # pylint: disable-msg=F
 
+from django.contrib.auth import get_user_model
+from django.contrib.sites.models import Site
+
 from .lockfile import FileLock, AlreadyLocked, LockTimeout
 from .models import NoticeQueueBatch
 from .signals import emitted_notices
 from . import models as notification
 
-from .compat import get_user_model
 from .conf import settings
 
 

pinax/notifications/models.py

@@ -13,7 +13,7 @@
 
 from django.contrib.contenttypes.models import ContentType
 
-from .compat import AUTH_USER_MODEL, GenericForeignKey
+from .compat import GenericForeignKey
 from .conf import settings
 from .utils import load_media_defaults, notice_setting_for_user
 
@@ -77,7 +77,7 @@ class NoticeSetting(models.Model):
     of a given type to a given medium.
     """
 
-    user = models.ForeignKey(AUTH_USER_MODEL, verbose_name=_("user"))
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_("user"))
     notice_type = models.ForeignKey(NoticeType, verbose_name=_("notice type"))
     medium = models.CharField(_("medium"), max_length=1, choices=NOTICE_MEDIA)
     send = models.BooleanField(_("send"), default=False)

pinax/notifications/tests/models.py

@@ -1,8 +1,8 @@
 from django.db import models
 
-from ..compat import AUTH_USER_MODEL
+from ..conf import settings
 
 
 class Language(models.Model):
-    user = models.ForeignKey(AUTH_USER_MODEL)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL)
     language = models.CharField("language", max_length=10)

pinax/notifications/tests/test_commands.py

@@ -2,7 +2,8 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 
-from ..compat import get_user_model
+from django.contrib.auth import get_user_model
+
 from ..models import NoticeType, queue
 
 

pinax/notifications/tests/test_models.py

@@ -1,16 +1,17 @@
 import base64
 
-from django.contrib.sites.models import Site
 from django.core import mail
 from django.utils.six.moves import cPickle as pickle
 from django.test import TestCase
 from django.test.utils import override_settings
 
+from django.contrib.auth import get_user_model
+from django.contrib.sites.models import Site
+
 from ..conf import settings
 from ..models import NoticeType, NoticeQueueBatch, NoticeSetting
 from ..models import LanguageStoreNotAvailable
 from ..models import get_notification_language, send_now, send, queue
-from ..compat import get_user_model
 
 from .models import Language
 

pinax/notifications/tests/test_views.py

@@ -1,7 +1,8 @@
 from django.core.urlresolvers import reverse
 from django.test import TestCase, RequestFactory
 
-from ..compat import get_user_model
+from django.contrib.auth import get_user_model
+
 from ..models import NoticeType, NoticeSetting
 from ..views import NoticeSettingsView