change req.cookies implementation to parse on demand

* add webob.cookies.parse_cookie for simple parsing
* change _valid_cookie_name implementation to filter out $key and reserved names
* do not cache parsed cookies dict in the environ

1 files changed, 3 insertions, 15 deletions

diff --git a/webob/request.py b/webob/request.py
index cdbce4f..096cac9 100644
--- a/webob/request.py
+++ b/webob/request.py
@@ -10,7 +10,7 @@ from webob.etag import etag_property, AnyETag, NoETag, IfRange
 
 from webob.descriptors import *
 from webob.datetime_utils import *
-from webob.cookies import Cookie
+from webob.cookies import Cookie, parse_cookie
 from webob.util import warn_deprecation
 
 __all__ = ['BaseRequest', 'Request']
@@ -614,23 +614,11 @@ class BaseRequest(object):
         """
         A dictionary of cookies as found in the request.
         """
-        env = self.environ
-        source = env.get('HTTP_COOKIE', '')
-        if 'webob._parsed_cookies' in env:
-            vars, var_source = env['webob._parsed_cookies']
-            if var_source == source:
-                return vars
-
+        data = self.environ.get('HTTP_COOKIE', '')
         encoding = self.charset
         errors = self.unicode_errors
         d = lambda b: b.decode(encoding, errors)
-
-        r = {}
-        if source:
-            cookies = Cookie(source)
-            for name in cookies:
-                r[d(name)] = d(cookies[name].value)
-        env['webob._parsed_cookies'] = (r, source)
+        r = dict((d(k), d(v)) for k,v in parse_cookie(data))
         return r