diff --git a/openedx/core/djangoapps/zendesk_proxy/apps.py b/openedx/core/djangoapps/zendesk_proxy/apps.py index 81c18f225a..373622c862 100644 --- a/openedx/core/djangoapps/zendesk_proxy/apps.py +++ b/openedx/core/djangoapps/zendesk_proxy/apps.py @@ -3,6 +3,7 @@ Zendesk Proxy Configuration """ +from __future__ import absolute_import from django.apps import AppConfig from openedx.core.djangoapps.plugins.constants import ProjectType, SettingsType, PluginURLs, PluginSettings diff --git a/openedx/core/djangoapps/zendesk_proxy/tests/test_utils.py b/openedx/core/djangoapps/zendesk_proxy/tests/test_utils.py index b02e5685f9..d0c7223aba 100644 --- a/openedx/core/djangoapps/zendesk_proxy/tests/test_utils.py +++ b/openedx/core/djangoapps/zendesk_proxy/tests/test_utils.py @@ -1,3 +1,8 @@ +""" +Tests of Zendesk interaction utility functions +""" + +from __future__ import absolute_import import ddt from django.test.utils import override_settings from mock import MagicMock, patch diff --git a/openedx/core/djangoapps/zendesk_proxy/tests/test_v0_views.py b/openedx/core/djangoapps/zendesk_proxy/tests/test_v0_views.py index fd1b22dc08..9da1919020 100644 --- a/openedx/core/djangoapps/zendesk_proxy/tests/test_v0_views.py +++ b/openedx/core/djangoapps/zendesk_proxy/tests/test_v0_views.py @@ -1,4 +1,5 @@ """Tests for zendesk_proxy views.""" +from __future__ import absolute_import import json from copy import deepcopy @@ -9,6 +10,7 @@ from mock import MagicMock, patch from openedx.core.djangoapps.zendesk_proxy.v0.views import ZENDESK_REQUESTS_PER_HOUR from openedx.core.lib.api.test_utils import ApiTestCase +from six.moves import range @ddt.ddt diff --git a/openedx/core/djangoapps/zendesk_proxy/tests/test_v1_views.py b/openedx/core/djangoapps/zendesk_proxy/tests/test_v1_views.py index 8dc13c41ec..d66db7acd3 100644 --- a/openedx/core/djangoapps/zendesk_proxy/tests/test_v1_views.py +++ b/openedx/core/djangoapps/zendesk_proxy/tests/test_v1_views.py @@ -1,4 +1,5 @@ """Tests for zendesk_proxy views.""" +from __future__ import absolute_import import json from copy import deepcopy @@ -9,6 +10,7 @@ from mock import MagicMock, patch from openedx.core.djangoapps.zendesk_proxy.v1.views import ZendeskProxyThrottle from openedx.core.lib.api.test_utils import ApiTestCase +from six.moves import range @ddt.ddt diff --git a/openedx/core/djangoapps/zendesk_proxy/urls.py b/openedx/core/djangoapps/zendesk_proxy/urls.py index 161bbf924c..bb7712467a 100644 --- a/openedx/core/djangoapps/zendesk_proxy/urls.py +++ b/openedx/core/djangoapps/zendesk_proxy/urls.py @@ -2,6 +2,7 @@ Map urls to the relevant view handlers """ +from __future__ import absolute_import from django.conf.urls import url from openedx.core.djangoapps.zendesk_proxy.v0.views import ZendeskPassthroughView as v0_view diff --git a/openedx/core/djangoapps/zendesk_proxy/utils.py b/openedx/core/djangoapps/zendesk_proxy/utils.py index 7b59bbec14..d905b58b82 100644 --- a/openedx/core/djangoapps/zendesk_proxy/utils.py +++ b/openedx/core/djangoapps/zendesk_proxy/utils.py @@ -1,9 +1,11 @@ """ Utility functions for zendesk interaction. """ + +from __future__ import absolute_import import json import logging -from urlparse import urljoin +from six.moves.urllib.parse import urljoin # pylint: disable=import-error from django.conf import settings import requests diff --git a/openedx/core/djangoapps/zendesk_proxy/v0/views.py b/openedx/core/djangoapps/zendesk_proxy/v0/views.py index 4730d11d52..82426226d2 100644 --- a/openedx/core/djangoapps/zendesk_proxy/v0/views.py +++ b/openedx/core/djangoapps/zendesk_proxy/v0/views.py @@ -1,6 +1,7 @@ """ Define request handlers used by the zendesk_proxy djangoapp """ +from __future__ import absolute_import from rest_framework import status from rest_framework.parsers import JSONParser from rest_framework.response import Response diff --git a/openedx/core/djangoapps/zendesk_proxy/v1/views.py b/openedx/core/djangoapps/zendesk_proxy/v1/views.py index f6ebf05a74..156b0996a8 100644 --- a/openedx/core/djangoapps/zendesk_proxy/v1/views.py +++ b/openedx/core/djangoapps/zendesk_proxy/v1/views.py @@ -1,6 +1,7 @@ """ Define request handlers used by the zendesk_proxy djangoapp """ +from __future__ import absolute_import from rest_framework import status from rest_framework.parsers import JSONParser from rest_framework.response import Response