diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-03 12:45:34 -0500 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-03 12:45:34 -0500 |
| commit | 6d075754bdd4090342bf4f79c726a52923c311a8 (patch) | |
| tree | 8b53dc827d6f35ff4011c8b3b9a720244f8d87c3 /nova/wsgi.py | |
| parent | a62e603e8b1cedd89ca0c71f1cdc928d19c68a4d (diff) | |
| download | nova-6d075754bdd4090342bf4f79c726a52923c311a8.tar.gz nova-6d075754bdd4090342bf4f79c726a52923c311a8.tar.xz nova-6d075754bdd4090342bf4f79c726a52923c311a8.zip | |
adding wsgi.Controller and wsgi.Request testing; fixing format keyword argument exception
Diffstat (limited to 'nova/wsgi.py')
| -rw-r--r-- | nova/wsgi.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/wsgi.py b/nova/wsgi.py index 67216d540..4577439cb 100644 --- a/nova/wsgi.py +++ b/nova/wsgi.py @@ -339,6 +339,8 @@ class Controller(object): method = getattr(self, action) del arg_dict['controller'] del arg_dict['action'] + if 'format' in arg_dict: + del arg_dict['format'] arg_dict['req'] = req result = method(**arg_dict) if type(result) is dict: @@ -379,7 +381,7 @@ class Serializer(object): needed to serialize a dictionary to that type. """ self.metadata = metadata or {} - req = wsgi.Request.blank('', environ) + req = Request.blank('', environ) suffix = req.path_info.split('.')[-1].lower() if suffix == 'json': self.handler = self._to_json |