Fix several issues for Django 1.6

.travis.yml

@@ -1,5 +1,8 @@
 language: python
 python:
+  - 2.6
+  - 2.7
+install:
 - '2.6'
 - '2.7'
 env:
@@ -7,10 +10,11 @@ env:
     # $TRANSIFEX_PASSWORD for oscar_bot (used in transifex.sh)
     secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
   matrix:
-  - DJANGO_VERSION=1.4.8
-  - DJANGO_VERSION=1.5.4
+  - DJANGO_VERSION=Django==1.4.8
+  - DJANGO_VERSION=Django==1.5.4
+  - DJANGO_VERSION=http://github.com/django/django/tarball/stable/1.6.x
 install:
-- easy_install Django==$DJANGO_VERSION
+- easy_install $DJANGO_VERSION
 script:
 - make travis
 after_success:

oscar/app.py

@@ -22,6 +22,13 @@ class Shop(Application):
     offer_app = get_class('offer.app', 'application')
 
     def get_urls(self):
+        #After we drop support for Django<1.6 the following line won't be
+        #necessary, and the parameter uidb36 should be replaced with uidb64.
+        #The necessary update should also be done in oscar/apps/customer/utils.py
+        password_reset_confirm = getattr(auth_views,
+                                         'password_reset_confirm_uidb36',
+                                         auth_views.password_reset_confirm)
+
         urlpatterns = patterns('',
             (r'^i18n/', include('django.conf.urls.i18n')),
             (r'^catalogue/', include(self.catalogue_app.urls)),
@@ -44,7 +51,7 @@ class Shop(Application):
                 login_forbidden(auth_views.password_reset_done),
                 name='password-reset-done'),
             url(r'^password-reset/confirm/(?P<uidb36>[0-9A-Za-z]{1,13})-(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
-                login_forbidden(auth_views.password_reset_confirm),
+                login_forbidden(password_reset_confirm),
                 {'post_reset_redirect': reverse_lazy('password-reset-complete')},
                 name='password-reset-confirm'),
             url(r'^password-reset/complete/$',

oscar/apps/basket/views.py

@@ -1,10 +1,10 @@
 from urlparse import urlparse
+import json
 
 from django.contrib import messages
 from django.template.loader import render_to_string
 from django.template import RequestContext
 from django.core.urlresolvers import reverse, resolve
-from django.utils import simplejson as json
 from django.db.models import get_model
 from django.http import HttpResponseRedirect, Http404, HttpResponse
 from django.views.generic import FormView, View

oscar/apps/catalogue/abstract_models.py

@@ -844,7 +844,7 @@ class AbstractProductAttributeValue(models.Model):
     value_text = models.CharField(
         _('Text'), max_length=255, blank=True, null=True)
     value_integer = models.IntegerField(_('Integer'), blank=True, null=True)
-    value_boolean = models.BooleanField(_('Boolean'), blank=True)
+    value_boolean = models.NullBooleanField(_('Boolean'), blank=True)
     value_float = models.FloatField(_('Float'), blank=True, null=True)
     value_richtext = models.TextField(_('Richtext'), blank=True, null=True)
     value_date = models.DateField(_('Date'), blank=True, null=True)

oscar/apps/customer/forms.py

@@ -51,7 +51,9 @@ class PasswordResetForm(auth_forms.PasswordResetForm):
         site = get_current_site(request)
         if domain_override is not None:
             site.domain = site.name = domain_override
-        for user in self.users_cache:
+        email = self.cleaned_data['email']
+        users = User._default_manager.filter(email__iexact=email)
+        for user in users:
             # Build reset url
             reset_url = "%s://%s%s" % (
                 'https' if use_https else 'http',

oscar/forms/fields.py

@@ -8,6 +8,7 @@ class ExtendedURLField(fields.URLField):
     Custom field similar to URLField type field, however also accepting and
     validating local relative URLs, ie. '/product/'
     """
+    default_validators = []
 
     def __init__(self, max_length=None, min_length=None, verify_exists=None,
                  *args, **kwargs):

requirements.txt

@@ -1,5 +1,5 @@
 # Development
-django-debug-toolbar
+django-debug-toolbar<=0.9.1
 django-cache-panel
 django-debug-toolbar-template-timings
 django-extensions>=1.2.0,<1.3.0
@@ -18,7 +18,7 @@ coverage>=3.6,<3.7
 django-nose>=1.1,<1.2
 spec>=0.11.1,<0.12
 WebTest>=2.0,<2.1
-django-webtest>=1.5.7,<1.6
+django-webtest>=1.7,<1.8
 detox==0.9.2
 coveralls>=0.1.1,<0.2
 purl>=0.4

sites/sandbox/settings.py

@@ -426,6 +426,11 @@ THUMBNAIL_KEY_PREFIX = 'oscar-sandbox'
 # Use a custom KV store to handle integrity error
 THUMBNAIL_KVSTORE = 'oscar.sorl_kvstore.ConcurrentKVStore'
 
+# Django has switched to JSON serializing for security reasons, but it does not
+# serialize Models. We should resolve this by extending the
+# django/core/serializers/json.Serializer to have the `dumps` function. Also
+# in tests/config.py
+SESSION_SERIALIZER='django.contrib.sessions.serializers.PickleSerializer'
 
 # Try and import local settings which can be used to override any of the above.
 try:

tests/config.py

@@ -71,7 +71,7 @@ def configure():
             'SITE_ID': 1,
             'APPEND_SLASH': True,
             'DDF_DEFAULT_DATA_FIXTURE': 'tests.dynamic_fixtures.OscarDynamicDataFixtureClass',
-            
+            'SESSION_SERIALIZER': 'django.contrib.sessions.serializers.PickleSerializer',
         }
         if django.VERSION >= (1, 5):
             test_settings['INSTALLED_APPS'] += ['tests._site.myauth', ]

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26-1.4, py27-1.4, py26-1.5, py27-1.5
+envlist = py26-1.4, py27-1.4, py26-1.5, py27-1.5, py26-1.6, py27-1.6
 
 [testenv]
 commands = python runtests.py []
@@ -28,3 +28,13 @@ deps = -r{toxinidir}/requirements.txt
 basepython = python2.7
 deps = -r{toxinidir}/requirements.txt
        django==1.5.4
+
+[testenv:py26-1.6]
+basepython = python2.6
+deps = -r{toxinidir}/requirements.txt
+       https://www.djangoproject.com/download/1.6c1/tarball/
+
+[testenv:py27-1.6]
+basepython = python2.7
+deps = -r{toxinidir}/requirements.txt
+       https://www.djangoproject.com/download/1.6c1/tarball/