Skip to content

Commit 0a7b163

Browse files
committed
[#706] Changed the tox tests
1 parent c6b649e commit 0a7b163

17 files changed

+178
-75
lines changed

django_celery_monitor/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from __future__ import absolute_import, unicode_literals
88

99
import re
10-
1110
from collections import namedtuple
1211

1312
__version__ = '1.1.2'

django_celery_monitor/admin.py

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
11
"""Result Task Admin interface."""
22
from __future__ import absolute_import, unicode_literals
33

4-
from __future__ import absolute_import, unicode_literals
5-
4+
# from celery.task.control import broadcast, revoke, rate_limit
5+
from celery import Celery, current_app, states
6+
from celery.utils.text import abbrtask
67
from django.contrib import admin
78
from django.contrib.admin import helpers
89
from django.contrib.admin.views import main as main_views
910
from django.shortcuts import render
1011
from django.template import RequestContext
11-
from django.utils.encoding import force_text
12+
from django.utils.encoding import force_str as force_text
1213
from django.utils.html import escape
13-
from django.utils.translation import ugettext_lazy as _
14-
15-
from celery import current_app
16-
from celery import states
17-
# from celery.task.control import broadcast, revoke, rate_limit
18-
from celery import Celery
19-
from celery.utils.text import abbrtask
14+
from django.utils.translation import gettext_lazy as _
2015

21-
from .models import TaskState, WorkerState
2216
from .humanize import naturaldate
17+
from .models import TaskState, WorkerState
2318
from .utils import action, display_field, fixedwidth, make_aware
2419

25-
2620
TASK_STATE_COLORS = {states.SUCCESS: 'green',
2721
states.FAILURE: 'red',
2822
states.REVOKED: 'magenta',

django_celery_monitor/apps.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from __future__ import absolute_import, unicode_literals
33

44
from django.apps import AppConfig
5-
from django.utils.translation import ugettext_lazy as _
5+
from django.utils.translation import gettext_lazy as _
66

77
__all__ = ['CeleryMonitorConfig']
88

django_celery_monitor/camera.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from celery.utils.log import get_logger
1010
from celery.utils.time import maybe_iso8601
1111

12-
from .utils import fromtimestamp, correct_awareness
12+
from .utils import correct_awareness, fromtimestamp
1313

1414
WORKER_UPDATE_FREQ = 60 # limit worker timestamp write freq.
1515
SUCCESS_STATES = frozenset([states.SUCCESS])

django_celery_monitor/humanize.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,29 @@
33

44
from datetime import datetime
55

6-
from django.utils.translation import ungettext, ugettext as _
76
from django.utils.timezone import now
7+
from django.utils.translation import gettext as _
8+
from django.utils.translation import ngettext
89

910

1011
def pluralize_year(n):
1112
"""Return a string with the number of yeargs ago."""
12-
return ungettext(_('{num} year ago'), _('{num} years ago'), n)
13+
return ngettext(_('{num} year ago'), _('{num} years ago'), n)
1314

1415

1516
def pluralize_month(n):
1617
"""Return a string with the number of months ago."""
17-
return ungettext(_('{num} month ago'), _('{num} months ago'), n)
18+
return ngettext(_('{num} month ago'), _('{num} months ago'), n)
1819

1920

2021
def pluralize_week(n):
2122
"""Return a string with the number of weeks ago."""
22-
return ungettext(_('{num} week ago'), _('{num} weeks ago'), n)
23+
return ngettext(_('{num} week ago'), _('{num} weeks ago'), n)
2324

2425

2526
def pluralize_day(n):
2627
"""Return a string with the number of days ago."""
27-
return ungettext(_('{num} day ago'), _('{num} days ago'), n)
28+
return ngettext(_('{num} day ago'), _('{num} days ago'), n)
2829

2930

3031
OLDER_CHUNKS = (
@@ -57,19 +58,19 @@ def naturaldate(date, include_seconds=False):
5758
if days == 0:
5859
if hours == 0:
5960
if minutes > 0:
60-
return ungettext(
61+
return ngettext(
6162
_('{minutes} minute ago'),
6263
_('{minutes} minutes ago'), minutes
6364
).format(minutes=minutes)
6465
else:
6566
if include_seconds and seconds:
66-
return ungettext(
67+
return ngettext(
6768
_('{seconds} second ago'),
6869
_('{seconds} seconds ago'), seconds
6970
).format(seconds=seconds)
7071
return _('just now')
7172
else:
72-
return ungettext(
73+
return ngettext(
7374
_('{hours} hour ago'), _('{hours} hours ago'), hours
7475
).format(hours=hours)
7576

django_celery_monitor/managers.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""The model managers."""
22
from __future__ import absolute_import, unicode_literals
3+
34
from datetime import timedelta
45

56
from celery import states

django_celery_monitor/migrations/0001_initial.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# -*- coding: utf-8 -*-
2-
from __future__ import unicode_literals, absolute_import
2+
from __future__ import absolute_import, unicode_literals
33

4-
from django.db import migrations, models
54
import django.db.models.deletion
5+
from django.db import migrations, models
66

77

88
class Migration(migrations.Migration):

django_celery_monitor/migrations/0002_workerstate_last_update.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import absolute_import, unicode_literals
33

4-
from django.db import migrations, models
54
import django.utils.timezone
5+
from django.db import migrations, models
66

77

88
class Migration(migrations.Migration):

django_celery_monitor/models.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
"""The data models for the task and worker states."""
22
from __future__ import absolute_import, unicode_literals
33

4-
from time import time, mktime, gmtime
5-
6-
from django.db import models
7-
from django.utils.translation import ugettext_lazy as _
8-
from django.conf import settings
4+
from time import gmtime, mktime, time
95

106
from celery import states
117
from celery.events.state import heartbeat_expires
8+
from django.conf import settings
9+
from django.db import models
10+
from django.utils.translation import gettext_lazy as _
1211
from six import python_2_unicode_compatible
1312

1413
from . import managers

0 commit comments

Comments
 (0)