diff options
-rw-r--r-- | paste/httpheaders.py | 2 | ||||
-rw-r--r-- | paste/wsgiwrappers.py | 2 | ||||
-rw-r--r-- | tests/test_request.py | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/paste/httpheaders.py b/paste/httpheaders.py index c216783..62cc4bd 100644 --- a/paste/httpheaders.py +++ b/paste/httpheaders.py @@ -951,7 +951,7 @@ class _AcceptLanguage(_MultiValueHeader): header = self.__call__(*args, **kwargs) if header is None: return [] - langs = header.split(",") + langs = [v for v in header.split(",") if v] qs = [] for lang in langs: pieces = lang.split(";") diff --git a/paste/wsgiwrappers.py b/paste/wsgiwrappers.py index e9d24e8..e209359 100644 --- a/paste/wsgiwrappers.py +++ b/paste/wsgiwrappers.py @@ -156,7 +156,7 @@ class WSGIRequest(object): if self._languages is not None: return self._languages acceptLanguage = self.environ.get('HTTP_ACCEPT_LANGUAGE') - langs = ACCEPT_LANGUAGE.parse(acceptLanguage) + langs = ACCEPT_LANGUAGE.parse(self.environ) fallback = self.defaults.get('language', 'en-us') if not fallback: return langs diff --git a/tests/test_request.py b/tests/test_request.py index d873401..7b400da 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -11,10 +11,11 @@ def simpleapp(environ, start_response): response_headers = [('Content-type','text/plain')] start_response(status, response_headers) request = WSGIRequest(environ) - return ['Hello world!\n', 'The get is %s' % str(request.GET), - ' and Val is %s' % request.GET.get('name'), - 'The languages are: %s' % request.languages, - 'The accepttypes is: %s' % request.match_accept(['text/html', 'application/xml'])] + return [ + 'Hello world!\n', 'The get is %s' % str(request.GET), + ' and Val is %s\n' % request.GET.get('name'), + 'The languages are: %s\n' % request.languages, + 'The accepttypes is: %s\n' % request.match_accept(['text/html', 'application/xml'])] def test_gets(): app = TestApp(simpleapp) |