From 71983ad84ebbdb737a3dd9a6038fedf9699c5768 Mon Sep 17 00:00:00 2001 From: "Daniel W. Anner" Date: Fri, 4 Aug 2023 15:48:16 +0000 Subject: [PATCH] Cleaning up the imports and fixing a few pythonic issues --- contrib/generated_schema.json | 2 +- .../extras/management/commands/buildschema.py | 20 ++++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/contrib/generated_schema.json b/contrib/generated_schema.json index 073654b40..8dbcb2847 100644 --- a/contrib/generated_schema.json +++ b/contrib/generated_schema.json @@ -558,4 +558,4 @@ } } } -} \ No newline at end of file +} diff --git a/netbox/extras/management/commands/buildschema.py b/netbox/extras/management/commands/buildschema.py index 82edc81b3..5e5b1a744 100644 --- a/netbox/extras/management/commands/buildschema.py +++ b/netbox/extras/management/commands/buildschema.py @@ -1,19 +1,15 @@ -from os import path as os_path from json import dumps as json_dumps from json import loads as json_loads from jinja2 import FileSystemLoader, Environment -from django.core.management.base import BaseCommand from django.conf import settings +from django.core.management.base import BaseCommand -from dcim.choices import DeviceAirflowChoices -from dcim.choices import SubdeviceRoleChoices -from dcim.choices import ConsolePortTypeChoices -from dcim.choices import PowerPortTypeChoices -from dcim.choices import PowerOutletTypeChoices, PowerOutletFeedLegChoices -from dcim.choices import InterfaceTypeChoices, InterfacePoEModeChoices, InterfacePoETypeChoices -from dcim.choices import PortTypeChoices -from dcim.choices import WeightUnitChoices +from dcim.choices import ( + DeviceAirflowChoices, SubdeviceRoleChoices, ConsolePortTypeChoices, PowerPortTypeChoices, + PowerOutletTypeChoices, PowerOutletFeedLegChoices, InterfaceTypeChoices, InterfacePoEModeChoices, + InterfacePoETypeChoices, PortTypeChoices, WeightUnitChoices +) class Command(BaseCommand): @@ -55,7 +51,7 @@ class Command(BaseCommand): print(json_dumps(json_loads(outputText), indent=4)) if kwargs['file']: - print() - with open(f'{settings.BASE_DIR}/../contrib/generated_schema.json', 'w') as generated_json_file: + with open(f'{settings.BASE_DIR}/../contrib/generated_schema.json', mode='w', encoding='UTF-8') as generated_json_file: generated_json_file.write(json_dumps(json_loads(outputText), indent=4)) + generated_json_file.write('\n') generated_json_file.close()