From c7f6ff14da0a2d7284c18b645b8810d6037faeed Mon Sep 17 00:00:00 2001 From: Stu Young Date: Thu, 16 May 2019 13:21:51 -0400 Subject: [PATCH] incr-277 (#20582) * run python modernize * run isort * remove escape import --- lms/djangoapps/dashboard/git_import.py | 4 +++- .../management/commands/git_add_course.py | 2 ++ .../commands/tests/test_git_add_course.py | 2 ++ lms/djangoapps/dashboard/models.py | 2 ++ lms/djangoapps/dashboard/sysadmin.py | 5 +++-- lms/djangoapps/dashboard/sysadmin_urls.py | 2 ++ lms/djangoapps/dashboard/tests/test_sysadmin.py | 15 +++++++-------- 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/lms/djangoapps/dashboard/git_import.py b/lms/djangoapps/dashboard/git_import.py index 07a1612c2e..d66d94133e 100644 --- a/lms/djangoapps/dashboard/git_import.py +++ b/lms/djangoapps/dashboard/git_import.py @@ -3,6 +3,8 @@ Provides a function for importing a git repository into the lms instance when using a mongo modulestore """ +from __future__ import absolute_import + import logging import os import re @@ -15,10 +17,10 @@ from django.core import management from django.core.management.base import CommandError from django.utils import timezone from django.utils.translation import ugettext_lazy as _ -from xmodule.util.sandboxing import DEFAULT_PYTHON_LIB_FILENAME from opaque_keys.edx.locator import CourseLocator from dashboard.models import CourseImportLog +from xmodule.util.sandboxing import DEFAULT_PYTHON_LIB_FILENAME log = logging.getLogger(__name__) diff --git a/lms/djangoapps/dashboard/management/commands/git_add_course.py b/lms/djangoapps/dashboard/management/commands/git_add_course.py index fad6b5e10e..df4891a0e5 100644 --- a/lms/djangoapps/dashboard/management/commands/git_add_course.py +++ b/lms/djangoapps/dashboard/management/commands/git_add_course.py @@ -2,6 +2,8 @@ Script for importing courseware from git/xml into a mongo modulestore """ +from __future__ import absolute_import + import logging from django.core.management.base import BaseCommand, CommandError diff --git a/lms/djangoapps/dashboard/management/commands/tests/test_git_add_course.py b/lms/djangoapps/dashboard/management/commands/tests/test_git_add_course.py index 7b03f3eb21..8a163f8448 100644 --- a/lms/djangoapps/dashboard/management/commands/tests/test_git_add_course.py +++ b/lms/djangoapps/dashboard/management/commands/tests/test_git_add_course.py @@ -1,6 +1,8 @@ """ Provide tests for git_add_course management command. """ +from __future__ import absolute_import + import logging import os import shutil diff --git a/lms/djangoapps/dashboard/models.py b/lms/djangoapps/dashboard/models.py index ad2424fda7..c651ed9e91 100644 --- a/lms/djangoapps/dashboard/models.py +++ b/lms/djangoapps/dashboard/models.py @@ -1,5 +1,7 @@ """Models for dashboard application""" +from __future__ import absolute_import + import mongoengine from xmodule.modulestore.mongoengine_fields import CourseKeyField diff --git a/lms/djangoapps/dashboard/sysadmin.py b/lms/djangoapps/dashboard/sysadmin.py index dd00a1275e..8265f89d6c 100644 --- a/lms/djangoapps/dashboard/sysadmin.py +++ b/lms/djangoapps/dashboard/sysadmin.py @@ -3,7 +3,7 @@ This module creates a sysadmin dashboard for managing and viewing courses. """ from __future__ import absolute_import -import unicodecsv as csv + import json import logging import os @@ -11,6 +11,7 @@ import StringIO import subprocess import mongoengine +import unicodecsv as csv from django.conf import settings from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User @@ -406,7 +407,7 @@ class Courses(SysadminDashboardView): _('Deleted'), text_type(course.location), text_type(course.id), course.display_name) context = { - 'datatable': self.make_datatable(courses.values()), + 'datatable': self.make_datatable(list(courses.values())), 'msg': self.msg, 'djangopid': os.getpid(), 'modeflag': {'courses': 'active-section'}, diff --git a/lms/djangoapps/dashboard/sysadmin_urls.py b/lms/djangoapps/dashboard/sysadmin_urls.py index d90b490833..c4a8a275e9 100644 --- a/lms/djangoapps/dashboard/sysadmin_urls.py +++ b/lms/djangoapps/dashboard/sysadmin_urls.py @@ -2,6 +2,8 @@ Urls for sysadmin dashboard feature """ +from __future__ import absolute_import + from django.conf.urls import url from dashboard import sysadmin diff --git a/lms/djangoapps/dashboard/tests/test_sysadmin.py b/lms/djangoapps/dashboard/tests/test_sysadmin.py index 61ad286d43..4d5fb2dcf4 100644 --- a/lms/djangoapps/dashboard/tests/test_sysadmin.py +++ b/lms/djangoapps/dashboard/tests/test_sysadmin.py @@ -1,6 +1,8 @@ """ Provide tests for sysadmin dashboard feature in sysadmin.py """ +from __future__ import absolute_import + import glob import os import re @@ -11,13 +13,13 @@ from uuid import uuid4 import mongoengine from django.conf import settings -from django.urls import reverse -from django.utils.html import escape from django.test.client import Client from django.test.utils import override_settings -from pytz import UTC +from django.urls import reverse from opaque_keys.edx.locator import CourseLocator +from pytz import UTC from six import text_type +from six.moves import range from dashboard.git_import import GitImportErrorNoDir from dashboard.models import CourseImportLog @@ -26,10 +28,7 @@ from student.roles import CourseStaffRole, GlobalStaff from student.tests.factories import UserFactory from util.date_utils import DEFAULT_DATE_TIME_FORMAT, get_time_display from xmodule.modulestore.django import modulestore -from xmodule.modulestore.tests.django_utils import ( - TEST_DATA_SPLIT_MODULESTORE, - SharedModuleStoreTestCase -) +from xmodule.modulestore.tests.django_utils import TEST_DATA_SPLIT_MODULESTORE, SharedModuleStoreTestCase from xmodule.modulestore.tests.mongo_connection import MONGO_HOST, MONGO_PORT_NUM TEST_MONGODB_LOG = { @@ -303,7 +302,7 @@ class TestSysAdminMongoCourseImport(SysadminBaseTestCase): mongoengine.connect(TEST_MONGODB_LOG['db']) - for _ in xrange(15): + for _ in range(15): CourseImportLog( course_id=CourseLocator.from_string("test/test/test"), location="location",