From 9e2397a60ab13e42734b6f819795cf2b941ba043 Mon Sep 17 00:00:00 2001 From: Amit <43564590+amitvadhel@users.noreply.github.com> Date: Thu, 9 May 2019 16:36:45 +0300 Subject: [PATCH] INCR-137: Run python-modernize at common/djangoapps/static_replace (#20481) --- common/djangoapps/static_replace/__init__.py | 7 +++++-- common/djangoapps/static_replace/admin.py | 2 ++ .../management/commands/clear_collectstatic_cache.py | 2 +- .../static_replace/migrations/0001_initial.py | 2 +- .../migrations/0002_assetexcludedextensionsconfig.py | 2 +- common/djangoapps/static_replace/models.py | 11 ++++++++--- .../static_replace/test/test_static_replace.py | 4 ++-- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/common/djangoapps/static_replace/__init__.py b/common/djangoapps/static_replace/__init__.py index b718ad17a0..84786835cf 100644 --- a/common/djangoapps/static_replace/__init__.py +++ b/common/djangoapps/static_replace/__init__.py @@ -1,5 +1,9 @@ +from __future__ import absolute_import + import logging import re +import six +from six import text_type from django.contrib.staticfiles.storage import staticfiles_storage from django.contrib.staticfiles import finders @@ -8,7 +12,6 @@ from django.conf import settings from xmodule.contentstore.content import StaticContent from opaque_keys.edx.locator import AssetLocator -from six import text_type log = logging.getLogger(__name__) XBLOCK_STATIC_RESOURCE_PREFIX = '/static/xblock' @@ -113,7 +116,7 @@ def process_static_urls(text, replacement_function, data_dir=None): # works for actual static assets and for magical course asset URLs.... full_url = prefix + rest - starts_with_static_url = full_url.startswith(unicode(settings.STATIC_URL)) + starts_with_static_url = full_url.startswith(six.text_type(settings.STATIC_URL)) starts_with_prefix = full_url.startswith(XBLOCK_STATIC_RESOURCE_PREFIX) contains_prefix = XBLOCK_STATIC_RESOURCE_PREFIX in full_url if starts_with_prefix or (starts_with_static_url and contains_prefix): diff --git a/common/djangoapps/static_replace/admin.py b/common/djangoapps/static_replace/admin.py index acb324d2dc..d93746d36f 100644 --- a/common/djangoapps/static_replace/admin.py +++ b/common/djangoapps/static_replace/admin.py @@ -2,6 +2,8 @@ Django admin page for AssetBaseUrlConfig, which allows you to set the base URL that gets prepended to asset URLs in order to serve them from, say, a CDN. """ +from __future__ import absolute_import + from config_models.admin import ConfigurationModelAdmin from django.contrib import admin diff --git a/common/djangoapps/static_replace/management/commands/clear_collectstatic_cache.py b/common/djangoapps/static_replace/management/commands/clear_collectstatic_cache.py index 6d6108a198..cd407bde07 100644 --- a/common/djangoapps/static_replace/management/commands/clear_collectstatic_cache.py +++ b/common/djangoapps/static_replace/management/commands/clear_collectstatic_cache.py @@ -2,7 +2,7 @@ Django management command to clear the 'staticfiles' Django cache """ -from __future__ import print_function +from __future__ import absolute_import, print_function from django.core.management.base import BaseCommand from django.core.cache import caches diff --git a/common/djangoapps/static_replace/migrations/0001_initial.py b/common/djangoapps/static_replace/migrations/0001_initial.py index 8c485265c1..65d269b03f 100644 --- a/common/djangoapps/static_replace/migrations/0001_initial.py +++ b/common/djangoapps/static_replace/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals import django.db.models.deletion from django.conf import settings diff --git a/common/djangoapps/static_replace/migrations/0002_assetexcludedextensionsconfig.py b/common/djangoapps/static_replace/migrations/0002_assetexcludedextensionsconfig.py index 594576ad3f..5ffd13d1b3 100644 --- a/common/djangoapps/static_replace/migrations/0002_assetexcludedextensionsconfig.py +++ b/common/djangoapps/static_replace/migrations/0002_assetexcludedextensionsconfig.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals import django.db.models.deletion from django.conf import settings diff --git a/common/djangoapps/static_replace/models.py b/common/djangoapps/static_replace/models.py index 2ff78aec77..f89eea1b8e 100644 --- a/common/djangoapps/static_replace/models.py +++ b/common/djangoapps/static_replace/models.py @@ -2,6 +2,11 @@ Models for static_replace """ +from __future__ import absolute_import + +import six +from six.moves import map + from config_models.models import ConfigurationModel from django.db.models.fields import TextField @@ -30,7 +35,7 @@ class AssetBaseUrlConfig(ConfigurationModel): return ''.format(self.get_base_url()) def __unicode__(self): - return unicode(repr(self)) + return six.text_type(repr(self)) class AssetExcludedExtensionsConfig(ConfigurationModel): @@ -53,10 +58,10 @@ class AssetExcludedExtensionsConfig(ConfigurationModel): def get_excluded_extensions(cls): """Gets the excluded file extensions when canonicalizing static asset paths""" add_period = lambda x: '.' + x - return map(add_period, cls.current().excluded_extensions.split()) + return list(map(add_period, cls.current().excluded_extensions.split())) def __repr__(self): return ''.format(self.get_excluded_extensions()) def __unicode__(self): - return unicode(repr(self)) + return six.text_type(repr(self)) diff --git a/common/djangoapps/static_replace/test/test_static_replace.py b/common/djangoapps/static_replace/test/test_static_replace.py index a789d2bff1..c8646fea66 100644 --- a/common/djangoapps/static_replace/test/test_static_replace.py +++ b/common/djangoapps/static_replace/test/test_static_replace.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- """Tests for static_replace""" -from __future__ import print_function +from __future__ import absolute_import, print_function import re from cStringIO import StringIO -from urlparse import parse_qsl, urlparse, urlunparse +from six.moves.urllib.parse import parse_qsl, urlparse, urlunparse import ddt import pytest