INCR-225: python-modernize on openedx/core/djangoapps/geoinfo, monkeypatch, plugin_api, and xmodule_django (#20422)

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__)
 
 

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):

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')
 
 

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