From 91c6bbcd787700b9c3fcafefe35af1ba1ae1ac0b Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 25 Oct 2022 16:26:05 -0400 Subject: [PATCH] Closes #10695: Rename forms/models.py to forms/model_forms.py --- netbox/circuits/forms/__init__.py | 2 +- netbox/circuits/forms/{models.py => model_forms.py} | 0 netbox/dcim/forms/__init__.py | 2 +- netbox/dcim/forms/connections.py | 2 +- netbox/dcim/forms/{models.py => model_forms.py} | 0 netbox/dcim/forms/object_create.py | 2 +- netbox/extras/forms/__init__.py | 2 +- netbox/extras/forms/{models.py => model_forms.py} | 0 netbox/ipam/forms/__init__.py | 2 +- netbox/ipam/forms/{models.py => model_forms.py} | 2 -- netbox/tenancy/forms/__init__.py | 2 +- netbox/tenancy/forms/{models.py => model_forms.py} | 0 netbox/virtualization/forms/__init__.py | 2 +- netbox/virtualization/forms/{models.py => model_forms.py} | 2 +- netbox/virtualization/forms/object_create.py | 2 +- netbox/wireless/forms/__init__.py | 2 +- netbox/wireless/forms/{models.py => model_forms.py} | 0 17 files changed, 11 insertions(+), 13 deletions(-) rename netbox/circuits/forms/{models.py => model_forms.py} (100%) rename netbox/dcim/forms/{models.py => model_forms.py} (100%) rename netbox/extras/forms/{models.py => model_forms.py} (100%) rename netbox/ipam/forms/{models.py => model_forms.py} (99%) rename netbox/tenancy/forms/{models.py => model_forms.py} (100%) rename netbox/virtualization/forms/{models.py => model_forms.py} (99%) rename netbox/wireless/forms/{models.py => model_forms.py} (100%) diff --git a/netbox/circuits/forms/__init__.py b/netbox/circuits/forms/__init__.py index 5c23f833a..1499f98b2 100644 --- a/netbox/circuits/forms/__init__.py +++ b/netbox/circuits/forms/__init__.py @@ -1,4 +1,4 @@ from .bulk_edit import * from .bulk_import import * from .filtersets import * -from .models import * +from .model_forms import * diff --git a/netbox/circuits/forms/models.py b/netbox/circuits/forms/model_forms.py similarity index 100% rename from netbox/circuits/forms/models.py rename to netbox/circuits/forms/model_forms.py diff --git a/netbox/dcim/forms/__init__.py b/netbox/dcim/forms/__init__.py index 22f0b1204..7510a979f 100644 --- a/netbox/dcim/forms/__init__.py +++ b/netbox/dcim/forms/__init__.py @@ -1,4 +1,4 @@ -from .models import * +from .model_forms import * from .filtersets import * from .object_create import * from .object_import import * diff --git a/netbox/dcim/forms/connections.py b/netbox/dcim/forms/connections.py index 5e3948baa..537a89bad 100644 --- a/netbox/dcim/forms/connections.py +++ b/netbox/dcim/forms/connections.py @@ -3,7 +3,7 @@ from django import forms from circuits.models import Circuit, CircuitTermination, Provider from dcim.models import * from utilities.forms import DynamicModelChoiceField, DynamicModelMultipleChoiceField -from .models import CableForm +from .model_forms import CableForm def get_cable_form(a_type, b_type): diff --git a/netbox/dcim/forms/models.py b/netbox/dcim/forms/model_forms.py similarity index 100% rename from netbox/dcim/forms/models.py rename to netbox/dcim/forms/model_forms.py diff --git a/netbox/dcim/forms/object_create.py b/netbox/dcim/forms/object_create.py index a03597db1..afdaa4fcc 100644 --- a/netbox/dcim/forms/object_create.py +++ b/netbox/dcim/forms/object_create.py @@ -3,7 +3,7 @@ from django import forms from dcim.models import * from netbox.forms import NetBoxModelForm from utilities.forms import DynamicModelChoiceField, DynamicModelMultipleChoiceField, ExpandableNameField -from . import models as model_forms +from . import model_forms __all__ = ( 'ComponentCreateForm', diff --git a/netbox/extras/forms/__init__.py b/netbox/extras/forms/__init__.py index b470650da..d2f2fb015 100644 --- a/netbox/extras/forms/__init__.py +++ b/netbox/extras/forms/__init__.py @@ -1,4 +1,4 @@ -from .models import * +from .model_forms import * from .filtersets import * from .bulk_edit import * from .bulk_import import * diff --git a/netbox/extras/forms/models.py b/netbox/extras/forms/model_forms.py similarity index 100% rename from netbox/extras/forms/models.py rename to netbox/extras/forms/model_forms.py diff --git a/netbox/ipam/forms/__init__.py b/netbox/ipam/forms/__init__.py index fc3352358..ba97d6dfa 100644 --- a/netbox/ipam/forms/__init__.py +++ b/netbox/ipam/forms/__init__.py @@ -1,4 +1,4 @@ -from .models import * +from .model_forms import * from .filtersets import * from .bulk_create import * from .bulk_edit import * diff --git a/netbox/ipam/forms/models.py b/netbox/ipam/forms/model_forms.py similarity index 99% rename from netbox/ipam/forms/models.py rename to netbox/ipam/forms/model_forms.py index 86a083361..6a3acf4c2 100644 --- a/netbox/ipam/forms/models.py +++ b/netbox/ipam/forms/model_forms.py @@ -3,14 +3,12 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError from dcim.models import Device, Interface, Location, Rack, Region, Site, SiteGroup -from extras.models import Tag from ipam.choices import * from ipam.constants import * from ipam.formfields import IPNetworkFormField from ipam.models import * from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm -from tenancy.models import Tenant from utilities.exceptions import PermissionsViolation from utilities.forms import ( add_blank_choice, BootstrapMixin, ContentTypeChoiceField, DatePicker, DynamicModelChoiceField, diff --git a/netbox/tenancy/forms/__init__.py b/netbox/tenancy/forms/__init__.py index 61f0bc961..96c1e50f7 100644 --- a/netbox/tenancy/forms/__init__.py +++ b/netbox/tenancy/forms/__init__.py @@ -1,5 +1,5 @@ from .forms import * -from .models import * +from .model_forms import * from .filtersets import * from .bulk_edit import * from .bulk_import import * diff --git a/netbox/tenancy/forms/models.py b/netbox/tenancy/forms/model_forms.py similarity index 100% rename from netbox/tenancy/forms/models.py rename to netbox/tenancy/forms/model_forms.py diff --git a/netbox/virtualization/forms/__init__.py b/netbox/virtualization/forms/__init__.py index 00f28b852..3c9dd3651 100644 --- a/netbox/virtualization/forms/__init__.py +++ b/netbox/virtualization/forms/__init__.py @@ -1,4 +1,4 @@ -from .models import * +from .model_forms import * from .filtersets import * from .object_create import * from .bulk_create import * diff --git a/netbox/virtualization/forms/models.py b/netbox/virtualization/forms/model_forms.py similarity index 99% rename from netbox/virtualization/forms/models.py rename to netbox/virtualization/forms/model_forms.py index 1b5c5adc6..5438002b4 100644 --- a/netbox/virtualization/forms/models.py +++ b/netbox/virtualization/forms/model_forms.py @@ -3,7 +3,7 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError from dcim.forms.common import InterfaceCommonForm -from dcim.forms.models import INTERFACE_MODE_HELP_TEXT +from dcim.forms.model_forms import INTERFACE_MODE_HELP_TEXT from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site, SiteGroup from ipam.models import IPAddress, VLAN, VLANGroup, VRF from netbox.forms import NetBoxModelForm diff --git a/netbox/virtualization/forms/object_create.py b/netbox/virtualization/forms/object_create.py index 79457a56e..2e0cc5db1 100644 --- a/netbox/virtualization/forms/object_create.py +++ b/netbox/virtualization/forms/object_create.py @@ -1,5 +1,5 @@ from utilities.forms import ExpandableNameField -from .models import VMInterfaceForm +from .model_forms import VMInterfaceForm __all__ = ( 'VMInterfaceCreateForm', diff --git a/netbox/wireless/forms/__init__.py b/netbox/wireless/forms/__init__.py index 62c2ec2d9..3098b356a 100644 --- a/netbox/wireless/forms/__init__.py +++ b/netbox/wireless/forms/__init__.py @@ -1,4 +1,4 @@ -from .models import * +from .model_forms import * from .filtersets import * from .bulk_edit import * from .bulk_import import * diff --git a/netbox/wireless/forms/models.py b/netbox/wireless/forms/model_forms.py similarity index 100% rename from netbox/wireless/forms/models.py rename to netbox/wireless/forms/model_forms.py