From abedc457f9e4099b5cf4c242959d2ef14b078345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Mon, 16 Jun 2014 16:07:15 +0000
Subject: [PATCH] Fix OpenID bug

---
 roles/mailman/templates/settings.py.j2 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/roles/mailman/templates/settings.py.j2 b/roles/mailman/templates/settings.py.j2
index 85849f63cc..37323c1a98 100644
--- a/roles/mailman/templates/settings.py.j2
+++ b/roles/mailman/templates/settings.py.j2
@@ -206,8 +206,11 @@ INSTALLED_APPS = (
 import django
 if django.VERSION[:2] < (1, 6):
     TEST_RUNNER = 'discover_runner.DiscoverRunner'
+else:
+    # Django 1.6 defaults to a JSON serializer, but it won't work with django-openid, see
+    # https://bugs.launchpad.net/django-openid-auth/+bug/1252826
+    SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
 
-SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'
 
 REST_FRAMEWORK = {
     'DEFAULT_RENDERER_CLASSES': (