From b7fbfc938d666710082f7bea256e5bf3f7247ce2 Mon Sep 17 00:00:00 2001
From: Michael Terry <mterry@edx.org>
Date: Fri, 5 Jan 2018 10:52:37 -0500
Subject: [PATCH] Fix expire_old_entitlements celery task

Celery was not able to find the task implementation, because we were
putting it in a nonstandard place.
---
 .../entitlements/management/commands/expire_old_entitlements.py | 2 +-
 .../management/commands/tests/test_expire_old_entitlements.py   | 2 +-
 common/djangoapps/entitlements/{tasks/v1 => }/tasks.py          | 0
 common/djangoapps/entitlements/tasks/__init__.py                | 0
 common/djangoapps/entitlements/tasks/v1/__init__.py             | 0
 common/djangoapps/entitlements/tasks/v1/tests/__init__.py       | 0
 .../djangoapps/entitlements/{tasks/v1 => }/tests/test_tasks.py  | 2 +-
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename common/djangoapps/entitlements/{tasks/v1 => }/tasks.py (100%)
 delete mode 100644 common/djangoapps/entitlements/tasks/__init__.py
 delete mode 100644 common/djangoapps/entitlements/tasks/v1/__init__.py
 delete mode 100644 common/djangoapps/entitlements/tasks/v1/tests/__init__.py
 rename common/djangoapps/entitlements/{tasks/v1 => }/tests/test_tasks.py (98%)

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