summaryrefslogtreecommitdiff
path: root/django/core/files
diff options
context:
space:
mode:
authorchillaranand <anand21nanda@gmail.com>2017-01-21 18:43:44 +0530
committerTim Graham <timograham@gmail.com>2017-01-25 12:23:46 -0500
commitd6eaf7c0183cd04b78f2a55e1d60bb7e59598310 (patch)
treeab02fd9949d4bfa23e27dea45e213ce334c883f0 /django/core/files
parentdc165ec8e5698ffc6dee6b510f1f92c9fd7467fe (diff)
Refs #23919 -- Replaced super(ClassName, self) with super().
Diffstat (limited to 'django/core/files')
-rw-r--r--django/core/files/base.py2
-rw-r--r--django/core/files/uploadedfile.py9
-rw-r--r--django/core/files/uploadhandler.py6
3 files changed, 8 insertions, 9 deletions
diff --git a/django/core/files/base.py b/django/core/files/base.py
index 225c6dd349..9030ed9155 100644
--- a/django/core/files/base.py
+++ b/django/core/files/base.py
@@ -137,7 +137,7 @@ class ContentFile(File):
"""
def __init__(self, content, name=None):
stream_class = StringIO if isinstance(content, str) else BytesIO
- super(ContentFile, self).__init__(stream_class(content), name=name)
+ super().__init__(stream_class(content), name=name)
self.size = len(content)
def __str__(self):
diff --git a/django/core/files/uploadedfile.py b/django/core/files/uploadedfile.py
index f5ab68f0fc..9f1efde419 100644
--- a/django/core/files/uploadedfile.py
+++ b/django/core/files/uploadedfile.py
@@ -24,7 +24,7 @@ class UploadedFile(File):
DEFAULT_CHUNK_SIZE = 64 * 2 ** 10
def __init__(self, file=None, name=None, content_type=None, size=None, charset=None, content_type_extra=None):
- super(UploadedFile, self).__init__(file, name)
+ super().__init__(file, name)
self.size = size
self.content_type = content_type
self.charset = charset
@@ -59,7 +59,7 @@ class TemporaryUploadedFile(UploadedFile):
"""
def __init__(self, name, content_type, size, charset, content_type_extra=None):
file = tempfile.NamedTemporaryFile(suffix='.upload', dir=settings.FILE_UPLOAD_TEMP_DIR)
- super(TemporaryUploadedFile, self).__init__(file, name, content_type, size, charset, content_type_extra)
+ super().__init__(file, name, content_type, size, charset, content_type_extra)
def temporary_file_path(self):
"""
@@ -82,7 +82,7 @@ class InMemoryUploadedFile(UploadedFile):
A file uploaded into memory (i.e. stream-to-memory).
"""
def __init__(self, file, field_name, name, content_type, size, charset, content_type_extra=None):
- super(InMemoryUploadedFile, self).__init__(file, name, content_type, size, charset, content_type_extra)
+ super().__init__(file, name, content_type, size, charset, content_type_extra)
self.field_name = field_name
def open(self, mode=None):
@@ -103,8 +103,7 @@ class SimpleUploadedFile(InMemoryUploadedFile):
"""
def __init__(self, name, content, content_type='text/plain'):
content = content or b''
- super(SimpleUploadedFile, self).__init__(BytesIO(content), None, name,
- content_type, len(content), None, None)
+ super().__init__(BytesIO(content), None, name, content_type, len(content), None, None)
@classmethod
def from_dict(cls, file_dict):
diff --git a/django/core/files/uploadhandler.py b/django/core/files/uploadhandler.py
index e8f87845c9..a6832491c1 100644
--- a/django/core/files/uploadhandler.py
+++ b/django/core/files/uploadhandler.py
@@ -133,13 +133,13 @@ class TemporaryFileUploadHandler(FileUploadHandler):
Upload handler that streams data into a temporary file.
"""
def __init__(self, *args, **kwargs):
- super(TemporaryFileUploadHandler, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
def new_file(self, *args, **kwargs):
"""
Create the file object to append to as data is coming in.
"""
- super(TemporaryFileUploadHandler, self).new_file(*args, **kwargs)
+ super().new_file(*args, **kwargs)
self.file = TemporaryUploadedFile(self.file_name, self.content_type, 0, self.charset, self.content_type_extra)
def receive_data_chunk(self, raw_data, start):
@@ -168,7 +168,7 @@ class MemoryFileUploadHandler(FileUploadHandler):
self.activated = True
def new_file(self, *args, **kwargs):
- super(MemoryFileUploadHandler, self).new_file(*args, **kwargs)
+ super().new_file(*args, **kwargs)
if self.activated:
self.file = BytesIO()
raise StopFutureHandlers()