From 3b3857d295f319c87b10de6d5eaff6308b2bfdda Mon Sep 17 00:00:00 2001
From: Daren Lord <dlaccount@icloud.com>
Date: Tue, 19 Jan 2016 07:22:10 -0800
Subject: [PATCH] Squashed commit of the following:

commit 211d54bb3f0e9fa942e31aa7d48b6cfbb22e126f
Author: Daren Lord <dlaccount@icloud.com>
Date:   Mon Jan 18 21:05:51 2016 -0700

    Fixed pep8 errors

commit 0a8ba6855405b39003f1aeef3b35fa4ef6a27e9e
Author: Daren Lord <dlaccount@icloud.com>
Date:   Mon Jan 18 21:02:02 2016 -0700

    Adding in six.

commit 1abff8f5cf5710d898a963b90be269b0127b1c96
Author: Daren Lord <dlaccount@icloud.com>
Date:   Mon Jan 18 20:57:31 2016 -0700

    Adding in python 3 support for cookielib
---
 pyicloud/base.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyicloud/base.py b/pyicloud/base.py
index 6e5676e..f58d6cb 100644
--- a/pyicloud/base.py
+++ b/pyicloud/base.py
@@ -1,5 +1,5 @@
+import six
 import copy
-import cookielib
 import uuid
 import hashlib
 import json
@@ -20,6 +20,11 @@ from pyicloud.services import (
     RemindersService
 )
 
+if six.PY3:
+    import http.cookiejar as cookielib
+else:
+    import cookielib
+
 
 logger = logging.getLogger(__name__)