NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-22 13:22:24 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Closes #2614: Simplify calls of super() for Python 3

Browse Source
This commit is contained in:
Jeremy Stretch
2018-11-27 10:52:24 -05:00
parent 7d262296e1
commit bd7aee7c1f
46 changed files with 193 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/extras/admin.py
View File

@@ -28,7 +28,7 @@ class WebhookForm(forms.ModelForm):
exclude = []
def __init__(self, *args, **kwargs):
super(WebhookForm, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
order_content_types(self.fields['obj_type'])
@@ -56,7 +56,7 @@ class CustomFieldForm(forms.ModelForm):
exclude = []
def __init__(self, *args, **kwargs):
super(CustomFieldForm, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
order_content_types(self.fields['obj_type'])
@@ -96,7 +96,7 @@ class ExportTemplateForm(forms.ModelForm):
exclude = []
def __init__(self, *args, **kwargs):
super(ExportTemplateForm, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
# Format ContentType choices
order_content_types(self.fields['content_type'])

6
netbox/extras/api/customfields.py
View File

@@ -105,7 +105,7 @@ class CustomFieldModelSerializer(ValidatedModelSerializer):
custom_fields[cfv.field.name] = cfv.value
instance.custom_fields = custom_fields
super(CustomFieldModelSerializer, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
if self.instance is not None:
@@ -137,7 +137,7 @@ class CustomFieldModelSerializer(ValidatedModelSerializer):
with transaction.atomic():
instance = super(CustomFieldModelSerializer, self).create(validated_data)
instance = super().create(validated_data)
# Save custom fields
if custom_fields is not None:
@@ -152,7 +152,7 @@ class CustomFieldModelSerializer(ValidatedModelSerializer):
with transaction.atomic():
instance = super(CustomFieldModelSerializer, self).update(instance, validated_data)
instance = super().update(instance, validated_data)
# Save custom fields
if custom_fields is not None:

2
netbox/extras/api/serializers.py
View File

@@ -108,7 +108,7 @@ class ImageAttachmentSerializer(ValidatedModelSerializer):
)
# Enforce model validation
super(ImageAttachmentSerializer, self).validate(data)
super().validate(data)
return data

4
netbox/extras/api/views.py
View File

@@ -50,7 +50,7 @@ class CustomFieldModelViewSet(ModelViewSet):
custom_field_choices[cfc.id] = cfc.value
custom_field_choices = custom_field_choices
context = super(CustomFieldModelViewSet, self).get_serializer_context()
context = super().get_serializer_context()
context.update({
'custom_fields': custom_fields,
'custom_field_choices': custom_field_choices,
@@ -59,7 +59,7 @@ class CustomFieldModelViewSet(ModelViewSet):
def get_queryset(self):
# Prefetch custom field values
return super(CustomFieldModelViewSet, self).get_queryset().prefetch_related('custom_field_values__field')
return super().get_queryset().prefetch_related('custom_field_values__field')
#

4
netbox/extras/filters.py
View File

@@ -17,7 +17,7 @@ class CustomFieldFilter(django_filters.Filter):
def __init__(self, custom_field, *args, **kwargs):
self.cf_type = custom_field.type
self.filter_logic = custom_field.filter_logic
super(CustomFieldFilter, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
def filter(self, queryset, value):
@@ -63,7 +63,7 @@ class CustomFieldFilterSet(django_filters.FilterSet):
"""
def __init__(self, *args, **kwargs):
super(CustomFieldFilterSet, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
obj_type = ContentType.objects.get_for_model(self._meta.model)
custom_fields = CustomField.objects.filter(obj_type=obj_type).exclude(filter_logic=CF_FILTER_DISABLED)

10
netbox/extras/forms.py
View File

@@ -102,7 +102,7 @@ class CustomFieldForm(forms.ModelForm):
self.custom_fields = []
self.obj_type = ContentType.objects.get_for_model(self._meta.model)
super(CustomFieldForm, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
# Add all applicable CustomFields to the form
custom_fields = []
@@ -138,7 +138,7 @@ class CustomFieldForm(forms.ModelForm):
cfv.save()
def save(self, commit=True):
obj = super(CustomFieldForm, self).save(commit)
obj = super().save(commit)
# Handle custom fields the same way we do M2M fields
if commit:
@@ -152,7 +152,7 @@ class CustomFieldForm(forms.ModelForm):
class CustomFieldBulkEditForm(BulkEditForm):
def __init__(self, *args, **kwargs):
super(CustomFieldBulkEditForm, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self.custom_fields = []
self.obj_type = ContentType.objects.get_for_model(self.model)
@@ -175,7 +175,7 @@ class CustomFieldFilterForm(forms.Form):
self.obj_type = ContentType.objects.get_for_model(self.model)
super(CustomFieldFilterForm, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
# Add all applicable CustomFields to the form
custom_fields = get_custom_fields_for_model(self.obj_type, filterable_only=True).items()
@@ -199,7 +199,7 @@ class TagForm(BootstrapMixin, forms.ModelForm):
class AddRemoveTagsForm(forms.Form):
def __init__(self, *args, **kwargs):
super(AddRemoveTagsForm, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
# Add add/remove tags fields
self.fields['add_tags'] = TagField(required=False)

8
netbox/extras/models.py
View File

@@ -261,7 +261,7 @@ class CustomFieldValue(models.Model):
if self.pk and self.value is None:
self.delete()
else:
super(CustomFieldValue, self).save(*args, **kwargs)
super().save(*args, **kwargs)
class CustomFieldChoice(models.Model):
@@ -293,7 +293,7 @@ class CustomFieldChoice(models.Model):
def delete(self, using=None, keep_parents=False):
# When deleting a CustomFieldChoice, delete all CustomFieldValues which point to it
pk = self.pk
super(CustomFieldChoice, self).delete(using, keep_parents)
super().delete(using, keep_parents)
CustomFieldValue.objects.filter(field__type=CF_TYPE_SELECT, serialized_value=str(pk)).delete()
@@ -603,7 +603,7 @@ class ImageAttachment(models.Model):
_name = self.image.name
super(ImageAttachment, self).delete(*args, **kwargs)
super().delete(*args, **kwargs)
# Delete file from disk
self.image.delete(save=False)
@@ -841,7 +841,7 @@ class ObjectChange(models.Model):
self.user_name = self.user.username
self.object_repr = str(self.changed_object)
return super(ObjectChange, self).save(*args, **kwargs)
return super().save(*args, **kwargs)
def get_absolute_url(self):
return reverse('extras:objectchange', args=[self.pk])

8
netbox/extras/tests/test_api.py
View File

@@ -14,7 +14,7 @@ class GraphTest(APITestCase):
def setUp(self):
super(GraphTest, self).setUp()
super().setUp()
self.graph1 = Graph.objects.create(
type=GRAPH_TYPE_SITE, name='Test Graph 1', source='http://example.com/graphs.py?site={{ obj.name }}&foo=1'
@@ -118,7 +118,7 @@ class ExportTemplateTest(APITestCase):
def setUp(self):
super(ExportTemplateTest, self).setUp()
super().setUp()
self.content_type = ContentType.objects.get_for_model(Device)
self.exporttemplate1 = ExportTemplate.objects.create(
@@ -225,7 +225,7 @@ class TagTest(APITestCase):
def setUp(self):
super(TagTest, self).setUp()
super().setUp()
self.tag1 = Tag.objects.create(name='Test Tag 1', slug='test-tag-1')
self.tag2 = Tag.objects.create(name='Test Tag 2', slug='test-tag-2')
@@ -316,7 +316,7 @@ class ConfigContextTest(APITestCase):
def setUp(self):
super(ConfigContextTest, self).setUp()
super().setUp()
self.configcontext1 = ConfigContext.objects.create(
name='Test Config Context 1',

2
netbox/extras/tests/test_customfields.py
View File

@@ -101,7 +101,7 @@ class CustomFieldAPITest(APITestCase):
def setUp(self):
super(CustomFieldAPITest, self).setUp()
super().setUp()
content_type = ContentType.objects.get_for_model(Site)

2
netbox/extras/tests/test_tags.py
View File

@@ -12,7 +12,7 @@ class TaggedItemTest(APITestCase):
def setUp(self):
super(TaggedItemTest, self).setUp()
super().setUp()
def test_create_tagged_item(self):