Merge pull request #92 from box/pylint

Updates to code to pass pylint newest version.

Author: Jeff-Meadows

.pylintrc

@@ -7,9 +7,6 @@
 # pygtk.require().
 #init-hook=
 
-# Profiled execution.
-profile=no
-
 # Add files or directories to the blacklist. They should be base names, not
 # paths.
 #ignore=CVS
@@ -68,20 +65,13 @@ reports=no
 # (RP0004).
 evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
 
-# Add a comment according to your evaluation note. This is used by the global
-# evaluation report (RP0004).
-comment=no
-
 # Template used to display messages. This is a python new-style format string
 # used to format the massage information. See doc for all details
 msg-template={module}:{line}:{column}: [{msg_id}({symbol}), {obj}] {msg}
 
 
 [BASIC]
 
-# Required attributes for module, separated by a comma
-required-attributes=
-
 # List of builtins function names that should not be used, separated by a comma
 bad-functions=map,filter,apply,input
 
@@ -131,6 +121,8 @@ no-docstring-rgx=__.*__
 # ones are exempt.
 docstring-min-length=-1
 
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=6
 
 [FORMAT]
 
@@ -180,10 +172,6 @@ ignore-mixin-members=yes
 #ignored-classes=SQLObject
 ignored-classes=pytest, _pytest
 
-# When zope mode is activated, add a predefined set of Zope acquired attributes
-# to generated-members.
-zope=no
-
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E0201 when accessed. Python regular
 # expressions are accepted.
@@ -206,10 +194,6 @@ additional-builtins=
 
 [CLASSES]
 
-# List of interface methods to ignore, separated by a comma. This is used for
-# instance to not check methods defines in Zope's Interface base class.
-ignore-iface-methods=
-
 # List of method names used to declare (i.e. assign) instance attributes.
 defining-attr-methods=__init__,__new__,setUp
 

boxsdk/auth/jwt_auth.py

@@ -1,12 +1,15 @@
 # coding: utf-8
 
 from __future__ import unicode_literals
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives import serialization
+
 from datetime import datetime, timedelta
-import jwt
 import random
 import string
+
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import serialization
+import jwt
+
 from .oauth2 import OAuth2
 from boxsdk.util.compat import total_seconds
 

boxsdk/auth/oauth2.py

@@ -92,15 +92,15 @@ def access_token(self):
 
     def get_authorization_url(self, redirect_url):
         """
-        Get the authorization url based on the client id and the redirect url, passed in
+        Get the authorization url based on the client id and the redirect url passed in
 
         :param redirect_url:
             An HTTPS URI or custom URL scheme where the response will be redirected. Optional if the redirect URI is
             registered with Box already.
         :type redirect_url:
             `unicode` or None
         :return:
-            A tuple of the URL of Box’s authorization page and the CSRF token.
+            A tuple of the URL of Box's authorization page and the CSRF token.
             This is the URL that your application should forward the user to in first leg of OAuth 2.
         :rtype:
             (`unicode`, `unicode`)

boxsdk/auth/redis_managed_oauth2.py

@@ -1,9 +1,12 @@
 # coding: utf-8
 
 from __future__ import unicode_literals
+
+from uuid import uuid4
+
 from redis import StrictRedis
 from redis.lock import Lock
-from uuid import uuid4
+
 from boxsdk import JWTAuth, OAuth2
 
 

boxsdk/network/default_network.py

@@ -2,9 +2,10 @@
 
 from __future__ import unicode_literals
 
-import requests
 import time
 
+import requests
+
 from .network_interface import Network, NetworkResponse
 
 

boxsdk/object/search.py

@@ -2,9 +2,10 @@
 
 from __future__ import unicode_literals
 
+import json
+
 from .base_endpoint import BaseEndpoint
 from boxsdk.util.translator import Translator
-import json
 
 
 class MetadataSearchFilter(object):

boxsdk/util/log.py

@@ -31,9 +31,8 @@ def setup_logging(stream_or_file=None, debug=False, name=None):
     """
     logger = logging.getLogger(name)
     if isinstance(stream_or_file, string_types):
-        handler = logging.FileHandler(stream_or_file, mode='w')
+        logger.addHandler(logging.FileHandler(stream_or_file, mode='w'))
     else:
-        handler = logging.StreamHandler(stream_or_file or sys.stdout)
-    logger.addHandler(handler)
+        logger.addHandler(logging.StreamHandler(stream_or_file or sys.stdout))
     logger.setLevel(logging.DEBUG if debug else logging.INFO)
     return logger

test/functional/conftest.py

@@ -1,12 +1,15 @@
 # coding: utf-8
 
 from __future__ import unicode_literals
+
+import re
+
 from mock import patch
 import pytest
-import re
 import requests
 import six
 from six.moves.urllib import parse  # pylint:disable=import-error, no-name-in-module
+
 from boxsdk.auth.oauth2 import OAuth2
 from boxsdk.config import API
 from boxsdk.client import Client

test/functional/mock_box/behavior/event_behavior.py

@@ -1,10 +1,13 @@
 # coding: utf-8
 
 from __future__ import division, unicode_literals
-from bottle import request
+
 from datetime import datetime, timedelta
-from sqlalchemy import event
 from threading import Event
+
+from bottle import request
+from sqlalchemy import event
+
 from test.functional.mock_box.db_model.event_model import EventModel
 from test.functional.mock_box.db_model.file_model import FileModel
 from test.functional.mock_box.db_model.folder_model import FolderModel

test/functional/mock_box/behavior/file_behavior.py

@@ -1,9 +1,12 @@
 # coding: utf-8
 
 from __future__ import unicode_literals
-from bottle import response, request
+
 from hashlib import sha1
+
+from bottle import response, request
 from sqlalchemy.orm import make_transient
+
 from test.functional.mock_box.behavior.item_behavior import ItemBehavior
 from test.functional.mock_box.db_model.event_model import EventModel
 from test.functional.mock_box.db_model.file_model import FileModel