diff --git a/netbox/extras/forms/reports.py b/netbox/extras/forms/reports.py index ad37eb744..358ee90e3 100644 --- a/netbox/extras/forms/reports.py +++ b/netbox/extras/forms/reports.py @@ -3,7 +3,7 @@ from django.utils.translation import gettext_lazy as _ from extras.choices import DurationChoices from utilities.forms.widgets import DateTimePicker, NumberWithOptions -from utilities.utils import local_now +from utilities.datetime import local_now __all__ = ( 'ReportForm', diff --git a/netbox/extras/forms/scripts.py b/netbox/extras/forms/scripts.py index f67ad3e75..ece96f5e4 100644 --- a/netbox/extras/forms/scripts.py +++ b/netbox/extras/forms/scripts.py @@ -3,7 +3,7 @@ from django.utils.translation import gettext_lazy as _ from extras.choices import DurationChoices from utilities.forms.widgets import DateTimePicker, NumberWithOptions -from utilities.utils import local_now +from utilities.datetime import local_now __all__ = ( 'ScriptForm', diff --git a/netbox/utilities/datetime.py b/netbox/utilities/datetime.py new file mode 100644 index 000000000..2ec35af98 --- /dev/null +++ b/netbox/utilities/datetime.py @@ -0,0 +1,13 @@ +from django.utils import timezone +from django.utils.timezone import localtime + +__all__ = ( + 'local_now', +) + + +def local_now(): + """ + Return the current date & time in the system timezone. + """ + return localtime(timezone.now()) diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py index 38e542bc0..47dc7e1b3 100644 --- a/netbox/utilities/utils.py +++ b/netbox/utilities/utils.py @@ -1,6 +1,4 @@ from django.db.models import ManyToOneRel -from django.utils import timezone -from django.utils.timezone import localtime def dynamic_import(name): @@ -14,13 +12,6 @@ def dynamic_import(name): return mod -def local_now(): - """ - Return the current date & time in the system timezone. - """ - return localtime(timezone.now()) - - def get_related_models(model, ordered=True): """ Return a list of all models which have a ForeignKey to the given model and the name of the field. For example,