remove support for django 1.5.x, stuff not needed any more when requiring >= 1.6

.travis.yml

@@ -14,7 +14,6 @@ env:
       - TEST_OPTS=""
       - COVERAGE=""
     matrix:
-      - DJANGO=1.5.10
       - DJANGO=1.6.7
 matrix:
   exclude:

docs/security.rst

@@ -171,14 +171,6 @@ Obviously, this might lead to security issues with stealing, modifying and
 faking domain cookies.
 
 
-Sessions
-========
-
-We use Django's more safe JSONSerializer to serialize session data.
-For Django >=1.5.3, the serializer is configurable.
-For Django >=1.6 json will be the default rather than the less safe pickle format.
-
-
 Django's SECRET_KEY
 ===================
 

nsupdate/login/urls.py

@@ -13,12 +13,6 @@ urlpatterns = patterns(
         {'template_name': 'password_reset.html'}, name='password_reset'),
     url(r'^password_reset_done/$', 'django.contrib.auth.views.password_reset_done',
         {'template_name': 'password_reset_done.html'}, name='password_reset_done'),
-    # for django 1.5.x:
-    # 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})/$',
-    #     'django.contrib.auth.views.password_reset_confirm',
-    #     {'template_name': 'password_reset_confirm.html'}, name='password_reset_confirm'),
-    #
-    # for django 1.6.x:
     url(r'^password_reset_confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
         'django.contrib.auth.views.password_reset_confirm',
         {'template_name': 'password_reset_confirm.html'}, name='password_reset_confirm'),

nsupdate/settings/base.py

@@ -247,8 +247,6 @@ SESSION_COOKIE_HTTPONLY = True
 SESSION_COOKIE_AGE = 14 * 24 * 60 * 60  # 14 days, in seconds (remember_me is True)
 SESSION_EXPIRE_AT_BROWSER_CLOSE = True  # more safe (remember_me is False)
 
-SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'
-
 # python-social-auth settings
 
 AUTHENTICATION_BACKENDS = (

setup.py

@@ -56,8 +56,6 @@ setup(
     install_requires=install_requires + [
         'netaddr',
         'django >=1.6, <1.7',  # 1.7 is not tested yet
-        # django >= 1.5.3 also works, but needs a code change, see
-        # https://github.com/nsupdate-info/nsupdate.info/issues/141
         'south',
         'django-bootstrap-form',
         'django-registration',