Merge ca3a31f into 7a0a5d7

.travis.yml

@@ -3,29 +3,19 @@
 language: python
 
 python:
-  - "3.3"
+  - "3.4"
   - "2.7"
-  - "2.6"
 
 env:
-    - DJANGO="Django==1.5"
-    - DJANGO="Django==1.6"
-    - DJANGO="Django==1.7"
     - DJANGO="Django==1.8"
+    - DJANGO="Django==1.9"
+    - DJANGO="Django==1.10"
 
-matrix:
-    exclude:
-        # Python 2.6 support has been dropped in Django 1.7
-        - python: "2.6"
-          env: DJANGO="Django==1.7"
-        - python: "2.6"
-          env: DJANGO="Django==1.8"
-
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+# command to install dependencies, e.g. pip install -r requirements.txt
 install:
- - pip install $DJANGO --use-mirrors
- - pip install wheel==0.24.0 --use-mirrors
- - pip install -r requirements-test.txt --use-mirrors
+ - pip install $DJANGO
+ - pip install wheel==0.24.0
+ - pip install -r requirements-test.txt
 
 # command to run tests using coverage, e.g. python setup.py test
 script: coverage run --source usersettings runtests.py

example/urls.py

@@ -1,13 +1,12 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.contrib import admin
 from django.views.generic import TemplateView
 
 admin.autodiscover()
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^manage/', include(admin.site.urls)),
     url(r'^current-usersettings/$',
         TemplateView.as_view(template_name='example/current-usersettings.html'),
         name='current_usersettings'),
-)
+]

runtests.py

@@ -1,7 +1,43 @@
 import sys
 
 try:
-    from django.conf import settings
+    import django
+    from django.conf import settings, global_settings as default_settings
+
+    if django.VERSION >= (1, 10):
+        template_settings = dict(
+            TEMPLATES = [
+                {
+                    'BACKEND': 'django.template.backends.django.DjangoTemplates',
+                    'DIRS': (),
+                    'OPTIONS': {
+                        'autoescape': False,
+                        'loaders': (
+                            'django.template.loaders.filesystem.Loader',
+                            'django.template.loaders.app_directories.Loader',
+                        ),
+                        'context_processors': (
+                            'django.template.context_processors.debug',
+                            'django.template.context_processors.request',
+                            'django.contrib.auth.context_processors.auth',
+                            'django.contrib.messages.context_processors.messages',
+                            'usersettings.context_processors.usersettings',
+                        ),
+                    },
+                },
+            ]
+        )
+    else:
+        template_settings = dict(
+            TEMPLATE_LOADERS = (
+                'django.template.loaders.app_directories.Loader',
+                'django.template.loaders.filesystem.Loader',
+            ),
+            TEMPLATE_CONTEXT_PROCESSORS = list(default_settings.TEMPLATE_CONTEXT_PROCESSORS) + [
+                'django.core.context_processors.request',
+                'usersettings.context_processors.usersettings',
+            ],
+        )
 
     settings.configure(
         DEBUG=True,
@@ -33,10 +69,7 @@
             'django.contrib.messages.middleware.MessageMiddleware',
             'usersettings.middleware.CurrentUserSettingsMiddleware',
         ),
-        TEMPLATE_CONTEXT_PROCESSORS = (
-            'django.core.context_processors.request',
-            'usersettings.context_processors.usersettings',
-        )
+        **template_settings
     )
 
     try:

tests/test_admin.py

@@ -98,9 +98,6 @@ def test_changelist_view_redirects_automatically(self):
             'django.contrib.sessions.middleware.SessionMiddleware',
             'django.contrib.auth.middleware.AuthenticationMiddleware',
             'django.contrib.messages.middleware.MessageMiddleware',),
-        TEMPLATE_CONTEXT_PROCESSORS = (
-            'django.core.context_processors.request',
-        ),
     )
     def test_chagelist_view_redirects_to_add_view(self):
         """

usersettings/admin.py

@@ -9,7 +9,6 @@
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
-from django.template.context import RequestContext
 from django.utils.encoding import force_text
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
@@ -118,7 +117,7 @@ def select_site_view(self, request, form_url=''):
         context = {
             'title': _('Add %s') % force_text(self.opts.verbose_name),
             'adminform': adminForm,
-            'is_popup': '_popup' in request.REQUEST,
+            'is_popup': '_popup' in request.GET,
             'media': mark_safe(media),
             'errors': AdminErrorList(form, ()),
             'app_label': self.opts.app_label,
@@ -139,14 +138,12 @@ def render_select_site_form(self, request, context, form_url=''):
             'save_on_top': self.save_on_top,
         })
 
-        context_instance = RequestContext(request, current_app=self.admin_site.name)
-
         return render_to_response(self.select_site_form_template or [
             'admin/%s/%s/select_site_form.html' % (app_label, self.opts.object_name.lower()),
             'admin/%s/select_site_form.html' % app_label,
             'admin/usersettings/select_site_form.html',  # added default here
             'admin/select_site_form.html'
-        ], context, context_instance=context_instance)
+        ], context)
 
     @csrf_protect_m
     def changelist_view(self, request, extra_context=None):

usersettings/apps.py

@@ -3,15 +3,15 @@
 from django.utils.translation import ugettext_lazy as _
 from django.db.models.signals import pre_save, pre_delete
 
-from .models import clear_usersettings_cache
-from .shortcuts import get_usersettings_model
-
 
 class UserSettingsConfig(AppConfig):
     name = 'usersettings'
     verbose_name = _('User Settings')
 
     def ready(self):
+        from .models import clear_usersettings_cache
+        from .shortcuts import get_usersettings_model
+
         usersettings_model = get_usersettings_model()
         pre_save.connect(clear_usersettings_cache, sender=usersettings_model)
         pre_delete.connect(clear_usersettings_cache, sender=usersettings_model)