[#706] Changed the tox tests

Author: ErhanCitil

django_celery_monitor/__init__.py

@@ -7,7 +7,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import re
-
 from collections import namedtuple
 
 __version__ = '1.1.2'

django_celery_monitor/admin.py

@@ -1,28 +1,22 @@
 """Result Task Admin interface."""
 from __future__ import absolute_import, unicode_literals
 
-from __future__ import absolute_import, unicode_literals
-
+# from celery.task.control import broadcast, revoke, rate_limit
+from celery import Celery, current_app, states
+from celery.utils.text import abbrtask
 from django.contrib import admin
 from django.contrib.admin import helpers
 from django.contrib.admin.views import main as main_views
 from django.shortcuts import render
 from django.template import RequestContext
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str as force_text
 from django.utils.html import escape
-from django.utils.translation import ugettext_lazy as _
-
-from celery import current_app
-from celery import states
-# from celery.task.control import broadcast, revoke, rate_limit
-from celery import Celery
-from celery.utils.text import abbrtask
+from django.utils.translation import gettext_lazy as _
 
-from .models import TaskState, WorkerState
 from .humanize import naturaldate
+from .models import TaskState, WorkerState
 from .utils import action, display_field, fixedwidth, make_aware
 
-
 TASK_STATE_COLORS = {states.SUCCESS: 'green',
                      states.FAILURE: 'red',
                      states.REVOKED: 'magenta',

django_celery_monitor/apps.py

@@ -2,7 +2,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 __all__ = ['CeleryMonitorConfig']
 

django_celery_monitor/camera.py

@@ -9,7 +9,7 @@
 from celery.utils.log import get_logger
 from celery.utils.time import maybe_iso8601
 
-from .utils import fromtimestamp, correct_awareness
+from .utils import correct_awareness, fromtimestamp
 
 WORKER_UPDATE_FREQ = 60  # limit worker timestamp write freq.
 SUCCESS_STATES = frozenset([states.SUCCESS])

django_celery_monitor/humanize.py

@@ -3,28 +3,29 @@
 
 from datetime import datetime
 
-from django.utils.translation import ungettext, ugettext as _
 from django.utils.timezone import now
+from django.utils.translation import gettext as _
+from django.utils.translation import ngettext
 
 
 def pluralize_year(n):
     """Return a string with the number of yeargs ago."""
-    return ungettext(_('{num} year ago'), _('{num} years ago'), n)
+    return ngettext(_('{num} year ago'), _('{num} years ago'), n)
 
 
 def pluralize_month(n):
     """Return a string with the number of months ago."""
-    return ungettext(_('{num} month ago'), _('{num} months ago'), n)
+    return ngettext(_('{num} month ago'), _('{num} months ago'), n)
 
 
 def pluralize_week(n):
     """Return a string with the number of weeks ago."""
-    return ungettext(_('{num} week ago'), _('{num} weeks ago'), n)
+    return ngettext(_('{num} week ago'), _('{num} weeks ago'), n)
 
 
 def pluralize_day(n):
     """Return a string with the number of days ago."""
-    return ungettext(_('{num} day ago'), _('{num} days ago'), n)
+    return ngettext(_('{num} day ago'), _('{num} days ago'), n)
 
 
 OLDER_CHUNKS = (
@@ -57,19 +58,19 @@ def naturaldate(date, include_seconds=False):
     if days == 0:
         if hours == 0:
             if minutes > 0:
-                return ungettext(
+                return ngettext(
                     _('{minutes} minute ago'),
                     _('{minutes} minutes ago'), minutes
                 ).format(minutes=minutes)
             else:
                 if include_seconds and seconds:
-                    return ungettext(
+                    return ngettext(
                         _('{seconds} second ago'),
                         _('{seconds} seconds ago'), seconds
                     ).format(seconds=seconds)
                 return _('just now')
         else:
-            return ungettext(
+            return ngettext(
                 _('{hours} hour ago'), _('{hours} hours ago'), hours
             ).format(hours=hours)
 

django_celery_monitor/managers.py

@@ -1,5 +1,6 @@
 """The model managers."""
 from __future__ import absolute_import, unicode_literals
+
 from datetime import timedelta
 
 from celery import states

django_celery_monitor/migrations/0001_initial.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

django_celery_monitor/migrations/0002_workerstate_last_update.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
 
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

django_celery_monitor/models.py

@@ -1,14 +1,13 @@
 """The data models for the task and worker states."""
 from __future__ import absolute_import, unicode_literals
 
-from time import time, mktime, gmtime
-
-from django.db import models
-from django.utils.translation import ugettext_lazy as _
-from django.conf import settings
+from time import gmtime, mktime, time
 
 from celery import states
 from celery.events.state import heartbeat_expires
+from django.conf import settings
+from django.db import models
+from django.utils.translation import gettext_lazy as _
 from six import python_2_unicode_compatible
 
 from . import managers