Merged in lp:~elachuni/django-openid-auth/django1.1-support

django_openid_auth/views.py

@@ -40,7 +40,10 @@ from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.template.loader import render_to_string
-from django.views.decorators.csrf import csrf_exempt
+try:
+    from django.views.decorators.csrf import csrf_exempt
+except ImportError:
+    from django.contrib.csrf.middleware import csrf_exempt
 
 from openid.consumer.consumer import (
     Consumer, SUCCESS, CANCEL, FAILURE)

example_consumer/settings.py

@@ -86,11 +86,21 @@ TEMPLATE_LOADERS = (
 #     'django.template.loaders.eggs.load_template_source',
 )
 
+# django-openid-auth will *not* work with Django 1.1.1 or older, as it's
+# missing the csrf_token template tag.  This will allow it to work with
+# Django 1.1.2 or later:
+try: 
+    import django.middleware.csrf
+except ImportError:
+    csrf_middleware = 'django.contrib.csrf.middleware.CsrfViewMiddleware'
+else:
+    csrf_middleware = 'django.middleware.csrf.CsrfViewMiddleware'
+
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
+    csrf_middleware,
 )
 
 ROOT_URLCONF = 'example_consumer.urls'

setup.py

@@ -76,5 +76,5 @@ setup(
         'django_openid_auth': ['templates/openid/*.html'],
         },
     provides=['django_openid_auth'],
-    requires=['django (>=1.2)', 'openid (>=2.2.0)'],
+    requires=['django (>=1.1.2)', 'openid (>=2.2.0)'],
     )