Merge pull request #172 from ferbncode/pylint-fix

CB-272: Update pylint version and fix the `Unused variable '__class__'` error for unit tests.

critiquebrainz/data/dump_manager.py

@@ -10,11 +10,11 @@
 import os
 from flask import current_app, jsonify
 from flask.json import JSONEncoder
+import sqlalchemy
+import click
 from critiquebrainz.data.utils import create_path, remove_old_archives, slugify, explode_db_uri
 from critiquebrainz.db import license as db_license, review as db_review
 from critiquebrainz import frontend, db
-import sqlalchemy
-import click
 
 
 cli = click.Group()

critiquebrainz/db/license.py

@@ -1,5 +1,5 @@
-from critiquebrainz import db
 import sqlalchemy
+from critiquebrainz import db
 
 
 def create(*, id, full_name, info_url=None):

critiquebrainz/db/moderation_log.py

@@ -3,8 +3,8 @@
 via the moderator interface. A new log entry is created for every action.
 """
 from datetime import datetime
-from critiquebrainz import db
 import sqlalchemy
+from critiquebrainz import db
 
 
 ACTION_HIDE_REVIEW = "hide_review"

critiquebrainz/db/oauth_client.py

@@ -1,7 +1,7 @@
+import sqlalchemy
 from critiquebrainz import db
 from critiquebrainz.db import exceptions as db_exceptions
 from critiquebrainz.utils import generate_string
-import sqlalchemy
 
 
 CLIENT_ID_LENGTH = 20

critiquebrainz/db/oauth_grant.py

@@ -1,6 +1,6 @@
+import sqlalchemy
 from critiquebrainz import db
 from critiquebrainz.db import exceptions as db_exceptions
-import sqlalchemy
 
 
 def create(*, client_id, scopes, code, expires, redirect_uri, user_id):

critiquebrainz/db/oauth_token.py

@@ -1,6 +1,6 @@
+import sqlalchemy
 from critiquebrainz import db
 from critiquebrainz.db import exceptions as db_exceptions
-import sqlalchemy
 
 
 def create(*, client_id, scopes, access_token, refresh_token, expires, user_id):

critiquebrainz/db/review.py

@@ -2,6 +2,7 @@
 from datetime import datetime, timedelta
 import uuid
 import sqlalchemy
+import pycountry
 from brainzutils import cache
 from critiquebrainz import db
 from critiquebrainz.db import (exceptions as db_exceptions,
@@ -10,7 +11,6 @@
                                avg_rating as db_avg_rating,
                                RATING_SCALE_1_5)
 from critiquebrainz.db.user import User
-import pycountry
 
 REVIEW_CACHE_NAMESPACE = "Review"
 DEFAULT_LICENSE_ID = "CC BY-SA 3.0"

critiquebrainz/db/revision.py

@@ -1,10 +1,10 @@
 from datetime import datetime
+import sqlalchemy
 from critiquebrainz import db
 from critiquebrainz.db import review as db_review
 from critiquebrainz.db import avg_rating as db_avg_rating
 from critiquebrainz.db import exceptions as db_exceptions
 from critiquebrainz.db import VALID_RATING_VALUES, RATING_SCALE_1_5, RATING_SCALE_0_100
-import sqlalchemy
 
 
 def get(review_id, limit=1, offset=0):

critiquebrainz/db/spam_report.py

@@ -1,7 +1,7 @@
 from datetime import datetime
+import sqlalchemy
 from critiquebrainz import db
 from critiquebrainz.db import revision as db_revision
-import sqlalchemy
 
 
 def get(user_id, revision_id):

critiquebrainz/db/users.py

@@ -1,9 +1,9 @@
 from datetime import datetime
 import uuid
 from hashlib import md5
+import sqlalchemy
 from critiquebrainz import db
 from critiquebrainz.db import revision as db_revision
-import sqlalchemy
 
 
 def gravatar_url(source, default="identicon", rating="pg"):

critiquebrainz/db/vote.py

@@ -1,7 +1,7 @@
 from datetime import datetime
+import sqlalchemy
 from critiquebrainz import db
 from critiquebrainz.db import exceptions as db_exceptions
-import sqlalchemy
 
 
 def get(user_id, revision_id):

critiquebrainz/frontend/external/mbspotify.py

@@ -7,9 +7,9 @@
 import requests
 from requests.exceptions import RequestException
 from requests.adapters import HTTPAdapter
-from critiquebrainz.frontend import flash
 from flask_babel import lazy_gettext
 from brainzutils import cache
+from critiquebrainz.frontend import flash
 
 _base_url = ""
 _key = ""

critiquebrainz/frontend/external/musicbrainz.py

@@ -9,9 +9,9 @@
 import musicbrainzngs
 from musicbrainzngs.musicbrainz import ResponseError
 from brainzutils import cache
+from werkzeug.exceptions import InternalServerError
 from critiquebrainz.frontend.external.relationships import artist as artist_rel
 from critiquebrainz.frontend.external.relationships import release_group as release_group_rel
-from werkzeug.exceptions import InternalServerError
 
 DEFAULT_CACHE_EXPIRATION = 12 * 60 * 60  # seconds (12 hours)
 

critiquebrainz/frontend/external/musicbrainz_db/artist.py

@@ -1,13 +1,13 @@
 from collections import defaultdict
 from sqlalchemy.orm import joinedload
 from mbdata import models
+from brainzutils import cache
 from critiquebrainz.frontend.external.musicbrainz_db import mb_session, DEFAULT_CACHE_EXPIRATION
 from critiquebrainz.frontend.external.musicbrainz_db.helpers import get_relationship_info
 from critiquebrainz.frontend.external.relationships import artist as artist_rel
 from critiquebrainz.frontend.external.musicbrainz_db.utils import get_entities_by_gids
 from critiquebrainz.frontend.external.musicbrainz_db.serialize import to_dict_artists
 from critiquebrainz.frontend.external.musicbrainz_db.includes import check_includes
-from brainzutils import cache
 
 
 def get_artist_by_id(mbid):

critiquebrainz/frontend/external/musicbrainz_db/event.py

@@ -1,11 +1,11 @@
 from collections import defaultdict
 from mbdata import models
+from brainzutils import cache
 from critiquebrainz.frontend.external.musicbrainz_db import mb_session, DEFAULT_CACHE_EXPIRATION
 from critiquebrainz.frontend.external.musicbrainz_db.utils import get_entities_by_gids
 from critiquebrainz.frontend.external.musicbrainz_db.includes import check_includes
 from critiquebrainz.frontend.external.musicbrainz_db.serialize import to_dict_events
 from critiquebrainz.frontend.external.musicbrainz_db.helpers import get_relationship_info
-from brainzutils import cache
 
 
 def get_event_by_id(mbid):

critiquebrainz/frontend/external/musicbrainz_db/utils.py

@@ -1,5 +1,5 @@
-import critiquebrainz.frontend.external.musicbrainz_db.exceptions as mb_exceptions
 from mbdata import models
+import critiquebrainz.frontend.external.musicbrainz_db.exceptions as mb_exceptions
 
 
 # Entity models

critiquebrainz/frontend/forms/review.py

@@ -4,8 +4,8 @@
 from wtforms.validators import ValidationError
 from wtforms.widgets import HiddenInput, Input
 from babel.core import UnknownLocaleError
-from critiquebrainz.db.review import supported_languages
 import pycountry
+from critiquebrainz.db.review import supported_languages
 
 MIN_REVIEW_LENGTH = 25
 MAX_REVIEW_LENGTH = 100000

critiquebrainz/frontend/login/__init__.py

@@ -7,10 +7,10 @@
 from flask import redirect, url_for
 from flask_login import LoginManager, current_user
 from flask_babel import lazy_gettext, gettext
+from werkzeug.exceptions import Unauthorized
 from critiquebrainz.data.mixins import AnonymousUser
 import critiquebrainz.db.users as db_users
 from critiquebrainz.db.user import User
-from werkzeug.exceptions import Unauthorized
 
 mb_auth = None
 

critiquebrainz/frontend/views/__init__.py

@@ -1,6 +1,7 @@
 import critiquebrainz.db.avg_rating as db_avg_rating
 import critiquebrainz.db.exceptions as db_exceptions
 
+
 def get_avg_rating(entity_id, entity_type):
     """Retrieve average rating"""
     try:

critiquebrainz/frontend/views/index.py

@@ -1,9 +1,9 @@
 from flask import Blueprint, render_template
 from flask_babel import format_number
-import critiquebrainz.db.users as db_users
-import critiquebrainz.db.review as db_review
 from bs4 import BeautifulSoup
 from markdown import markdown
+import critiquebrainz.db.users as db_users
+import critiquebrainz.db.review as db_review
 
 DEFAULT_CACHE_EXPIRATION = 10 * 60  # seconds
 

critiquebrainz/frontend/views/place.py

@@ -1,11 +1,11 @@
 from flask import Blueprint, render_template, request
 from flask_login import current_user
 from flask_babel import gettext
+from werkzeug.exceptions import NotFound
 import critiquebrainz.frontend.external.musicbrainz_db.place as mb_place
 import critiquebrainz.frontend.external.musicbrainz_db.exceptions as mb_exceptions
 from critiquebrainz.frontend.views import get_avg_rating
 import critiquebrainz.db.review as db_review
-from werkzeug.exceptions import NotFound
 
 place_bp = Blueprint('place', __name__)
 

critiquebrainz/frontend/views/release.py

@@ -1,7 +1,7 @@
 from flask import Blueprint, redirect
 from flask_babel import gettext
-import critiquebrainz.frontend.external.musicbrainz_db.release as mb_release
 from werkzeug.exceptions import NotFound
+import critiquebrainz.frontend.external.musicbrainz_db.release as mb_release
 
 release_bp = Blueprint('release', __name__)
 

critiquebrainz/frontend/views/release_group.py

@@ -1,13 +1,13 @@
 from flask import Blueprint, render_template, request
 from flask_login import current_user
 from flask_babel import gettext
+from werkzeug.exceptions import NotFound
 from critiquebrainz.frontend.external import mbspotify, soundcloud
 import critiquebrainz.frontend.external.musicbrainz_db.release_group as mb_release_group
 import critiquebrainz.frontend.external.musicbrainz_db.exceptions as mb_exceptions
 import critiquebrainz.frontend.external.musicbrainz_db.release as mb_release
 import critiquebrainz.db.review as db_review
 from critiquebrainz.frontend.views import get_avg_rating
-from werkzeug.exceptions import NotFound
 
 
 release_group_bp = Blueprint('release_group', __name__)

critiquebrainz/frontend/views/test/test_review.py

@@ -1,11 +1,11 @@
 from unittest.mock import MagicMock
+from flask import current_app
 from critiquebrainz.frontend.testing import FrontendTestCase
 import critiquebrainz.db.review as db_review
 from critiquebrainz.db.user import User
 import critiquebrainz.db.users as db_users
 import critiquebrainz.db.license as db_license
 import critiquebrainz.frontend.external.musicbrainz_db.release as mb_release
-from flask import current_app
 
 
 def mock_get_entity_by_id(id, type='release_group'):

critiquebrainz/ws/review/views.py

@@ -1,4 +1,5 @@
 from flask import Blueprint, jsonify
+from brainzutils import cache
 from critiquebrainz.db.review import supported_languages, ENTITY_TYPES
 import critiquebrainz.db.review as db_review
 from critiquebrainz.db import (
@@ -16,7 +17,6 @@
 from critiquebrainz.ws.oauth import oauth
 from critiquebrainz.ws.parser import Parser
 from critiquebrainz.decorators import crossdomain
-from brainzutils import cache
 
 review_bp = Blueprint('ws_review', __name__)
 

manage.py

@@ -2,11 +2,11 @@
 from werkzeug.serving import run_simple
 from werkzeug.wsgi import DispatcherMiddleware
 from brainzutils import cache
+import click
 from critiquebrainz import frontend, ws
 from critiquebrainz.data import dump_manager
 import critiquebrainz.data.utils as data_utils
 import critiquebrainz.data.fixtures as _fixtures
-import click
 
 
 cli = click.Group()

pylintrc

@@ -9,7 +9,7 @@
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=missing-docstring,protected-access,invalid-name,global-statement,fixme,too-many-locals,redefined-builtin,broad-except,line-too-long,too-many-arguments,too-many-instance-attributes,redefined-outer-name,attribute-defined-outside-init,anomalous-backslash-in-string,too-many-statements,too-few-public-methods,redefined-argument-from-local,too-many-return-statements,too-many-function-args,redefined-argument-from-local,too-many-public-methods
+disable=missing-docstring,protected-access,invalid-name,global-statement,fixme,too-many-locals,redefined-builtin,broad-except,line-too-long,too-many-arguments,too-many-instance-attributes,redefined-outer-name,attribute-defined-outside-init,anomalous-backslash-in-string,too-many-statements,too-few-public-methods,redefined-argument-from-local,too-many-return-statements,too-many-function-args,redefined-argument-from-local,too-many-public-methods,inconsistent-return-statements, keyword-arg-before-vararg
 
 
 [REPORTS]

requirements.txt

@@ -12,7 +12,7 @@ mbdata==2017.6.2
 musicbrainzngs==0.6
 pytest==3.2.0
 pytest-cov==2.5.1
-pylint==1.7.2
+pylint==1.8.1
 flake8==3.4.1
 psycopg2==2.7.3
 pycountry==1.20