From 11893ad69e2804ad000c2183675d75c76f75d5b5 Mon Sep 17 00:00:00 2001 From: HammadAhmadWaqas Date: Mon, 20 Apr 2020 12:11:28 +0500 Subject: [PATCH] refactored imports from edx-django-utils --- openedx/features/enterprise_support/api.py | 3 +-- openedx/features/enterprise_support/tests/test_api.py | 2 +- openedx/features/enterprise_support/utils.py | 3 +-- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/openedx/features/enterprise_support/api.py b/openedx/features/enterprise_support/api.py index b481312dbf..33976f4f4e 100644 --- a/openedx/features/enterprise_support/api.py +++ b/openedx/features/enterprise_support/api.py @@ -17,8 +17,7 @@ from django.template.loader import render_to_string from django.urls import reverse from django.utils.http import urlencode from django.utils.translation import ugettext as _ -from edx_django_utils.cache import TieredCache -from edx_django_utils.cache.utils import get_cache_key +from edx_django_utils.cache import TieredCache, get_cache_key from edx_rest_api_client.client import EdxRestApiClient from slumber.exceptions import HttpClientError, HttpNotFoundError, HttpServerError diff --git a/openedx/features/enterprise_support/tests/test_api.py b/openedx/features/enterprise_support/tests/test_api.py index d141ce3a55..882d22c31e 100644 --- a/openedx/features/enterprise_support/tests/test_api.py +++ b/openedx/features/enterprise_support/tests/test_api.py @@ -13,7 +13,7 @@ from django.core.cache import cache from django.http import HttpResponseRedirect from django.test.utils import override_settings from django.urls import reverse -from edx_django_utils.cache.utils import get_cache_key +from edx_django_utils.cache import get_cache_key from six.moves.urllib.parse import parse_qs from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory diff --git a/openedx/features/enterprise_support/utils.py b/openedx/features/enterprise_support/utils.py index 077e655af6..2e99348cfd 100644 --- a/openedx/features/enterprise_support/utils.py +++ b/openedx/features/enterprise_support/utils.py @@ -8,8 +8,7 @@ import json from crum import get_current_request from django.conf import settings from django.utils.translation import ugettext as _ -from edx_django_utils.cache import TieredCache -from edx_django_utils.cache.utils import get_cache_key +from edx_django_utils.cache import TieredCache, get_cache_key from enterprise.models import EnterpriseCustomerUser from social_django.models import UserSocialAuth diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index e069b18e31..b96b00939c 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -100,7 +100,7 @@ edx-celeryutils==0.5.0 # via -r requirements/edx/base.in, super-csv edx-completion==3.1.1 # via -r requirements/edx/base.in edx-django-release-util==0.4.2 # via -r requirements/edx/base.in edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.in -edx-django-utils==3.2.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.2.1 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==5.0.2 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval edx-enterprise==3.1.0 # via -r requirements/edx/base.in edx-i18n-tools==0.5.0 # via ora2 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index d778cad990..304343110f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -112,7 +112,7 @@ edx-celeryutils==0.5.0 # via -r requirements/edx/testing.txt, super-csv edx-completion==3.1.1 # via -r requirements/edx/testing.txt edx-django-release-util==0.4.2 # via -r requirements/edx/testing.txt edx-django-sites-extensions==2.4.3 # via -r requirements/edx/testing.txt -edx-django-utils==3.2.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.2.1 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==5.0.2 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval edx-enterprise==3.1.0 # via -r requirements/edx/testing.txt edx-i18n-tools==0.5.0 # via -r requirements/edx/testing.txt, ora2 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index cc6cd01ce1..7d244e4e81 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -108,7 +108,7 @@ edx-celeryutils==0.5.0 # via -r requirements/edx/base.txt, super-csv edx-completion==3.1.1 # via -r requirements/edx/base.txt edx-django-release-util==0.4.2 # via -r requirements/edx/base.txt edx-django-sites-extensions==2.4.3 # via -r requirements/edx/base.txt -edx-django-utils==3.2.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.2.1 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==5.0.2 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval edx-enterprise==3.1.0 # via -r requirements/edx/base.txt edx-i18n-tools==0.5.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2