From 761ac9230bbbf00f91641f53da8bb2ad776b0356 Mon Sep 17 00:00:00 2001 From: Andy Gauge Date: Mon, 13 Aug 2018 11:14:32 -0700 Subject: [PATCH] PEP 8 resolution --- netbox/dcim/models.py | 1 - netbox/netbox/settings.py | 6 +++--- netbox/secrets/api/serializers.py | 1 + .../secrets/migrations/0007_populate_generic_foreign_key.py | 4 +++- netbox/secrets/models.py | 2 +- netbox/secrets/views.py | 6 +++--- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 5aedf39af..0722606b1 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1293,7 +1293,6 @@ class Device(ChangeLoggedModel, ConfigContextModel, CustomFieldModel): objects = DeviceManager() tags = TaggableManager() - csv_headers = [ 'name', 'device_role', 'tenant', 'manufacturer', 'model_name', 'platform', 'serial', 'asset_tag', 'status', diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 93fc80634..f6d1b26fd 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -130,8 +130,6 @@ EMAIL_SUBJECT_PREFIX = '[NetBox] ' # Installed applications INSTALLED_APPS = [ - 'corsheaders', - 'debug_toolbar', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -139,9 +137,10 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'django.contrib.humanize', + 'corsheaders', + 'debug_toolbar', 'django_filters', 'django_tables2', - 'drf_yasg', 'mptt', 'rest_framework', 'taggit', @@ -156,6 +155,7 @@ INSTALLED_APPS = [ 'users', 'utilities', 'virtualization', + 'drf_yasg', ] # Only load django-rq if the webhook backend is enabled diff --git a/netbox/secrets/api/serializers.py b/netbox/secrets/api/serializers.py index 587876487..3e07d8c93 100644 --- a/netbox/secrets/api/serializers.py +++ b/netbox/secrets/api/serializers.py @@ -43,6 +43,7 @@ class SecretObjectRelatedField(serializers.RelatedField): dict.update({'class': 'device'}) return dict + class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer): object = SecretObjectRelatedField(queryset=Secret.objects.all(), required=False) role = NestedSecretRoleSerializer() diff --git a/netbox/secrets/migrations/0007_populate_generic_foreign_key.py b/netbox/secrets/migrations/0007_populate_generic_foreign_key.py index 28ec6e85b..b3cc2a9f4 100644 --- a/netbox/secrets/migrations/0007_populate_generic_foreign_key.py +++ b/netbox/secrets/migrations/0007_populate_generic_foreign_key.py @@ -2,6 +2,7 @@ from django.db import migrations + def migrate_device_secret(apps, schema_editor): """ Move data from device foreign key into GenericForeignKey @@ -17,6 +18,7 @@ def migrate_device_secret(apps, schema_editor): secret.object_id = secret.device.pk secret.save() + class Migration(migrations.Migration): dependencies = [ @@ -25,5 +27,5 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(migrate_device_secret) + migrations.RunPython(migrate_device_secret) ] diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py index 49c60351f..0c561827c 100644 --- a/netbox/secrets/models.py +++ b/netbox/secrets/models.py @@ -350,7 +350,7 @@ class Secret(ChangeLoggedModel, CustomFieldModel): content_type = models.ForeignKey( ContentType, on_delete=models.CASCADE, - default= ContentType.objects.get(app_label='dcim', model='device').pk + default=ContentType.objects.get(app_label='dcim', model='device').pk ) object_id = models.PositiveIntegerField(default=1) object = GenericForeignKey('content_type', 'object_id') diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py index 3b243f4b5..6ab9658c0 100644 --- a/netbox/secrets/views.py +++ b/netbox/secrets/views.py @@ -100,9 +100,9 @@ def secret_add(request, pk): object = path.split(os.sep)[2] secret = { 'devices': lambda pk: Secret( - object_id=pk, - content_type=ContentType.objects.get(app_label='dcim',model='device') - ) + object_id=pk, + content_type=ContentType.objects.get(app_label='dcim', model='device') + ) }[object](pk) session_key = get_session_key(request)