merged from trunk

This commit is contained in:
Andy Smith
2011-01-04 12:57:18 -08:00
49 changed files with 1018 additions and 772 deletions

View File

@@ -288,7 +288,7 @@ class Serializer(object):
needed to serialize a dictionary to that type.
"""
self.metadata = metadata or {}
req = webob.Request(environ)
req = webob.Request.blank('', environ)
suffix = req.path_info.split('.')[-1].lower()
if suffix == 'json':
self.handler = self._to_json