| {"repo": "rq/django-rq", "pull_number": 384, "instance_id": "rq__django-rq-384", "issue_numbers": "", "base_commit": "87850ae4d5e9cc9d112acb993bf14cca503093b7", "patch": "diff --git a/django_rq/admin.py b/django_rq/admin.py\n--- a/django_rq/admin.py\n+++ b/django_rq/admin.py\n@@ -1,5 +1,6 @@\n from django.contrib import admin\n-from django_rq import settings\n+\n+from . import settings\n \n \n if settings.SHOW_ADMIN_LINK:\ndiff --git a/django_rq/decorators.py b/django_rq/decorators.py\n--- a/django_rq/decorators.py\n+++ b/django_rq/decorators.py\n@@ -1,7 +1,6 @@\n from rq.decorators import job as _rq_job\n \n from django.conf import settings\n-from django.utils import six\n \n from .queues import get_queue\n \n@@ -24,7 +23,7 @@ def job(func_or_queue, connection=None, *args, **kwargs):\n func = None\n queue = func_or_queue\n \n- if isinstance(queue, six.string_types):\n+ if isinstance(queue, str):\n try:\n queue = get_queue(queue)\n if connection is None:\ndiff --git a/django_rq/jobs.py b/django_rq/jobs.py\n--- a/django_rq/jobs.py\n+++ b/django_rq/jobs.py\n@@ -2,7 +2,6 @@\n from rq.utils import import_attribute\n \n from django.conf import settings\n-from django.utils import six\n \n \n def get_job_class(job_class=None):\n@@ -16,6 +15,6 @@ def get_job_class(job_class=None):\n if job_class is None:\n job_class = RQ.get('JOB_CLASS', Job)\n \n- if isinstance(job_class, six.string_types):\n+ if isinstance(job_class, str):\n job_class = import_attribute(job_class)\n return job_class\ndiff --git a/django_rq/management/commands/rqenqueue.py b/django_rq/management/commands/rqenqueue.py\n--- a/django_rq/management/commands/rqenqueue.py\n+++ b/django_rq/management/commands/rqenqueue.py\n@@ -3,7 +3,7 @@\n from django.core.management.base import BaseCommand\n from django.utils.version import get_version\n \n-from django_rq import get_queue\n+from ... import get_queue\n \n \n class Command(BaseCommand):\ndiff --git a/django_rq/management/commands/rqscheduler.py b/django_rq/management/commands/rqscheduler.py\n--- a/django_rq/management/commands/rqscheduler.py\n+++ b/django_rq/management/commands/rqscheduler.py\n@@ -4,7 +4,8 @@\n from django.core.exceptions import ImproperlyConfigured\n from django.core.management.base import BaseCommand\n from django.utils.version import get_version\n-from django_rq import get_scheduler\n+\n+from ... import get_scheduler\n \n try:\n from rq_scheduler.utils import setup_loghandlers\ndiff --git a/django_rq/management/commands/rqstats.py b/django_rq/management/commands/rqstats.py\n--- a/django_rq/management/commands/rqstats.py\n+++ b/django_rq/management/commands/rqstats.py\n@@ -2,7 +2,8 @@\n import time\n \n from django.core.management.base import BaseCommand\n-from django_rq.utils import get_statistics\n+\n+from ...utils import get_statistics\n \n \n class Command(BaseCommand):\ndiff --git a/django_rq/management/commands/rqworker.py b/django_rq/management/commands/rqworker.py\n--- a/django_rq/management/commands/rqworker.py\n+++ b/django_rq/management/commands/rqworker.py\n@@ -10,7 +10,8 @@\n from django.core.management.base import BaseCommand\n from django.db import connections\n from django.utils.version import get_version\n-from django_rq.workers import get_worker\n+\n+from ...workers import get_worker\n \n \n def reset_db_connections():\ndiff --git a/django_rq/models.py b/django_rq/models.py\n--- a/django_rq/models.py\n+++ b/django_rq/models.py\n@@ -1,6 +1,6 @@\n from django.core.signals import got_request_exception, request_finished\n \n-from django_rq import thread_queue\n+from . import thread_queue\n from .queues import get_commit_mode\n \n \ndiff --git a/django_rq/queues.py b/django_rq/queues.py\n--- a/django_rq/queues.py\n+++ b/django_rq/queues.py\n@@ -3,14 +3,12 @@\n import redis\n from redis.sentinel import Sentinel\n from rq.queue import Queue\n-from rq.registry import FailedJobRegistry\n from rq.utils import import_attribute\n \n from django.conf import settings\n from django.core.exceptions import ImproperlyConfigured\n-from django.utils import six\n-from django_rq import thread_queue\n \n+from . import thread_queue\n from .jobs import get_job_class\n \n \n@@ -45,7 +43,7 @@ def get_queue_class(config=None, queue_class=None):\n if config:\n queue_class = config.get('QUEUE_CLASS', queue_class)\n \n- if isinstance(queue_class, six.string_types):\n+ if isinstance(queue_class, str):\n queue_class = import_attribute(queue_class)\n return queue_class\n \n@@ -276,7 +274,7 @@ def get_scheduler(name='default', queue=None, interval=60):\n RQ = getattr(settings, 'RQ', {})\n scheduler_class = RQ.get('SCHEDULER_CLASS', DjangoScheduler)\n \n- if isinstance(scheduler_class, six.string_types):\n+ if isinstance(scheduler_class, str):\n scheduler_class = import_attribute(scheduler_class)\n \n if queue is None:\ndiff --git a/django_rq/urls.py b/django_rq/urls.py\n--- a/django_rq/urls.py\n+++ b/django_rq/urls.py\n@@ -1,12 +1,7 @@\n-from django_rq import views\n+from django.urls import re_path\n+\n+from . import views\n \n-try:\n- # Fixed supporting for Django 2.0 and greater\n- # See: https://docs.djangoproject.com/en/2.0/ref/urls/#django.urls.re_path\n- from django.urls import re_path\n-except ImportError:\n- # Fallback for Django 1.11 and lower\n- from django.conf.urls import url as re_path\n \n urlpatterns = [\n re_path(r'^$',\ndiff --git a/django_rq/workers.py b/django_rq/workers.py\n--- a/django_rq/workers.py\n+++ b/django_rq/workers.py\n@@ -2,10 +2,9 @@\n from rq.utils import import_attribute\n \n from django.conf import settings\n-from django.utils import six\n \n from .jobs import get_job_class\n-from .queues import filter_connection_params, get_connection, get_queues\n+from .queues import get_queues\n \n \n def get_exception_handlers():\n@@ -33,7 +32,7 @@ def get_worker_class(worker_class=None):\n if 'WORKER_CLASS' in RQ:\n worker_class = RQ.get('WORKER_CLASS')\n \n- if isinstance(worker_class, six.string_types):\n+ if isinstance(worker_class, str):\n worker_class = import_attribute(worker_class)\n return worker_class\n \ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -14,7 +14,7 @@\n zip_safe=False,\n include_package_data=True,\n package_data={'': ['README.rst']},\n- install_requires=['django>=1.8.0', 'rq>=1.0', 'redis>=3'],\n+ install_requires=['django>=2.0', 'rq>=1.0', 'redis>=3'],\n extras_require={\n 'Sentry': ['raven>=6.1.0'],\n 'testing': ['mock>=2.0.0'],\n@@ -27,8 +27,6 @@\n 'License :: OSI Approved :: MIT License',\n 'Operating System :: OS Independent',\n 'Programming Language :: Python',\n- 'Programming Language :: Python :: 2',\n- 'Programming Language :: Python :: 2.7',\n 'Programming Language :: Python :: 3',\n 'Programming Language :: Python :: 3.3',\n 'Programming Language :: Python :: 3.4',\n", "test_patch": "diff --git a/django_rq/tests/test_views.py b/django_rq/tests/test_views.py\n--- a/django_rq/tests/test_views.py\n+++ b/django_rq/tests/test_views.py\n@@ -1,15 +1,10 @@\n import uuid\n+from unittest.mock import patch, PropertyMock\n \n from django.contrib.auth.models import User\n from django.test import TestCase, override_settings\n from django.test.client import Client\n-\n-try:\n- from django.urls import reverse\n-except ImportError:\n- from django.core.urlresolvers import reverse\n-\n-from mock import patch, PropertyMock\n+from django.urls import reverse\n \n from rq.job import Job, JobStatus\n from rq.registry import (DeferredJobRegistry, FailedJobRegistry,\n@@ -17,7 +12,7 @@\n \n from django_rq import get_queue\n from django_rq.workers import get_worker\n-from django_rq.tests.fixtures import access_self\n+from .fixtures import access_self\n from .utils import get_queue_index\n \n \n@@ -81,7 +76,7 @@ def failing_job():\n {'requeue': 'Requeue'})\n self.assertIn(job, queue.jobs)\n job.delete()\n- \n+\n def test_requeue_all(self):\n \"\"\"\n Ensure that requeueing all failed job work properly\ndiff --git a/django_rq/tests/tests.py b/django_rq/tests/tests.py\n--- a/django_rq/tests/tests.py\n+++ b/django_rq/tests/tests.py\n@@ -1,20 +1,13 @@\n import datetime\n import time\n-from unittest import skipIf\n+from unittest import skipIf, mock\n+from unittest.mock import patch, PropertyMock, MagicMock\n from uuid import uuid4\n \n+from django.conf import settings\n from django.core.management import call_command\n from django.test import TestCase, override_settings\n-\n-try:\n- from django.urls import reverse\n-except ImportError:\n- from django.core.urlresolvers import reverse\n-\n-from django.conf import settings\n-\n-import mock\n-from mock import patch, PropertyMock, MagicMock\n+from django.urls import reverse\n \n from rq import get_current_job, Queue\n from rq.job import Job\n@@ -122,8 +115,8 @@ def test_get_connection_sentinel(self, sentinel_class_mock):\n connection = get_connection('sentinel')\n \n self.assertEqual(connection, sentinel_mock)\n- sentinel_class_mock.assert_called_once()\n- sentinel_mock.master_for.assert_called_once()\n+ self.assertEqual(sentinel_mock.master_for.call_count, 1)\n+ self.assertEqual(sentinel_class_mock.call_count, 1)\n \n sentinel_instances = sentinel_class_mock.call_args[0][0]\n self.assertListEqual(config['SENTINELS'], sentinel_instances)\ndiff --git a/django_rq/tests/urls.py b/django_rq/tests/urls.py\n--- a/django_rq/tests/urls.py\n+++ b/django_rq/tests/urls.py\n@@ -1,20 +1,14 @@\n-from django.conf.urls import include, url\n from django.contrib import admin\n-from django.core.exceptions import ImproperlyConfigured\n+from django.urls import path\n \n-from django_rq.tests import views\n from django_rq.urls import urlpatterns\n \n+from . import views\n+\n urlpatterns = [\n- # url(r'^django-rq/', (urlpatterns, '', 'django_rq')),\n- url(r'^admin/', admin.site.urls),\n- url(r'^success/$', views.success, name='success'),\n- url(r'^error/$', views.error, name='error'),\n+ path('admin/', admin.site.urls),\n+ path('success/', views.success, name='success'),\n+ path('error/', views.error, name='error'),\n+ path('django-rq/', (urlpatterns, '', 'django_rq'))\n ]\n \n-try:\n- # For Django < 2.0\n- urlpatterns += [url(r'^django-rq/', include('django_rq.urls'))]\n-except ImproperlyConfigured:\n- # Django >= 2.0 URL dispatcher syntax\n- urlpatterns += [url(r'^django-rq/', (urlpatterns, '', 'django_rq'))]\ndiff --git a/integration_test/_tests.py b/integration_test/_tests.py\n--- a/integration_test/_tests.py\n+++ b/integration_test/_tests.py\n@@ -10,11 +10,11 @@\n import sys\n import time\n import unittest\n+from urllib.parse import urlunsplit import urlunsplit\n \n import psycopg2\n import requests\n from django.conf import settings\n-from django.utils.six.moves.urllib.parse import urlunsplit\n \n DJANGO_SETTINGS_MODULE = \"integration_test.settings\"\n os.environ.setdefault(\"DJANGO_SETTINGS_MODULE\", DJANGO_SETTINGS_MODULE)\ndiff --git a/integration_test/integration_test/urls.py b/integration_test/integration_test/urls.py\n--- a/integration_test/integration_test/urls.py\n+++ b/integration_test/integration_test/urls.py\n@@ -13,11 +13,11 @@\n 1. Import the include() function: from django.conf.urls import url, include\n 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))\n \"\"\"\n-from django.conf.urls import url\n+from django.urls import path\n from django.contrib import admin\n from integration_app import views\n \n urlpatterns = [\n- url(r'^$', views.home, name='home'),\n- url(r'^admin/', admin.site.urls),\n+ path('', views.home, name='home'),\n+ path('admin/', admin.site.urls),\n ]\n", "problem_statement": "", "hints_text": "", "created_at": "2019-12-03T09:29:56Z"} | |