1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Refs #23919 -- Replaced super(ClassName, self) with super().

This commit is contained in:
chillaranand
2017-01-21 18:43:44 +05:30
committed by Tim Graham
parent dc165ec8e5
commit d6eaf7c018
339 changed files with 1221 additions and 1296 deletions

View File

@@ -77,7 +77,7 @@ class Node:
class DummyNode(Node):
def __init__(self, key, origin, error_message):
super(DummyNode, self).__init__(key)
super().__init__(key)
self.origin = origin
self.error_message = error_message

View File

@@ -31,7 +31,7 @@ class FieldOperation(Operation):
def reduce(self, operation, in_between, app_label=None):
return (
super(FieldOperation, self).reduce(operation, in_between, app_label=app_label) or
super().reduce(operation, in_between, app_label=app_label) or
not operation.references_field(self.model_name, self.name, app_label)
)
@@ -44,7 +44,7 @@ class AddField(FieldOperation):
def __init__(self, model_name, name, field, preserve_default=True):
self.field = field
self.preserve_default = preserve_default
super(AddField, self).__init__(model_name, name)
super().__init__(model_name, name)
def deconstruct(self):
kwargs = {
@@ -114,7 +114,7 @@ class AddField(FieldOperation):
field=self.field,
),
]
return super(AddField, self).reduce(operation, in_between, app_label=app_label)
return super().reduce(operation, in_between, app_label=app_label)
class RemoveField(FieldOperation):
@@ -169,7 +169,7 @@ class AlterField(FieldOperation):
def __init__(self, model_name, name, field, preserve_default=True):
self.field = field
self.preserve_default = preserve_default
super(AlterField, self).__init__(model_name, name)
super().__init__(model_name, name)
def deconstruct(self):
kwargs = {
@@ -232,7 +232,7 @@ class AlterField(FieldOperation):
field=self.field,
),
]
return super(AlterField, self).reduce(operation, in_between, app_label=app_label)
return super().reduce(operation, in_between, app_label=app_label)
class RenameField(FieldOperation):
@@ -243,7 +243,7 @@ class RenameField(FieldOperation):
def __init__(self, model_name, old_name, new_name):
self.old_name = old_name
self.new_name = new_name
super(RenameField, self).__init__(model_name, old_name)
super().__init__(model_name, old_name)
@cached_property
def old_name_lower(self):

View File

@@ -33,7 +33,7 @@ class ModelOperation(Operation):
def reduce(self, operation, in_between, app_label=None):
return (
super(ModelOperation, self).reduce(operation, in_between, app_label=app_label) or
super().reduce(operation, in_between, app_label=app_label) or
not operation.references_model(self.name, app_label)
)
@@ -50,7 +50,7 @@ class CreateModel(ModelOperation):
self.options = options or {}
self.bases = bases or (models.Model,)
self.managers = managers or []
super(CreateModel, self).__init__(name)
super().__init__(name)
# Sanity-check that there are no duplicated field names, bases, or
# manager names
_check_for_duplicates('fields', (name for name, _ in self.fields))
@@ -223,7 +223,7 @@ class CreateModel(ModelOperation):
managers=self.managers,
),
]
return super(CreateModel, self).reduce(operation, in_between, app_label=app_label)
return super().reduce(operation, in_between, app_label=app_label)
class DeleteModel(ModelOperation):
@@ -266,7 +266,7 @@ class RenameModel(ModelOperation):
def __init__(self, old_name, new_name):
self.old_name = old_name
self.new_name = new_name
super(RenameModel, self).__init__(old_name)
super().__init__(old_name)
@cached_property
def old_name_lower(self):
@@ -429,7 +429,7 @@ class AlterModelTable(ModelOperation):
def __init__(self, name, table):
self.table = table
super(AlterModelTable, self).__init__(name)
super().__init__(name)
def deconstruct(self):
kwargs = {
@@ -476,14 +476,14 @@ class AlterModelTable(ModelOperation):
def reduce(self, operation, in_between, app_label=None):
if isinstance(operation, (AlterModelTable, DeleteModel)) and self.name_lower == operation.name_lower:
return [operation]
return super(AlterModelTable, self).reduce(operation, in_between, app_label=app_label)
return super().reduce(operation, in_between, app_label=app_label)
class ModelOptionOperation(ModelOperation):
def reduce(self, operation, in_between, app_label=None):
if isinstance(operation, (self.__class__, DeleteModel)) and self.name_lower == operation.name_lower:
return [operation]
return super(ModelOptionOperation, self).reduce(operation, in_between, app_label=app_label)
return super().reduce(operation, in_between, app_label=app_label)
class FieldRelatedOptionOperation(ModelOptionOperation):
@@ -492,7 +492,7 @@ class FieldRelatedOptionOperation(ModelOptionOperation):
self.name_lower == operation.model_name_lower and
not self.references_field(operation.model_name, operation.name)):
return [operation, self]
return super(FieldRelatedOptionOperation, self).reduce(operation, in_between, app_label=app_label)
return super().reduce(operation, in_between, app_label=app_label)
class AlterUniqueTogether(FieldRelatedOptionOperation):
@@ -505,7 +505,7 @@ class AlterUniqueTogether(FieldRelatedOptionOperation):
def __init__(self, name, unique_together):
unique_together = normalize_together(unique_together)
self.unique_together = set(tuple(cons) for cons in unique_together)
super(AlterUniqueTogether, self).__init__(name)
super().__init__(name)
def deconstruct(self):
kwargs = {
@@ -559,7 +559,7 @@ class AlterIndexTogether(FieldRelatedOptionOperation):
def __init__(self, name, index_together):
index_together = normalize_together(index_together)
self.index_together = set(tuple(cons) for cons in index_together)
super(AlterIndexTogether, self).__init__(name)
super().__init__(name)
def deconstruct(self):
kwargs = {
@@ -610,7 +610,7 @@ class AlterOrderWithRespectTo(FieldRelatedOptionOperation):
def __init__(self, name, order_with_respect_to):
self.order_with_respect_to = order_with_respect_to
super(AlterOrderWithRespectTo, self).__init__(name)
super().__init__(name)
def deconstruct(self):
kwargs = {
@@ -685,7 +685,7 @@ class AlterModelOptions(ModelOptionOperation):
def __init__(self, name, options):
self.options = options
super(AlterModelOptions, self).__init__(name)
super().__init__(name)
def deconstruct(self):
kwargs = {
@@ -726,7 +726,7 @@ class AlterModelManagers(ModelOptionOperation):
def __init__(self, name, managers):
self.managers = managers
super(AlterModelManagers, self).__init__(name)
super().__init__(name)
def deconstruct(self):
return (

View File

@@ -136,7 +136,7 @@ class FloatSerializer(BaseSimpleSerializer):
def serialize(self):
if math.isnan(self.value) or math.isinf(self.value):
return 'float("{}")'.format(self.value), set()
return super(FloatSerializer, self).serialize()
return super().serialize()
class FrozensetSerializer(BaseSequenceSerializer):

View File

@@ -246,7 +246,7 @@ class AppConfigStub(AppConfig):
# App-label and app-name are not the same thing, so technically passing
# in the label here is wrong. In practice, migrations don't care about
# the app name, but we need something unique, and the label works fine.
super(AppConfigStub, self).__init__(label, None)
super().__init__(label, None)
def import_models(self):
self.models = self.apps.all_models[self.label]
@@ -271,7 +271,7 @@ class StateApps(Apps):
# Populate the app registry with a stub for each application.
app_labels = {model_state.app_label for model_state in models.values()}
app_configs = [AppConfigStub(label) for label in sorted(real_apps + list(app_labels))]
super(StateApps, self).__init__(app_configs)
super().__init__(app_configs)
# The lock gets in the way of copying as implemented in clone(), which
# is called whenever Django duplicates a StateApps before updating it.