diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-09 15:08:11 -0500 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-09 15:08:11 -0500 |
| commit | 3f723bcf54b4d779c66373dc8f69f43923dd586a (patch) | |
| tree | c0a7b3873359750fc8bf02bf9d0b12ee2b813f05 /nova/wsgi.py | |
| parent | 5cd52711c869c9a743157b5fb19bb9e445576fa7 (diff) | |
| download | nova-3f723bcf54b4d779c66373dc8f69f43923dd586a.tar.gz nova-3f723bcf54b4d779c66373dc8f69f43923dd586a.tar.xz nova-3f723bcf54b4d779c66373dc8f69f43923dd586a.zip | |
renaming wsgi.Request.best_match to best_match_content_type; correcting calls to that function in code from trunk
Diffstat (limited to 'nova/wsgi.py')
| -rw-r--r-- | nova/wsgi.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/wsgi.py b/nova/wsgi.py index c3e08522d..2d18da8fb 100644 --- a/nova/wsgi.py +++ b/nova/wsgi.py @@ -85,7 +85,7 @@ class Server(object): class Request(webob.Request): - def best_match(self): + def best_match_content_type(self): """ Determine the most acceptable content-type based on the query extension then the Accept header @@ -354,7 +354,7 @@ class Controller(object): result = method(**arg_dict) if type(result) is dict: - content_type = req.best_match() + content_type = req.best_match_content_type() body = self._serialize(result, content_type) response = webob.Response() |