From bb64d0de5429ef668b8e1a6dd7979b680871b5b9 Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@gmail.com>
Date: Wed, 25 Jan 2017 23:59:57 -0800
Subject: [PATCH] url-rewrite cookie store: decode() only if redis returns byte
 strings in py3

---
 pywb/urlrewrite/cookies.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pywb/urlrewrite/cookies.py b/pywb/urlrewrite/cookies.py
index 5275d3b2..aa1bf0d1 100644
--- a/pywb/urlrewrite/cookies.py
+++ b/pywb/urlrewrite/cookies.py
@@ -42,8 +42,10 @@ class CookieTracker(object):
                 continue
 
             for n, v in six.iteritems(res):
-                n = n.decode('utf-8')
-                v = v.decode('utf-8')
+                if six.PY3 and type(n) == six.binary_type:
+                    n = n.decode('utf-8')
+                    v = v.decode('utf-8')
+
                 full = n + '=' + v
                 cookies.append(full.split(';')[0])