Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23765 from edx/hammad/ENT-2724

Browse Source 
ENT-2724 | refactored imports from edx-django-utils
This commit is contained in:
Hammad Ahmad Waqas
2020-04-20 13:47:59 +05:00
committed by GitHub
parent e876286364 11893ad69e
commit 449b6d0189
6 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
openedx/features/enterprise_support/api.py
View File

@@ -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

2
openedx/features/enterprise_support/tests/test_api.py
View File

@@ -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

3
openedx/features/enterprise_support/utils.py
View File

@@ -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

2
requirements/edx/base.txt
View File

@@ -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

2
requirements/edx/development.txt
View File

@@ -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

2
requirements/edx/testing.txt
View File

@@ -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