Просмотр исходного кода

Move local_now() to utilities.datetime

Jeremy Stretch 1 год назад
Родитель
Сommit
7b1a08a187
4 измененных файлов с 15 добавлено и 11 удалено
  1. 1 1
      netbox/extras/forms/reports.py
  2. 1 1
      netbox/extras/forms/scripts.py
  3. 13 0
      netbox/utilities/datetime.py
  4. 0 9
      netbox/utilities/utils.py

+ 1 - 1
netbox/extras/forms/reports.py

@@ -3,7 +3,7 @@ from django.utils.translation import gettext_lazy as _
 
 
 from extras.choices import DurationChoices
 from extras.choices import DurationChoices
 from utilities.forms.widgets import DateTimePicker, NumberWithOptions
 from utilities.forms.widgets import DateTimePicker, NumberWithOptions
-from utilities.utils import local_now
+from utilities.datetime import local_now
 
 
 __all__ = (
 __all__ = (
     'ReportForm',
     'ReportForm',

+ 1 - 1
netbox/extras/forms/scripts.py

@@ -3,7 +3,7 @@ from django.utils.translation import gettext_lazy as _
 
 
 from extras.choices import DurationChoices
 from extras.choices import DurationChoices
 from utilities.forms.widgets import DateTimePicker, NumberWithOptions
 from utilities.forms.widgets import DateTimePicker, NumberWithOptions
-from utilities.utils import local_now
+from utilities.datetime import local_now
 
 
 __all__ = (
 __all__ = (
     'ScriptForm',
     'ScriptForm',

+ 13 - 0
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())

+ 0 - 9
netbox/utilities/utils.py

@@ -1,6 +1,4 @@
 from django.db.models import ManyToOneRel
 from django.db.models import ManyToOneRel
-from django.utils import timezone
-from django.utils.timezone import localtime
 
 
 
 
 def dynamic_import(name):
 def dynamic_import(name):
@@ -14,13 +12,6 @@ def dynamic_import(name):
     return mod
     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):
 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,
     Return a list of all models which have a ForeignKey to the given model and the name of the field. For example,