mirror of
https://github.com/django-q2/django-q2.git
synced 2026-10-06 14:48:11 +08:00
determines decode with django version
This commit is contained in:
+3
-2
@@ -1,4 +1,5 @@
|
|||||||
import logging
|
import logging
|
||||||
|
from django import get_version
|
||||||
|
|
||||||
import importlib
|
import importlib
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
@@ -33,7 +34,6 @@ class Task(models.Model):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_result_group(group_id, failures=False):
|
def get_result_group(group_id, failures=False):
|
||||||
# values + decode is 10 times faster than just list comprehension
|
|
||||||
if failures:
|
if failures:
|
||||||
values = Task.objects.filter(group=group_id).values_list('result', flat=True)
|
values = Task.objects.filter(group=group_id).values_list('result', flat=True)
|
||||||
else:
|
else:
|
||||||
@@ -189,9 +189,10 @@ class Schedule(models.Model):
|
|||||||
|
|
||||||
|
|
||||||
# Backwards compatibility for Django 1.7
|
# Backwards compatibility for Django 1.7
|
||||||
if hasattr(PickledObjectField, 'from_db_value'):
|
if get_version().split('.')[1] == '8':
|
||||||
def decode_results(values):
|
def decode_results(values):
|
||||||
return values
|
return values
|
||||||
else:
|
else:
|
||||||
|
# decode values in 1.7
|
||||||
def decode_results(values):
|
def decode_results(values):
|
||||||
return [dbsafe_decode(v) for v in values]
|
return [dbsafe_decode(v) for v in values]
|
||||||
|
|||||||
Reference in New Issue
Block a user