From f0061dccd6c288727f91f549fcb6a1f7c76ac85d Mon Sep 17 00:00:00 2001
From: Ilan Steemers <koed00@gmail.com>
Date: Mon, 29 Jun 2020 19:08:33 +0200
Subject: [PATCH] Moves optional import to root

---
 django_q/__init__.py | 10 ++++++++--
 django_q/admin.py    |  5 ++---
 django_q/apps.py     |  2 +-
 django_q/cluster.py  |  7 +------
 django_q/models.py   |  7 +------
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/django_q/__init__.py b/django_q/__init__.py
index 30d0d2c..7f95d38 100644
--- a/django_q/__init__.py
+++ b/django_q/__init__.py
@@ -1,6 +1,12 @@
 VERSION = (1, 2, 4)
 
-default_app_config = 'django_q.apps.DjangoQConfig'
+default_app_config = "django_q.apps.DjangoQConfig"
 
 
-__all__ = ['conf', 'cluster', 'models', 'tasks']
+__all__ = ["conf", "cluster", "models", "tasks", "croniter"]
+
+# Optional Imports
+try:
+    from croniter import croniter
+except ImportError:
+    croniter = None
diff --git a/django_q/admin.py b/django_q/admin.py
index a1190cf..2625728 100644
--- a/django_q/admin.py
+++ b/django_q/admin.py
@@ -5,6 +5,7 @@ from django.utils.translation import gettext_lazy as _
 from django_q.conf import Conf
 from django_q.models import Success, Failure, Schedule, OrmQ
 from django_q.tasks import async_task
+from django_q import croniter
 
 
 class TaskAdmin(admin.ModelAdmin):
@@ -74,9 +75,7 @@ class ScheduleAdmin(admin.ModelAdmin):
     )
 
     # optional cron strings
-    try:
-        from croniter import croniter
-    except ImportError:
+    if not croniter:
         readonly_fields = ("cron",)
 
     list_filter = ("next_run", "schedule_type")
diff --git a/django_q/apps.py b/django_q/apps.py
index 4943288..1f27759 100644
--- a/django_q/apps.py
+++ b/django_q/apps.py
@@ -4,7 +4,7 @@ from django_q.conf import Conf
 
 
 class DjangoQConfig(AppConfig):
-    name = 'django_q'
+    name = "django_q"
     verbose_name = Conf.LABEL
 
     def ready(self):
diff --git a/django_q/cluster.py b/django_q/cluster.py
index 3903c13..7e96c2e 100644
--- a/django_q/cluster.py
+++ b/django_q/cluster.py
@@ -26,12 +26,7 @@ from django_q.queues import Queue
 from django_q.signals import pre_execute
 from django_q.signing import SignedPackage, BadSignature
 from django_q.status import Stat, Status
-
-# Optional
-try:
-    from croniter import croniter
-except ImportError:
-    croniter = None
+from django_q import croniter
 
 
 class Cluster:
diff --git a/django_q/models.py b/django_q/models.py
index 7eac054..8ec5907 100644
--- a/django_q/models.py
+++ b/django_q/models.py
@@ -14,12 +14,7 @@ from picklefield.fields import dbsafe_decode
 
 # Local
 from django_q.signing import SignedPackage
-
-# Optional
-try:
-    from croniter import croniter
-except ImportError:
-    croniter = None
+from django_q import croniter
 
 
 class Task(models.Model):