Removed deprecated future imports

mraarif · iamsobanjaved · commit 38f59ccefa74 · 2020-06-26T15:27:23.000+05:00
diff --git a/celery_utils/__init__.py b/celery_utils/__init__.py
@@ -2,8 +2,6 @@
 Code to support working with celery.
 """
 
-from __future__ import absolute_import, unicode_literals
-
 __version__ = '0.5.0'
 
 default_app_config = 'celery_utils.apps.CeleryUtilsConfig'  # pylint: disable=invalid-name
diff --git a/celery_utils/admin.py b/celery_utils/admin.py
@@ -2,8 +2,6 @@
 Admin site configuration.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from django.contrib import admin
 
 from .models import FailedTask
diff --git a/celery_utils/apps.py b/celery_utils/apps.py
@@ -3,8 +3,6 @@
 celery_utils Django application initialization.
 """
 
-from __future__ import absolute_import, unicode_literals
-
 from django.apps import AppConfig
 
 
diff --git a/celery_utils/logged_task.py b/celery_utils/logged_task.py
@@ -2,8 +2,6 @@
 Improved logging for celery tasks.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import logging
 
 from celery import Task
diff --git a/celery_utils/management/commands/cleanup_resolved_tasks.py b/celery_utils/management/commands/cleanup_resolved_tasks.py
@@ -2,8 +2,6 @@
 Command to clean up resolved FailedTask records.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from datetime import timedelta
 import logging
 from textwrap import dedent
diff --git a/celery_utils/management/commands/reapply_tasks.py b/celery_utils/management/commands/reapply_tasks.py
@@ -2,8 +2,6 @@
 Reset persistent grades for learners.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import logging
 from textwrap import dedent
 
diff --git a/celery_utils/management/commands/tests/test_cleanup_resolved_tasks.py b/celery_utils/management/commands/tests/test_cleanup_resolved_tasks.py
@@ -2,8 +2,6 @@
 Test management command to cleanup resolved tasks.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from datetime import timedelta
 
 import pytest
diff --git a/celery_utils/management/commands/tests/test_reapply_tasks.py b/celery_utils/management/commands/tests/test_reapply_tasks.py
@@ -2,8 +2,6 @@
 Test management command to reapply failed tasks.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from collections import Counter
 from datetime import datetime
 
diff --git a/celery_utils/migrations/0001_initial.py b/celery_utils/migrations/0001_initial.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.5 on 2017-01-31 13:50
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 import django.utils.timezone
diff --git a/celery_utils/migrations/0002_chordable_django_backend.py b/celery_utils/migrations/0002_chordable_django_backend.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
-from django.db import migrations, models
+
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
diff --git a/celery_utils/models.py b/celery_utils/models.py
@@ -3,15 +3,12 @@
 Database models for celery_utils.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import logging
 
-from celery import current_app
-
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 
+from celery import current_app
 from jsonfield import JSONField
 from model_utils.models import TimeStampedModel
 
diff --git a/celery_utils/persist_on_failure.py b/celery_utils/persist_on_failure.py
@@ -3,7 +3,6 @@
 """
 # pylint: disable=abstract-method
 
-from __future__ import absolute_import, division, print_function, unicode_literals
 
 from celery import Task
 
diff --git a/celery_utils/tasks.py b/celery_utils/tasks.py
@@ -2,12 +2,10 @@
 Celery tasks that support the utils in this module.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
+from django.utils.timezone import now
 
 from celery import shared_task
 
-from django.utils.timezone import now
-
 
 @shared_task
 def mark_resolved(task_id):
diff --git a/docs/conf.py b/docs/conf.py
@@ -13,17 +13,17 @@
 serve to show the default.
 """
 
-from __future__ import absolute_import, unicode_literals
+
 
 import os
-import sys
 from subprocess import check_call
-
-import edx_theme
+import sys
 
 import django
 from django.utils import six
 
+import edx_theme
+
 # Configure Django for autodoc usage
 django.setup()
 
diff --git a/manage.py b/manage.py
@@ -3,8 +3,6 @@
 Django administration utility.
 """
 
-from __future__ import absolute_import, unicode_literals
-
 import os
 import sys
 
diff --git a/setup.cfg b/setup.cfg
@@ -2,7 +2,7 @@
 line_length = 120
 known_third_party = ddt,mock
 known_django = django
-known_djangoapp = jsonfield,model_utils
+known_djangoapp = jsonfield,model_utils,celery
 known_edx =
 known_first_party = celery_utils
 sections = FUTURE,STDLIB,THIRDPARTY,DJANGO,DJANGOAPP,EDX,FIRSTPARTY,LOCALFOLDER
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # pylint: disable=C0111,W6005,W6100
-from __future__ import absolute_import, print_function
+
 
 import os
 import re
diff --git a/test_settings.py b/test_settings.py
@@ -5,8 +5,6 @@
 Django applications, so these settings will not be used.
 """
 
-from __future__ import absolute_import, unicode_literals
-
 from os.path import abspath, dirname, join
 
 
diff --git a/test_utils/__init__.py b/test_utils/__init__.py
@@ -5,6 +5,5 @@
 one cannot import from anywhere under tests folder. However, some utility classes/methods might be useful
 in multiple test modules (i.e. factoryboy factories, base test classes). So this package is the place to put them.
 """
-from __future__ import absolute_import
 
 from . import celery
diff --git a/test_utils/celery.py b/test_utils/celery.py
@@ -2,8 +2,6 @@
 Initialization of Celery subsystem.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import os
 
 from celery import Celery
diff --git a/test_utils/tasks.py b/test_utils/tasks.py
@@ -2,8 +2,6 @@
 Tasks used in tests
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from celery_utils import logged_task, persist_on_failure
 
 from .celery import app
diff --git a/tests/test_logged_task.py b/tests/test_logged_task.py
@@ -9,8 +9,6 @@
 
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from billiard.einfo import ExceptionInfo
 import mock
 import pytest
diff --git a/tests/test_persist_on_failure.py b/tests/test_persist_on_failure.py
@@ -6,8 +6,6 @@
   * passing_task - Always passes when run.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import pytest
 import six
 
