[INCR-98] and [INCR-99] Run Python modernize -w . (#147)

* [INCR-98] Run Python modernize

* Placate pylint

Author: cclauss

.travis.yml

@@ -1,27 +1,27 @@
 dist: latest
 language: python
+python:
+    - 2.7
+    - 3.6
+    - 3.7
+env:
+    - TOXENV=django111
+    - TOXENV=django20
+    - TOXENV=django21
 matrix:
-  allow_failures:
-    - python: 3.6
-    - python: 3.7
-
   include:
     - python: 2.7
-      env: TOXENV=django111
-    - python: 3.6
-      env: TOXENV=django111
+      env: TOXENV=quality
     - python: 3.7
-      env: TOXENV=django111
-    - python: 3.6
+      env: TOXENV=quality
+  exclude:
+    - python: 2.7
       env: TOXENV=django20
-    - python: 3.6
+    - python: 2.7
       env: TOXENV=django21
+  allow_failures:
+    - python: 3.6
     - python: 3.7
-      env: TOXENV=django20
-    - python: 3.7
-      env: TOXENV=django21
-    - python: 2.7
-      env: TOXENV=quality
 
 addons:
     firefox: "52.0.1"

bin/workbench-make-xblock

@@ -9,7 +9,6 @@ import textwrap
 
 from cookiecutter.main import cookiecutter
 
-
 EXPLANATION = """\
 This script will create a new XBlock project.
 

doc/conf.py

@@ -11,6 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+from __future__ import absolute_import
+
 import os
 import sys
 

manage.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 """Manage.py file for XBlock"""
+from __future__ import absolute_import
+
 import os
 import sys
 

prototype/{{cookiecutter.short_name}}/setup.py

@@ -1,5 +1,7 @@
 """Setup for {{cookiecutter.short_name|lower}} XBlock."""
 
+from __future__ import absolute_import
+
 import os
 
 from setuptools import setup

prototype/{{cookiecutter.short_name}}/{{cookiecutter.short_name}}/{{cookiecutter.short_name}}.py

@@ -1,6 +1,7 @@
 """TO-DO: Write a description of what this XBlock is."""
 
 import pkg_resources
+
 from xblock.core import XBlock
 from xblock.fields import Integer, Scope
 from xblock.fragment import Fragment

requirements/dev.txt

@@ -34,7 +34,7 @@ fs==2.0.27                # via django-pyfs, fs-s3fs, xblock
 funcsigs==1.0.2           # via mock, pytest
 future==0.17.1            # via backports.os
 futures==3.2.0 ; python_version == "2.7"  # via isort, s3transfer
-isort==4.3.4
+isort==4.3.9
 jinja2==2.10              # via cookiecutter
 jmespath==0.9.3           # via boto3, botocore
 lazy-object-proxy==1.3.1  # via astroid

requirements/quality.txt

@@ -12,7 +12,7 @@ configparser==3.7.1       # via pydocstyle, pylint
 edx-lint==1.1.1
 enum34==1.1.6             # via astroid
 futures==3.2.0 ; python_version == "2.7"  # via isort
-isort==4.3.4
+isort==4.3.9
 lazy-object-proxy==1.3.1  # via astroid
 mccabe==0.6.1             # via pylint
 pycodestyle==2.5.0

sample_xblocks/basic/content.py

@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
 """Content-oriented XBlocks."""
 
+from __future__ import absolute_import
+
 from string import Template
 
 from lxml import etree
 from six import text_type
+
 from xblock.core import Scope, String, XBlock
 from xblock.fragment import Fragment
 

sample_xblocks/basic/problem.py

@@ -34,6 +34,8 @@
 
 """
 
+from __future__ import absolute_import
+
 import inspect
 import random
 import string

sample_xblocks/basic/slider.py

@@ -3,6 +3,8 @@
 WARNING: This is an experimental module, subject to future change or removal.
 """
 
+from __future__ import absolute_import
+
 import json
 
 from webob import Response

sample_xblocks/basic/structure.py

@@ -1,5 +1,7 @@
 """Structure-oriented XBlocks."""
 
+from __future__ import absolute_import
+
 from xblock.core import XBlock
 from xblock.fragment import Fragment
 

sample_xblocks/basic/test/test_problem.py

@@ -2,13 +2,15 @@
 Tests of the Problem XBlock, and its components.
 """
 
+from __future__ import absolute_import
+
 import json
 
 import pytest
-import webob
-from xblock.test.tools import assert_equals
 
+import webob
 from workbench.runtime import WorkbenchRuntime
+from xblock.test.tools import assert_equals
 
 
 def make_request(body):

sample_xblocks/basic/test/test_view_counter.py

@@ -1,12 +1,15 @@
 """ Simple test for the view counter that verifies that it is updating properly """
 
+from __future__ import absolute_import
+
+from six.moves import range
+
 from mock import Mock
+from sample_xblocks.basic.view_counter import ViewCounter
 from xblock.runtime import DictKeyValueStore, KvsFieldData
 from xblock.test.tools import TestRuntime as Runtime  # Workaround for pytest trying to collect "TestRuntime" as a test
 from xblock.test.tools import assert_equals, assert_in
 
-from sample_xblocks.basic.view_counter import ViewCounter
-
 
 def test_view_counter_state():
     key_store = DictKeyValueStore()
@@ -17,7 +20,7 @@ def test_view_counter_state():
     assert_equals(tester.views, 0)
 
     # View the XBlock five times
-    for i in xrange(5):
+    for i in range(5):
         generated_html = tester.student_view({})
         # Make sure the html fragment we're expecting appears in the body_html
         assert_in('<span class="views">{0}</span>'.format(i + 1), generated_html.body_html())

sample_xblocks/basic/view_counter.py

@@ -1,4 +1,6 @@
 """ Simple View Counting XBlock"""
+from __future__ import absolute_import
+
 from xblock.core import XBlock
 from xblock.fields import Integer, Scope
 from xblock.fragment import Fragment

sample_xblocks/filethumbs/filethumbs.py

@@ -17,12 +17,16 @@
 
 """
 
+from __future__ import absolute_import
+
 import json
 import logging
 
 import pkg_resources
-import png
 from six import text_type
+from six.moves import map
+
+import png
 from xblock.core import XBlock
 from xblock.fields import Boolean, Scope
 from xblock.fragment import Fragment
@@ -31,7 +35,7 @@
 log = logging.getLogger(__name__)
 
 ARROW = [
-    map(int, value)
+    list(map(int, value))
     for value in [
         '11011',
         '10001',

sample_xblocks/thumbs/thumbs.py

@@ -1,9 +1,12 @@
 """An XBlock providing thumbs-up/thumbs-down voting."""
 
+from __future__ import absolute_import
+
 import logging
 
 import pkg_resources
 from six import text_type
+
 from xblock.core import XBlock, XBlockAside
 from xblock.fields import Boolean, Integer, Scope
 from xblock.fragment import Fragment

settings.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import warnings
 
 from workbench.settings import *

setup.py

@@ -1,4 +1,6 @@
 """Set up for XBlock SDK"""
+from __future__ import absolute_import
+
 import os
 import os.path
 

tox.ini

@@ -33,4 +33,4 @@ deps =
 
 commands =
     pylint workbench sample_xblocks
-    isort --check-only --recursive workbench sample_xblocks manage.py setup.py settings.py
+    isort --check-only --recursive .

workbench/admin.py

@@ -2,6 +2,8 @@
 Basic admin screens for displaying XBlock state and filtering/searching on the
 fields.
 """
+from __future__ import absolute_import
+
 from django.contrib import admin
 
 from .models import XBlockState

workbench/blocks.py

@@ -4,6 +4,8 @@
 
 """
 
+from __future__ import absolute_import
+
 from xblock.core import XBlock
 from xblock.fragment import Fragment
 

workbench/migrations/0001_initial.py

@@ -2,6 +2,7 @@
 # Generated by Django 1.11.3 on 2017-08-01 12:30
 from __future__ import unicode_literals
 
+from __future__ import absolute_import
 from django.db import migrations, models
 import django.utils.timezone
 

workbench/models.py

@@ -7,11 +7,13 @@
 Admin gives us a lot of basic search/filtering for free.
 
 """
-from xblock.fields import BlockScope, Scope
+from __future__ import absolute_import
 
 from django.db import models
 from django.utils.timezone import now
 
+from xblock.fields import BlockScope, Scope
+
 
 def shorten_scope_name(scope_name):
     """

workbench/runtime.py

@@ -3,24 +3,27 @@
 Code in this file is a mix of Runtime layer and Workbench layer.
 
 """
+from __future__ import absolute_import
+
 import importlib
 import itertools
 import logging
 from collections import defaultdict
 
 from six import iteritems
-from xblock.core import XBlockAside
-from xblock.exceptions import NoSuchDefinition, NoSuchUsage
-from xblock.fragment import Fragment
-from xblock.reference.user_service import UserService, XBlockUser
-from xblock.runtime import IdGenerator, IdReader, KeyValueStore, KvsFieldData, NoSuchViewError, NullI18nService, Runtime
 
 import django.utils.translation
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.template import loader as django_template_loader
 from django.templatetags.static import static
 
+from xblock.core import XBlockAside
+from xblock.exceptions import NoSuchDefinition, NoSuchUsage
+from xblock.fragment import Fragment
+from xblock.reference.user_service import UserService, XBlockUser
+from xblock.runtime import IdGenerator, IdReader, KeyValueStore, KvsFieldData, NoSuchViewError, NullI18nService, Runtime
+
 from .models import XBlockState
 from .util import make_safe_for_html
 

workbench/scenarios.py

@@ -3,14 +3,16 @@
 This code is in the Workbench layer.
 
 """
+from __future__ import absolute_import
+
 import logging
 from collections import namedtuple
 
-from xblock.core import XBlock
-
 from django.conf import settings
 from django.template.defaultfilters import slugify
 
+from xblock.core import XBlock
+
 log = logging.getLogger(__name__)
 
 # Build the scenarios, which are named trees of usages.

workbench/settings.py

@@ -1,4 +1,6 @@
 """Django settings for workbench project."""
+from __future__ import absolute_import
+
 import json
 import os
 

workbench/test/selenium_test.py

@@ -2,13 +2,15 @@
 Helpers for Selenium tests.
 """
 
+from __future__ import absolute_import
+
 import pytest
-from bok_choy.web_app_test import WebAppTest
-from selenium.webdriver.support.expected_conditions import staleness_of
-from selenium.webdriver.support.ui import WebDriverWait
 
 from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 
+from bok_choy.web_app_test import WebAppTest
+from selenium.webdriver.support.expected_conditions import staleness_of
+from selenium.webdriver.support.ui import WebDriverWait
 from workbench.runtime_util import reset_global_state
 
 

workbench/test/test_filethumbs.py

@@ -1,6 +1,7 @@
 """Tests for the thumbs module"""
-from bok_choy.promise import EmptyPromise
+from __future__ import absolute_import
 
+from bok_choy.promise import EmptyPromise
 from workbench import scenarios
 from workbench.test.selenium_test import SeleniumTest
 

workbench/test/test_problems.py

@@ -1,12 +1,13 @@
 """Test that problems and problem submission works well."""
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
 import time
 import unittest
 
+from six.moves import range
+
 from bok_choy.query import BrowserQuery
 from selenium.common.exceptions import StaleElementReferenceException
-
 from workbench import scenarios
 from workbench.test.selenium_test import SeleniumTest
 

workbench/test/test_runtime.py

@@ -1,15 +1,18 @@
 """Test Workbench Runtime"""
 
+from __future__ import absolute_import
+
 from unittest import TestCase
 
-import mock
 import pytest
+
+from django.conf import settings
+
+import mock
 from xblock.fields import Scope
 from xblock.reference.user_service import UserService
 from xblock.runtime import KeyValueStore, KvsFieldData
 
-from django.conf import settings
-
 from ..runtime import ScenarioIdManager, WorkbenchDjangoKeyValueStore, WorkbenchRuntime
 
 

workbench/test/test_scenarios.py

@@ -2,17 +2,19 @@
 Test that all scenarios render successfully.
 """
 
+from __future__ import absolute_import
+
 import unittest
 
 import lxml.html
 import pytest
-from xblock.test.tools import assert_equals
 
 from django.core.urlresolvers import reverse
 from django.test.client import Client
 
 from workbench import scenarios
 from workbench.runtime_util import reset_global_state
+from xblock.test.tools import assert_equals
 
 pytestmark = pytest.mark.django_db  # pylint: disable=invalid-name
 
@@ -36,7 +38,7 @@ def test_all_scenarios(self):
         a_tags = list(html.xpath('//a'))
 
         # Load the loaded_scenarios from the classes.
-        loaded_scenarios = scenarios.get_scenarios().values()
+        loaded_scenarios = list(scenarios.get_scenarios().values())
 
         # We should have an <a> tag for each scenario.
         assert_equals(len(a_tags), len(loaded_scenarios))
@@ -60,7 +62,7 @@ def test_scenario(self):
         serve it. Normally we would get scenario_ids through a fixture, but
         it forces database access, which pytest_django doesn't like.
         """
-        scenario_ids = scenarios.get_scenarios().keys()
+        scenario_ids = list(scenarios.get_scenarios().keys())
 
         for scenario_id in scenario_ids:
             url = reverse('workbench_show_scenario', kwargs={'scenario_id': scenario_id})

workbench/test/test_thumbs.py

@@ -1,7 +1,9 @@
 """Tests for the thumbs module"""
+from __future__ import absolute_import
+
 import pytest
-from bok_choy.promise import EmptyPromise
 
+from bok_choy.promise import EmptyPromise
 from workbench import scenarios
 from workbench.test.selenium_test import SeleniumTest
 

workbench/test/test_views.py

@@ -1,22 +1,23 @@
 """Test the workbench views."""
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
 import functools
 import json
 
 import pytest
-from webob import Response
-from xblock.core import Scope, String, XBlock
-from xblock.exceptions import DisallowedFileError
-from xblock.fragment import Fragment
-from xblock.runtime import NoSuchHandlerError
-from xblock.test.tools import assert_equals, assert_in, assert_raises, assert_raises_regexp, assert_true
+from six.moves import zip
 
 from django.core.urlresolvers import reverse
 from django.test.client import Client
 
+from webob import Response
 from workbench import scenarios
 from workbench.runtime import ID_MANAGER
+from xblock.core import Scope, String, XBlock
+from xblock.exceptions import DisallowedFileError
+from xblock.fragment import Fragment
+from xblock.runtime import NoSuchHandlerError
+from xblock.test.tools import assert_equals, assert_in, assert_raises, assert_raises_regexp, assert_true
 
 pytestmark = pytest.mark.django_db  # pylint: disable=invalid-name
 

workbench/test_utils.py

@@ -2,13 +2,12 @@
 
 These utilities use the workbench runtime to load XML scenarios.
 """
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
 import json
 from functools import wraps
 
 import webob
-
 from workbench.runtime import WorkbenchRuntime
 
 

workbench/urls.py

@@ -1,5 +1,7 @@
 """Provide XBlock urls"""
 
+from __future__ import absolute_import
+
 from django.conf.urls import include, url
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns

workbench/views.py

@@ -4,19 +4,21 @@
 
 """
 
+from __future__ import absolute_import
+
 import json
 import logging
 import mimetypes
 
+from django.http import Http404, HttpResponse
+from django.shortcuts import redirect, render_to_response
+from django.views.decorators.csrf import csrf_exempt, ensure_csrf_cookie
+
 from xblock.core import XBlock, XBlockAside
 from xblock.django.request import django_to_webob_request, webob_to_django_response
 from xblock.exceptions import NoSuchUsage
 from xblock.plugin import PluginMissingError
 
-from django.http import Http404, HttpResponse
-from django.shortcuts import redirect, render_to_response
-from django.views.decorators.csrf import csrf_exempt, ensure_csrf_cookie
-
 from .models import XBlockState
 from .runtime import WorkbenchRuntime
 from .runtime_util import reset_global_state

workbench/wsgi.py

@@ -13,6 +13,8 @@
 framework.
 
 """
+from __future__ import absolute_import
+
 import os
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "workbench.settings")