diff --git a/openedx/core/djangoapps/geoinfo/middleware.py b/openedx/core/djangoapps/geoinfo/middleware.py index ed74fe6275..bcb3054e5a 100644 --- a/openedx/core/djangoapps/geoinfo/middleware.py +++ b/openedx/core/djangoapps/geoinfo/middleware.py @@ -10,13 +10,14 @@ decorator `django.utils.decorators.decorator_from_middleware(middleware_class)` """ +from __future__ import absolute_import + import logging +import geoip2.database from django.conf import settings from ipware.ip import get_real_ip -import geoip2.database - log = logging.getLogger(__name__) diff --git a/openedx/core/djangoapps/geoinfo/tests/test_middleware.py b/openedx/core/djangoapps/geoinfo/tests/test_middleware.py index c36aec9dbc..8050fa80c7 100644 --- a/openedx/core/djangoapps/geoinfo/tests/test_middleware.py +++ b/openedx/core/djangoapps/geoinfo/tests/test_middleware.py @@ -1,17 +1,17 @@ """ Tests for CountryMiddleware. """ +from __future__ import absolute_import + import geoip2 import maxminddb - -from mock import patch, MagicMock, PropertyMock - from django.contrib.sessions.middleware import SessionMiddleware from django.test import TestCase from django.test.client import RequestFactory +from mock import MagicMock, PropertyMock, patch from openedx.core.djangoapps.geoinfo.middleware import CountryMiddleware -from student.tests.factories import UserFactory, AnonymousUserFactory +from student.tests.factories import AnonymousUserFactory, UserFactory class CountryMiddlewareTests(TestCase): diff --git a/openedx/core/djangoapps/plugin_api/views.py b/openedx/core/djangoapps/plugin_api/views.py index f45260ed13..b8b4b1c743 100644 --- a/openedx/core/djangoapps/plugin_api/views.py +++ b/openedx/core/djangoapps/plugin_api/views.py @@ -2,15 +2,18 @@ Views for building plugins. """ +from __future__ import absolute_import + import logging from django.conf import settings from django.contrib.staticfiles.storage import staticfiles_storage from django.http import HttpResponse from django.shortcuts import render_to_response -from edxmako.shortcuts import is_any_marketing_link_set, is_marketing_link_set, marketing_link from web_fragments.views import FragmentView +from edxmako.shortcuts import is_any_marketing_link_set, is_marketing_link_set, marketing_link + log = logging.getLogger('plugin_api') diff --git a/openedx/core/djangoapps/xmodule_django/models.py b/openedx/core/djangoapps/xmodule_django/models.py index c4ac87b7b6..0899b95f2a 100644 --- a/openedx/core/djangoapps/xmodule_django/models.py +++ b/openedx/core/djangoapps/xmodule_django/models.py @@ -1,11 +1,13 @@ """ Useful django models for implementing XBlock infrastructure in django. """ +from __future__ import absolute_import + import logging import warnings -from django.db import models import opaque_keys.edx.django.models +from django.db import models from xmodule.modulestore.django import modulestore