Skip to content

Commit 626c2a0

Browse files
authored
Remove superseded ExtendedQuerySet as it's functionality is built into Django since 1.7 (#563)
* get rid of outdated model managers as update_or_create is provided by django since 1.7 * fix line length * fix docstring
1 parent d65d0c6 commit 626c2a0

File tree

6 files changed

+18
-40
lines changed

6 files changed

+18
-40
lines changed

django_celery_beat/managers.py

-30
This file was deleted.

django_celery_beat/models.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from django.db import models
1414
from django.utils.translation import gettext_lazy as _
1515

16-
from . import managers, validators
16+
from . import querysets, validators
1717
from .tzcrontab import TzAwareCrontab
1818
from .utils import make_aware, now
1919
from .clockedschedule import clocked
@@ -369,8 +369,6 @@ class PeriodicTasks(models.Model):
369369
ident = models.SmallIntegerField(default=1, primary_key=True, unique=True)
370370
last_update = models.DateTimeField(null=False)
371371

372-
objects = managers.ExtendedManager()
373-
374372
@classmethod
375373
def changed(cls, instance, **kwargs):
376374
if not instance.no_changes:
@@ -540,7 +538,7 @@ class PeriodicTask(models.Model):
540538
'Detailed description about the details of this Periodic Task'),
541539
)
542540

543-
objects = managers.PeriodicTaskManager()
541+
objects = querysets.PeriodicTaskQuerySet.as_manager()
544542
no_changes = False
545543

546544
class Meta:

django_celery_beat/querysets.py

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
"""Model querysets."""
2+
from django.db import models
3+
4+
5+
class PeriodicTaskQuerySet(models.QuerySet):
6+
"""QuerySet for PeriodicTask."""
7+
8+
def enabled(self):
9+
return self.filter(enabled=True)

django_celery_beat/schedulers.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,10 @@ def to_model_schedule(cls, schedule):
173173

174174
@classmethod
175175
def from_entry(cls, name, app=None, **entry):
176-
return cls(PeriodicTask._default_manager.update_or_create(
176+
obj, created = PeriodicTask._default_manager.update_or_create(
177177
name=name, defaults=cls._unpack_fields(**entry),
178-
), app=app)
178+
)
179+
return cls(obj, app=app)
179180

180181
@classmethod
181182
def _unpack_fields(cls, schedule,
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
=====================================================
2-
``django_celery_beat.managers``
2+
``django_celery_beat.querysets``
33
=====================================================
44

55
.. contents::
66
:local:
7-
.. currentmodule:: django_celery_beat.managers
7+
.. currentmodule:: django_celery_beat.querysets
88

9-
.. automodule:: django_celery_beat.managers
9+
.. automodule:: django_celery_beat.querysets
1010
:members:
1111
:undoc-members:

docs/reference/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
django-celery-beat
1414
django-celery-beat.models
1515
django-celery-beat.tzcrontab
16-
django-celery-beat.managers
16+
django-celery-beat.querysets
1717
django-celery-beat.schedulers
1818
django-celery-beat.admin
1919
django-celery-beat.utils

0 commit comments

Comments
 (0)