Fix new pylint 1.5.0 violations

exporter/tests/test_export.py

@@ -21,16 +21,14 @@
 from learningresources.api import (
     update_description_path,
     create_static_asset,
+    create_resource,
+    create_course,
 )
 from exporter.api import (
     export_resources_to_directory,
     export_resources_to_tarball,
 )
 from exporter.tasks import export_resources
-from learningresources.api import (
-    create_resource,
-    create_course,
-)
 from importer.tasks import import_file
 
 

importer/api/__init__.py

@@ -4,13 +4,14 @@
 
 from __future__ import unicode_literals
 
-from bs4 import BeautifulSoup
 from shutil import rmtree
 import logging
 from tempfile import mkdtemp
 from os.path import join, exists
 from os import listdir
 
+from bs4 import BeautifulSoup
+
 from archive import Archive, ArchiveException
 from django.core.files.storage import default_storage
 from django.db import transaction
@@ -194,7 +195,7 @@ def import_children(course, element, parent, parent_dpath):
     # temp variable to store static assets for bulk insert
     static_assets_to_save = set()
     target = "/static/"
-    if element.tag == "video":
+    if element.tag == "video":  # pylint: disable=too-many-nested-blocks
         subname = get_video_sub(element)
         if subname != "":
             assets = StaticAsset.objects.filter(

importer/tests/test_import.py

@@ -16,6 +16,7 @@
 import mock
 from lxml import etree
 
+from xbundle import XBundle
 from importer.api import (
     import_course_from_file,
     import_course_from_path,
@@ -33,7 +34,6 @@
 )
 from learningresources.tests.base import LoreTestCase
 from lore import settings
-from xbundle import XBundle
 
 log = logging.getLogger(__name__)
 

learningresources/tests/test_api.py

@@ -5,12 +5,14 @@
 from __future__ import unicode_literals
 
 import logging
+import tempfile
 
 from django.core.files import File
 from django.core.files.storage import default_storage
 from django.core.management import call_command
 from django.db.utils import IntegrityError
-import tempfile
+
+from mock import patch
 
 from importer.api import import_course_from_file
 from learningresources import api
@@ -19,7 +21,6 @@
     LearningResource,
     static_asset_basepath,
 )
-from mock import patch
 from .base import LoreTestCase
 
 log = logging.getLogger(__name__)

learningresources/tests/test_models.py

@@ -88,7 +88,7 @@ def test_unicode(self):
             name="first"
         )
 
-        self.assertEquals("first", str(first))
+        self.assertEqual("first", str(first))
 
     def test_repo_slug(self):
         """Test behavior saving a repository slug"""

learningresources/tests/test_utils.py

@@ -33,7 +33,7 @@ def test_sub_language(self):
             ("de", "de_subs_CCxmtcICYNc.srt.sjson"),
         )
         for lang, sub in values:
-            self.assertEquals(sub, _subs_filename("CCxmtcICYNc", lang))
+            self.assertEqual(sub, _subs_filename("CCxmtcICYNc", lang))
 
     def test_get_sub_name(self):
         """Test getting subtitle names."""

lore/settings.py

@@ -415,5 +415,5 @@ def get_var(name, default):
 GOOGLE_ANALYTICS_ID = get_var('LORE_GOOGLE_ANALYTICS_ID', None)
 
 # This is needed to connect the signals properly.
-# pylint: disable=unused-import
+# pylint: disable=unused-import,wrong-import-position
 import search.signals  # noqa

rest/views.py

@@ -24,10 +24,6 @@
 from rest_framework.viewsets import GenericViewSet
 from statsd.defaults.django import statsd
 
-from learningresources.api import (
-    PermissionDenied,
-    NotFound,
-)
 from roles.permissions import GroupTypes, BaseGroupTypes
 from roles.api import (
     assign_user_to_repo_group,
@@ -77,6 +73,11 @@
 from search.api import construct_queryset
 from search.tasks import index_resources
 from taxonomy.models import Vocabulary
+
+from learningresources.api import (
+    PermissionDenied,
+    NotFound,
+)
 from learningresources.models import (
     Repository,
     Course,
@@ -654,7 +655,7 @@ def get_queryset(self):
             exports = []
         return [{"id": lr_id} for lr_id in exports]
 
-    def create(self, request, *args, **kwargs):
+    def create(self, request, *args, **kwargs):  # noqa pylint: disable=unused-argument
         try:
             lr_id = int(request.data['id'])
         except ValueError:

roles/tests/test_user_models.py

@@ -49,8 +49,8 @@ class FooObject(object):
             def __init__(self, foo_var):
                 self.foo_var = foo_var
 
-        user_group2 = FooObject('bar')
-        self.assertFalse(user_group1.__eq__(user_group2))
+        foo_object = FooObject('bar')
+        self.assertFalse(user_group1.__eq__(foo_object))
 
     def test_user_group_hash(self):
         """Test for UserGroup __hash__"""

search/tasks.py

@@ -4,8 +4,8 @@
 
 from __future__ import unicode_literals
 
-from lore.celery import async
 from statsd.defaults.django import statsd
+from lore.celery import async
 
 
 @async.task

search/utils.py

@@ -5,10 +5,11 @@
 from __future__ import unicode_literals
 
 from collections import defaultdict
-from lxml import etree
 import logging
 from itertools import islice
 
+from lxml import etree
+
 from django.conf import settings
 from elasticsearch.helpers import bulk
 from elasticsearch.exceptions import NotFoundError

taxonomy/tests/test_api.py

@@ -10,20 +10,20 @@
     NotFound,
     PermissionDenied,
 )
-
-from taxonomy.models import (
-    Vocabulary,
-    Term,
-)
 from learningresources.models import (
     LearningResource,
     LearningResourceType,
     Course,
 )
+
 from taxonomy.api import (
     get_term,
     get_vocabulary,
 )
+from taxonomy.models import (
+    Vocabulary,
+    Term,
+)
 
 
 class TestApi(LoreTestCase):
@@ -69,7 +69,7 @@ def test_get_term(self):
             self.vocabulary.slug,
             self.term.slug
         )
-        self.assertEquals(self.term, actual_term)
+        self.assertEqual(self.term, actual_term)
         with self.assertRaises(NotFound):
             get_term('missing', self.user.id,
                      self.vocabulary.slug, self.term.slug)
@@ -90,7 +90,7 @@ def test_get_vocabulary(self):
 
         actual_vocabulary = get_vocabulary(
             self.repo.slug, self.user.id, self.vocabulary.slug)
-        self.assertEquals(self.vocabulary, actual_vocabulary)
+        self.assertEqual(self.vocabulary, actual_vocabulary)
 
         with self.assertRaises(NotFound):
             get_vocabulary("missing", self.user.id, self.vocabulary.slug)

tests/test_urls.py

@@ -3,17 +3,16 @@
 """
 
 from __future__ import unicode_literals
+import ssl
+from urltools import compare  # noqa
 
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
-import ssl
 
 if hasattr(ssl, '_create_unverified_context'):
     ssl._create_default_https_context = ssl._create_unverified_context  # noqa pylint: disable=protected-access
 
-from urltools import compare  # noqa
-
 
 class TestURLs(TestCase):
     """Verify project level URL configuration."""

ui/tests/test_ga.py

@@ -3,10 +3,10 @@
 """
 from __future__ import unicode_literals
 
-from learningresources.tests.base import LoreTestCase
-
 from django.test.utils import override_settings
 
+from learningresources.tests.base import LoreTestCase
+
 
 class TestGoogleAnalytics(LoreTestCase):
     """Test the Google Analytics setting."""

ui/tests/test_learningresources_views.py

@@ -12,14 +12,15 @@
 from django.core.files.storage import default_storage
 from django.core.urlresolvers import resolve
 
+from six.moves import reload_module  # pylint: disable=import-error
+
 import ui.urls
+from learningresources.tests.base import LoreTestCase
 from learningresources.models import Repository, StaticAsset
 from roles.api import assign_user_to_repo_group, remove_user_from_repo_group
 from roles.permissions import GroupTypes
 from search.sorting import LoreSortingFields
-from six.moves import reload_module  # pylint: disable=import-error
 
-from learningresources.tests.base import LoreTestCase
 
 HTTP_OK = 200
 UNAUTHORIZED = 403