Update import handling for cron_descriptor > 2.0.x compatibility # 934 Real Fix

django_celery_beat/models.py

@@ -8,8 +8,15 @@
 
 import timezone_field
 from celery import current_app, schedules
-from cron_descriptor import (FormatException, MissingFieldException,
-                             WrongArgumentException, get_description)
+
+try:
+    from cron_descriptor import (FormatError, MissingFieldError,
+                                 WrongArgumentError, get_description)
+except ImportError:
+    from cron_descriptor import FormatException as FormatError
+    from cron_descriptor import MissingFieldException as MissingFieldError
+    from cron_descriptor import WrongArgumentException as WrongArgumentError
+
 from django.conf import settings
 from django.core.exceptions import MultipleObjectsReturned, ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
@@ -340,9 +347,9 @@ def human_readable(self):
         try:
             human_readable = get_description(cron_expression)
         except (
-            MissingFieldException,
-            FormatException,
-            WrongArgumentException
+            MissingFieldError,
+            FormatError,
+            WrongArgumentError
         ):
             return f'{cron_expression} {str(self.timezone)}'
         return f'{human_readable} {str(self.timezone)}'