From c464751ae9b88aa67428c53d572e1cf8d81bac1a Mon Sep 17 00:00:00 2001 From: Stan Triepels <1939656+GDay@users.noreply.github.com> Date: Sun, 12 Jan 2025 03:40:18 +0100 Subject: [PATCH] Delete deprecated imports and unwrapping (#261) * delete old code * remove imports --- django_q/__init__.py | 5 ----- django_q/models.py | 12 +----------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/django_q/__init__.py b/django_q/__init__.py index 8d3b012..acd676c 100644 --- a/django_q/__init__.py +++ b/django_q/__init__.py @@ -1,8 +1,3 @@ -import django - VERSION = (1, 7, 6) -if django.VERSION < (3, 2): - default_app_config = "django_q.apps.DjangoQConfig" - __all__ = ["conf", "cluster", "models", "tasks"] diff --git a/django_q/models.py b/django_q/models.py index bd4956c..69dd5bb 100644 --- a/django_q/models.py +++ b/django_q/models.py @@ -2,7 +2,6 @@ from datetime import datetime, timedelta from keyword import iskeyword # Django -from django import get_version from django.core.exceptions import ValidationError from django.db import models from django.db.models import Q @@ -15,7 +14,6 @@ from django.utils.translation import gettext_lazy as _ # External from picklefield import PickledObjectField -from picklefield.fields import dbsafe_decode # Local from django_q.conf import croniter @@ -59,7 +57,7 @@ class Task(models.Model): .exclude(success=False) .values_list("result", flat=True) ) - return decode_results(values) + return values def group_result(self, failures=False): if self.group: @@ -356,11 +354,3 @@ class OrmQ(models.Model): app_label = "django_q" verbose_name = _("Queued task") verbose_name_plural = _("Queued tasks") - - -# Backwards compatibility for Django 1.7 -def decode_results(values): - if get_version().split(".")[1] == "7": - # decode values in 1.7 - return [dbsafe_decode(v) for v in values] - return values