From 7d5c9f8b462de8c772319ae1de03af31875ee626 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Sun, 5 Aug 2018 13:39:04 +0200 Subject: [PATCH] removes xrange compat --- django_q/cluster.py | 1 - django_q/compat.py | 14 -------------- django_q/tests/test_brokers.py | 1 - django_q/tests/test_cached.py | 1 - django_q/tests/test_cluster.py | 1 - django_q/tests/test_monitor.py | 1 - 6 files changed, 19 deletions(-) delete mode 100644 django_q/compat.py diff --git a/django_q/cluster.py b/django_q/cluster.py index f9a2a91..84ddf0e 100644 --- a/django_q/cluster.py +++ b/django_q/cluster.py @@ -23,7 +23,6 @@ from multiprocessing import Event, Process, Value, current_process # Local from django_q import tasks from django_q.brokers import get_broker -from django_q.compat import range from django_q.conf import Conf, logger, psutil, get_ppid, error_reporter, rollbar from django_q.models import Task, Success, Schedule from django_q.queues import Queue diff --git a/django_q/compat.py b/django_q/compat.py deleted file mode 100644 index 0ba80c4..0000000 --- a/django_q/compat.py +++ /dev/null @@ -1,14 +0,0 @@ -from __future__ import absolute_import -""" -Compatibility layer. - -Intentionally replaces use of python-future -""" - -# https://github.com/Koed00/django-q/issues/4 - -try: - range = xrange -except NameError: - range = range - diff --git a/django_q/tests/test_brokers.py b/django_q/tests/test_brokers.py index 620e508..9d40b38 100644 --- a/django_q/tests/test_brokers.py +++ b/django_q/tests/test_brokers.py @@ -5,7 +5,6 @@ import pytest import redis from django_q.brokers import get_broker, Broker -from django_q.compat import range from django_q.conf import Conf from django_q.humanhash import uuid diff --git a/django_q/tests/test_cached.py b/django_q/tests/test_cached.py index 3ee5751..8c618c9 100644 --- a/django_q/tests/test_cached.py +++ b/django_q/tests/test_cached.py @@ -3,7 +3,6 @@ from multiprocessing import Event, Value import pytest from django_q.cluster import pusher, worker, monitor -from django_q.compat import range from django_q.conf import Conf from django_q.tasks import async_task, result, fetch, count_group, result_group, fetch_group, delete_group, delete_cached, \ async_iter, Chain, async_chain, Iter, AsyncTask diff --git a/django_q/tests/test_cluster.py b/django_q/tests/test_cluster.py index 4c220cb..3355052 100644 --- a/django_q/tests/test_cluster.py +++ b/django_q/tests/test_cluster.py @@ -11,7 +11,6 @@ myPath = os.path.dirname(os.path.abspath(__file__)) sys.path.insert(0, myPath + '/../') from django_q.cluster import Cluster, Sentinel, pusher, worker, monitor, save_task -from django_q.compat import range from django_q.humanhash import DEFAULT_WORDLIST, uuid from django_q.tasks import fetch, fetch_group, async_task, result, result_group, count_group, delete_group, queue_size from django_q.models import Task, Success diff --git a/django_q/tests/test_monitor.py b/django_q/tests/test_monitor.py index 0f8f7ae..5719973 100644 --- a/django_q/tests/test_monitor.py +++ b/django_q/tests/test_monitor.py @@ -3,7 +3,6 @@ import pytest from django_q.tasks import async_task from django_q.brokers import get_broker from django_q.cluster import Cluster -from django_q.compat import range from django_q.monitor import monitor, info from django_q.status import Stat from django_q.conf import Conf