merge conflicts

1 files changed, 26 insertions, 2 deletions

diff --git a/webtest/utils.py b/webtest/utils.py
index a81b041..fa3ad3f 100644
--- a/webtest/utils.py
+++ b/webtest/utils.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-from webtest.compat import name2codepoint
-from webtest.compat import urlencode
+from webtest.compat import MutableMapping, name2codepoint, urlencode
 from json import dumps
 from six import binary_type
 from six import text_type
@@ -9,6 +8,31 @@ import functools
 import re
 
 
+class CleverCookieDict(MutableMapping):
+    def __init__(self, morsels):
+        self.morsels = morsels
+
+    def __getitem__(self, k):
+        return self.morsels[k].value
+
+    def __setitem__(self, k, v):
+        morsel = self.morsels.setdefault(k, Morsel())
+        morsel.set(k, v)
+
+    def __delitem__(self, k):
+        del self.morsels[k]
+
+    def __iter__(self):
+        return iter(self.morsels)
+
+    def __len__(self):
+        return len(self.morsels)
+
+    def __repr__(self):
+        return "{0.__class__.__name__}({1!r})".format(
+            self, dict((k, v.value) for k, v in self.morsels.items()))
+
+
 class NoDefault(object):
     def __repr__(self):
         return '<NoDefault>'