From 308cd7b3c699dd8b024f0b4e357fb39d9569d17d Mon Sep 17 00:00:00 2001
From: Eric Holscher <eric@ericholscher.com>
Date: Wed, 15 Nov 2017 08:19:39 -0800
Subject: [PATCH 1/2] Use json to test for celery serializing

---
 readthedocs/core/adapters.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/readthedocs/core/adapters.py b/readthedocs/core/adapters.py
index 0a9daee022f..162c3e54bf3 100644
--- a/readthedocs/core/adapters.py
+++ b/readthedocs/core/adapters.py
@@ -1,7 +1,7 @@
 """Allauth overrides"""
 
 from __future__ import absolute_import
-import pickle
+import json
 import logging
 
 from allauth.account.adapter import DefaultAccountAdapter
@@ -36,8 +36,8 @@ def send_mail(self, template_prefix, email, context):
         removed_keys = []
         for key in list(context.keys()):
             try:
-                _ = pickle.dumps(context[key])  # noqa for F841
-            except (pickle.PickleError, TypeError):
+                _ = json.dumps(context[key])  # noqa for F841
+            except (ValueError, TypeError):
                 removed_keys.append(key)
                 del context[key]
         if removed_keys:

From 2958824f19b95bc292b6eb25381858cdf761724c Mon Sep 17 00:00:00 2001
From: Eric Holscher <eric@ericholscher.com>
Date: Wed, 15 Nov 2017 08:26:51 -0800
Subject: [PATCH 2/2] Fix comment

---
 readthedocs/core/adapters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readthedocs/core/adapters.py b/readthedocs/core/adapters.py
index 162c3e54bf3..170f8954e26 100644
--- a/readthedocs/core/adapters.py
+++ b/readthedocs/core/adapters.py
@@ -32,7 +32,7 @@ def send_mail(self, template_prefix, email, context):
         subject = self.format_email_subject(subject)
 
         # Allauth sends some additional data in the context, remove it if the
-        # pieces can't be pickled
+        # pieces can't be json encoded
         removed_keys = []
         for key in list(context.keys()):
             try: