Merge lp:~wesmason/django-saml2-idp/django1.6 into lp:~ubuntuone-pqm-team/django-saml2-idp/stable

[Wes Mason]

Add django 1.6 compatibility

Hi,
This adds Django 1.6 support, required for Ye Olde SSO upgrade, which I've attempted to get merged upstream here: https://github.com/novapost/django-saml2-idp/pull/2

I attempted to maintain compatibility with <1.6 and kept to the same style as the project's code.

[Ricardo Kirkner (ricardokirkner)]

LGTM, but please fix the pep8 issue before globally approving

review: Approve

=== modified file 'idptest/saml2idp/urls.py'
--- idptest/saml2idp/urls.py	2012-08-23 20:27:29 +0000
+++ idptest/saml2idp/urls.py	2014-07-25 15:48:37 +0000
@@ -1,7 +1,12 @@
-from django.conf.urls.defaults import *
 from views import descriptor, login_begin, login_init, login_process, logout
 from metadata import get_deeplink_resources
 
+try:
+    # Django <1.6
+    from django.conf.urls.defaults import *
+except ImportError:
+    from django.conf.urls import *
+
 def deeplink_url_patterns(
     prefix='',
     url_base_pattern=r'^init/%s/$',

=== modified file 'idptest/saml2idp/views.py'
--- idptest/saml2idp/views.py	2012-08-20 18:41:37 +0000
+++ idptest/saml2idp/views.py	2014-07-25 15:48:37 +0000
@@ -10,7 +10,6 @@
 from django.core.urlresolvers import reverse
 from django.shortcuts import render_to_response, redirect
 from django.template import RequestContext
-from django.views.decorators.csrf import csrf_view_exempt, csrf_response_exempt
 # saml2idp app imports:
 import saml2idp_metadata
 import exceptions
@@ -18,6 +17,19 @@
 import registry
 import xml_signing
 
+try:
+    # Django <1.6
+    from django.views.decorators.csrf import (
+        csrf_view_exempt as csrf_exempt,
+        csrf_response_exempt
+    )
+except ImportError:
+    from django.views.decorators.csrf import csrf_exempt
+
+    def csrf_response_exempt(func):
+        return func
+
+
 def _generate_response(request, processor):
     """
     Generate a SAML response using processor and return it in the proper Django
@@ -35,7 +47,7 @@
 def xml_response(request, template, tv):
     return render_to_response(template, tv, mimetype="application/xml")
 
-@csrf_view_exempt
+@csrf_exempt
 def login_begin(request, *args, **kwargs):
     """
     Receives a SAML 2.0 AuthnRequest from a Service Provider and
@@ -84,7 +96,7 @@
     proc = registry.find_processor(request)
     return _generate_response(request, proc)
 
-@csrf_view_exempt
+@csrf_exempt
 def logout(request):
     """
     Allows a non-SAML 2.0 URL to log out the user and
@@ -97,7 +109,7 @@
                                 context_instance=RequestContext(request))
 
 @login_required
-@csrf_view_exempt
+@csrf_exempt
 def slo_logout(request):
     """
     Receives a SAML 2.0 LogoutRequest from a Service Provider,

=== modified file 'idptest/urls.py'
--- idptest/urls.py	2011-07-15 21:15:11 +0000
+++ idptest/urls.py	2014-07-25 15:48:37 +0000
@@ -1,9 +1,13 @@
-from django.conf.urls.defaults import *
-
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
 admin.autodiscover()
 
+try:
+    # Django <1.6
+    from django.conf.urls.defaults import *
+except ImportError:
+    from django.conf.urls import *
+
 urlpatterns = patterns('',
     # Example:
     # (r'^idptest/', include('idptest.foo.urls')),