diff --git a/common/djangoapps/entitlements/management/commands/expire_old_entitlements.py b/common/djangoapps/entitlements/management/commands/expire_old_entitlements.py index 0902814f1b..0d027392e0 100644 --- a/common/djangoapps/entitlements/management/commands/expire_old_entitlements.py +++ b/common/djangoapps/entitlements/management/commands/expire_old_entitlements.py @@ -7,7 +7,7 @@ import logging from django.core.management import BaseCommand from entitlements.models import CourseEntitlement -from entitlements.tasks.v1.tasks import expire_old_entitlements +from entitlements.tasks import expire_old_entitlements logger = logging.getLogger(__name__) # pylint: disable=invalid-name diff --git a/common/djangoapps/entitlements/management/commands/tests/test_expire_old_entitlements.py b/common/djangoapps/entitlements/management/commands/tests/test_expire_old_entitlements.py index 2026ce04ed..833173cfd1 100644 --- a/common/djangoapps/entitlements/management/commands/tests/test_expire_old_entitlements.py +++ b/common/djangoapps/entitlements/management/commands/tests/test_expire_old_entitlements.py @@ -10,7 +10,7 @@ from entitlements.tests.factories import CourseEntitlementFactory @skip_unless_lms -@mock.patch('entitlements.tasks.v1.tasks.expire_old_entitlements.delay') +@mock.patch('entitlements.tasks.expire_old_entitlements.delay') class TestExpireOldEntitlementsCommand(TestCase): """ Test expire_old_entitlement management command. diff --git a/common/djangoapps/entitlements/tasks/v1/tasks.py b/common/djangoapps/entitlements/tasks.py similarity index 100% rename from common/djangoapps/entitlements/tasks/v1/tasks.py rename to common/djangoapps/entitlements/tasks.py diff --git a/common/djangoapps/entitlements/tasks/__init__.py b/common/djangoapps/entitlements/tasks/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/common/djangoapps/entitlements/tasks/v1/__init__.py b/common/djangoapps/entitlements/tasks/v1/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/common/djangoapps/entitlements/tasks/v1/tests/__init__.py b/common/djangoapps/entitlements/tasks/v1/tests/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/common/djangoapps/entitlements/tasks/v1/tests/test_tasks.py b/common/djangoapps/entitlements/tests/test_tasks.py similarity index 98% rename from common/djangoapps/entitlements/tasks/v1/tests/test_tasks.py rename to common/djangoapps/entitlements/tests/test_tasks.py index 0e6240bf5a..aad5c618ba 100644 --- a/common/djangoapps/entitlements/tasks/v1/tests/test_tasks.py +++ b/common/djangoapps/entitlements/tests/test_tasks.py @@ -8,8 +8,8 @@ import pytz from django.test import TestCase +from entitlements import tasks from entitlements.models import CourseEntitlementPolicy -from entitlements.tasks.v1 import tasks from entitlements.tests.factories import CourseEntitlementFactory from openedx.core.djangolib.testing.utils import skip_unless_lms