From 492cbc83c910b5f97e9d20fb0fa0bc0b3d6ed2f5 Mon Sep 17 00:00:00 2001
From: Alex Grintsvayg <alex@grin.io>
Date: Wed, 19 Apr 2017 16:00:36 -0400
Subject: [PATCH] pylint

---
 .pylintrc                            | 3 +++
 lbrynet/conf.py                      | 6 +++---
 lbrynet/core/client/BlobRequester.py | 2 +-
 lbrynet/lbrynet_daemon/Daemon.py     | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index fed2983f9..24e6c4993 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -82,13 +82,16 @@ disable=
   global-statement,
   inherit-non-class,
   invalid-name,
+  len-as-condition,
   locally-disabled,
   logging-not-lazy,
   missing-docstring,
   multiple-imports,
+  no-else-return,
   no-init,
   no-member,
   no-self-use,
+  not-context-manager,
   pointless-string-statement,
   protected-access,
   redefined-builtin,
diff --git a/lbrynet/conf.py b/lbrynet/conf.py
index cd5869868..36140c9ba 100644
--- a/lbrynet/conf.py
+++ b/lbrynet/conf.py
@@ -316,9 +316,9 @@ class Config(object):
         if data_type is not None:
             self._assert_valid_data_type(data_type)
             return self._data[data_type][name]
-        for data_type in self._search_order:
-            if name in self._data[data_type]:
-                return self._data[data_type][name]
+        for possible_data_type in self._search_order:
+            if name in self._data[possible_data_type]:
+                return self._data[possible_data_type][name]
         raise KeyError('{} is not a valid setting'.format(name))
 
     def set(self, name, value, data_types=(TYPE_RUNTIME,)):
diff --git a/lbrynet/core/client/BlobRequester.py b/lbrynet/core/client/BlobRequester.py
index 5d392240b..d1681b0db 100644
--- a/lbrynet/core/client/BlobRequester.py
+++ b/lbrynet/core/client/BlobRequester.py
@@ -215,7 +215,7 @@ class RequestHelper(object):
         log.warning("A request of type '%s' failed. Reason: %s, Error type: %s",
                     request_type, reason.getErrorMessage(), reason.type)
         self.update_local_score(-10.0)
-        if isinstance(reason, InvalidResponseError) or isinstance(reason, NoResponseError):
+        if isinstance(reason, (InvalidResponseError, NoResponseError)):
             self.peer.update_score(-10.0)
         else:
             self.peer.update_score(-2.0)
diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py
index 90f449a6f..f3c3c8e76 100644
--- a/lbrynet/lbrynet_daemon/Daemon.py
+++ b/lbrynet/lbrynet_daemon/Daemon.py
@@ -2745,7 +2745,7 @@ def format_json_out_amount_as_float(obj):
         for k, v in obj.iteritems():
             if k == 'amount' or k == 'effective_amount':
                 obj[k] = float(obj[k])
-            if isinstance(v, dict) or isinstance(v, list):
+            if isinstance(v, (dict, list)):
                 obj[k] = format_json_out_amount_as_float(v)
 
     elif isinstance(obj, list):