From d7b2aa24f75434c2ce50100cfef3586071e0747a Mon Sep 17 00:00:00 2001 From: Дилян Палаузов Date: Wed, 3 Jan 2018 18:52:12 -0500 Subject: Fixed #28982 -- Simplified code with and/or. --- django/http/request.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'django/http') diff --git a/django/http/request.py b/django/http/request.py index 2538e0a012..8a18b59a1d 100644 --- a/django/http/request.py +++ b/django/http/request.py @@ -376,19 +376,17 @@ class QueryDict(MultiValueDict): def __init__(self, query_string=None, mutable=False, encoding=None): super().__init__() - if not encoding: - encoding = settings.DEFAULT_CHARSET - self.encoding = encoding + self.encoding = encoding or settings.DEFAULT_CHARSET query_string = query_string or '' parse_qsl_kwargs = { 'keep_blank_values': True, 'fields_limit': settings.DATA_UPLOAD_MAX_NUMBER_FIELDS, - 'encoding': encoding, + 'encoding': self.encoding, } if isinstance(query_string, bytes): # query_string normally contains URL-encoded data, a subset of ASCII. try: - query_string = query_string.decode(encoding) + query_string = query_string.decode(self.encoding) except UnicodeDecodeError: # ... but some user agents are misbehaving :-( query_string = query_string.decode('iso-8859-1') -- cgit v1.3