From a821647fbcf7369d360284fadf816095d7aecd85 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Thu, 7 Jun 2018 12:18:07 -0400 Subject: [PATCH] pylint and appveyor --- .appveyor.yml | 2 +- lbrynet/core/utils.py | 20 ++++++-------------- lbrynet/tests/unit/dht/test_node.py | 4 +++- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index de1bafe6f..a1d4dc448 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -23,7 +23,7 @@ clone_folder: c:\projects\lbry test_script: - cd C:\projects\lbry\ - pip install cython -- pip install mock pylint unqlite +- pip install mock pylint unqlite Faker - pip install . - pylint lbrynet # disable tests for now so that appveyor can build the app diff --git a/lbrynet/core/utils.py b/lbrynet/core/utils.py index 6498c52e9..f8ada44dc 100644 --- a/lbrynet/core/utils.py +++ b/lbrynet/core/utils.py @@ -1,21 +1,23 @@ import base64 import datetime -import logging import random import socket import string import json - +import traceback +import functools +import logging import pkg_resources +from twisted.python.failure import Failure from twisted.internet import defer from lbryschema.claim import ClaimDict from lbrynet.core.cryptoutils import get_lbry_hash_obj +log = logging.getLogger(__name__) + # digest_size is in bytes, and blob hashes are hex encoded blobhash_length = get_lbry_hash_obj().digest_size * 2 -log = logging.getLogger(__name__) - # defining these time functions here allows for easier overriding in testing def now(): @@ -174,16 +176,6 @@ def DeferredDict(d, consumeErrors=False): defer.returnValue(response) - -import traceback -import functools -import logging -from twisted.internet import defer -from twisted.python.failure import Failure - -log = logging.getLogger(__name__) - - class DeferredProfiler(object): def __init__(self): self.profile_results = {} diff --git a/lbrynet/tests/unit/dht/test_node.py b/lbrynet/tests/unit/dht/test_node.py index f5fe876ab..93ee047e3 100644 --- a/lbrynet/tests/unit/dht/test_node.py +++ b/lbrynet/tests/unit/dht/test_node.py @@ -62,7 +62,9 @@ class NodeDataTest(unittest.TestCase): def testStore(self): """ Tests if the node can store (and privately retrieve) some data """ for key, port in self.cases: - yield self.node.store(self.contact, key, self.token, port, self.contact.id, 0) + yield self.node.store( # pylint: disable=too-many-function-args + self.contact, key, self.token, port, self.contact.id, 0 + ) for key, value in self.cases: expected_result = self.contact.compact_ip() + str(struct.pack('>H', value)) + \ self.contact.id