Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b55fef
Update import handling for cron_descriptor > 2.0.x compatibility
rh0dium Aug 25, 2025
5403b09
Update django_celery_beat/models.py
rh0dium Aug 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions django_celery_beat/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,15 @@

import timezone_field
from celery import current_app, schedules
from cron_descriptor import (FormatException, MissingFieldException,
WrongArgumentException, get_description)

try:
Copy link
Contributor

@cclauss cclauss Aug 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
try:
try: # Python >= 3.11 can use cron_descriptor >= 2.0 which uses *Error exceptions.

We need a comment here explaining why.

Or perhaps in #935 we should just pin the dependency to >= 2.0 and just use *Error instead of try / except.

EDIT: #938 proves that the above suggestion will not work. We need try / except because cron_descriptor v2 only supports Python >= v3.11.

@Salamek

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cron_descriptor 2.0.5 supports Python 3.9 - 3.13...

from cron_descriptor import (FormatError, MissingFieldError,
WrongArgumentError, get_description)
except ImportError: # Python < 3.11 must use cron_descriptor < 2.0 which uses *Exception exceptions.
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
Expand Down Expand Up @@ -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)}'
Expand Down
Loading