diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2017-01-26 10:08:08 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-02-06 14:12:06 -0500 |
| commit | 3bb6a4390c0a57da991fcb1c0642b9b3fccff751 (patch) | |
| tree | f958fe5cf95e3a5285e3bb595da4f7cf27567d58 /django/http/multipartparser.py | |
| parent | 24b82cd201e21060fbc02117dc16d1702877a1f3 (diff) | |
Refs #27753 -- Favored force/smart_str() over force/smart_text().
Diffstat (limited to 'django/http/multipartparser.py')
| -rw-r--r-- | django/http/multipartparser.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py index f6f12ca718..e235024d0e 100644 --- a/django/http/multipartparser.py +++ b/django/http/multipartparser.py @@ -17,7 +17,7 @@ from django.core.files.uploadhandler import ( SkipFile, StopFutureHandlers, StopUpload, ) from django.utils.datastructures import MultiValueDict -from django.utils.encoding import force_text +from django.utils.encoding import force_str from django.utils.text import unescape_entities __all__ = ('MultiPartParser', 'MultiPartParserError', 'InputStreamExhausted') @@ -164,7 +164,7 @@ class MultiPartParser: transfer_encoding = meta_data.get('content-transfer-encoding') if transfer_encoding is not None: transfer_encoding = transfer_encoding[0].strip() - field_name = force_text(field_name, encoding, errors='replace') + field_name = force_str(field_name, encoding, errors='replace') if item_type == FIELD: # Avoid storing more than DATA_UPLOAD_MAX_NUMBER_FIELDS. @@ -199,12 +199,12 @@ class MultiPartParser: num_bytes_read > settings.DATA_UPLOAD_MAX_MEMORY_SIZE): raise RequestDataTooBig('Request body exceeded settings.DATA_UPLOAD_MAX_MEMORY_SIZE.') - self._post.appendlist(field_name, force_text(data, encoding, errors='replace')) + self._post.appendlist(field_name, force_str(data, encoding, errors='replace')) elif item_type == FILE: # This is a file, use the handler... file_name = disposition.get('filename') if file_name: - file_name = force_text(file_name, encoding, errors='replace') + file_name = force_str(file_name, encoding, errors='replace') file_name = self.IE_sanitize(unescape_entities(file_name)) if not file_name: continue @@ -290,7 +290,7 @@ class MultiPartParser: file_obj = handler.file_complete(counters[i]) if file_obj: # If it returns a file object, then set the files dict. - self._files.appendlist(force_text(old_field_name, self._encoding, errors='replace'), file_obj) + self._files.appendlist(force_str(old_field_name, self._encoding, errors='replace'), file_obj) break def IE_sanitize(self, filename): |
