diff --git a/lbrynet/core/LBRYMetadata.py b/lbrynet/core/LBRYMetadata.py index 656b55c99..3949fb5f8 100644 --- a/lbrynet/core/LBRYMetadata.py +++ b/lbrynet/core/LBRYMetadata.py @@ -1,9 +1,6 @@ -import requests import json -import time from copy import deepcopy -from googlefinance import getQuotes from lbrynet.conf import CURRENCIES from lbrynet.core import utils import logging diff --git a/lbrynet/core/LBRYWallet.py b/lbrynet/core/LBRYWallet.py index 60696624b..70b2882b1 100644 --- a/lbrynet/core/LBRYWallet.py +++ b/lbrynet/core/LBRYWallet.py @@ -6,7 +6,6 @@ import subprocess import socket import time import os -import requests from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException from twisted.internet import threads, reactor, defer, task @@ -15,10 +14,9 @@ from twisted.enterprise import adbapi from collections import defaultdict, deque from zope.interface import implements from decimal import Decimal -from googlefinance import getQuotes from lbryum import SimpleConfig, Network -from lbryum.lbrycrd import COIN, TYPE_ADDRESS +from lbryum.lbrycrd import COIN from lbryum.wallet import WalletStorage, Wallet from lbryum.commands import known_commands, Commands from lbryum.transaction import Transaction @@ -27,8 +25,6 @@ from lbrynet.interfaces import IRequestCreator, IQueryHandlerFactory, IQueryHand from lbrynet.core.client.ClientRequest import ClientRequest from lbrynet.core.Error import UnknownNameError, InvalidStreamInfoError, RequestCanceledError from lbrynet.core.Error import InsufficientFundsError -from lbrynet.core.sqlite_helpers import rerun_if_locked -from lbrynet.conf import SOURCE_TYPES from lbrynet.core.LBRYMetadata import Metadata log = logging.getLogger(__name__) diff --git a/lbrynet/core/server/DHTHashAnnouncer.py b/lbrynet/core/server/DHTHashAnnouncer.py index 4df03bc76..574f50ceb 100644 --- a/lbrynet/core/server/DHTHashAnnouncer.py +++ b/lbrynet/core/server/DHTHashAnnouncer.py @@ -1,5 +1,5 @@ import binascii -from twisted.internet import defer, task, reactor +from twisted.internet import defer, reactor import collections @@ -78,4 +78,4 @@ class DHTHashSupplier(object): self.hash_reannounce_time = 60 * 60 # 1 hour def hashes_to_announce(self): - pass \ No newline at end of file + pass diff --git a/lbrynet/dht/datastore.py b/lbrynet/dht/datastore.py index 04d74fdc7..340d3e96a 100644 --- a/lbrynet/dht/datastore.py +++ b/lbrynet/dht/datastore.py @@ -8,10 +8,7 @@ # may be created by processing this file with epydoc: http://epydoc.sf.net import UserDict -#import sqlite3 -import cPickle as pickle import time -import os import constants diff --git a/lbrynet/dht/node.py b/lbrynet/dht/node.py index ae9000582..8d61d74e2 100644 --- a/lbrynet/dht/node.py +++ b/lbrynet/dht/node.py @@ -7,7 +7,7 @@ # The docstrings in this module contain epytext markup; API documentation # may be created by processing this file with epydoc: http://epydoc.sf.net -import hashlib, random, struct, time, math, binascii +import hashlib, random, struct, time, binascii import argparse from twisted.internet import defer, error import constants @@ -1017,4 +1017,4 @@ def main(): twisted.internet.reactor.run() if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/lbrynet/dhttest.py b/lbrynet/dhttest.py index fc3e9a8b9..3aa85434f 100644 --- a/lbrynet/dhttest.py +++ b/lbrynet/dhttest.py @@ -20,7 +20,7 @@ -import os, sys, time, signal, hashlib, random +import sys, hashlib, random import twisted.internet.reactor from lbrynet.dht.node import Node #from entangled.kademlia.datastore import SQLiteDataStore @@ -106,7 +106,7 @@ def stop(): if __name__ == '__main__': - import sys, os + import sys if len(sys.argv) < 2: print 'Usage:\n%s UDP_PORT [KNOWN_NODE_IP KNOWN_NODE_PORT]' % sys.argv[0] print 'or:\n%s UDP_PORT [FILE_WITH_KNOWN_NODES]' % sys.argv[0] diff --git a/lbrynet/lbryfilemanager/LBRYFileCreator.py b/lbrynet/lbryfilemanager/LBRYFileCreator.py index 770d1ba6b..876cd6542 100644 --- a/lbrynet/lbryfilemanager/LBRYFileCreator.py +++ b/lbrynet/lbryfilemanager/LBRYFileCreator.py @@ -11,7 +11,6 @@ from lbrynet import conf from lbrynet.lbryfile.StreamDescriptor import get_sd_info from lbrynet.core.cryptoutils import get_lbry_hash_obj from twisted.protocols.basic import FileSender -from lbrynet.lbryfilemanager.LBRYFileDownloader import ManagedLBRYFileDownloader log = logging.getLogger(__name__) @@ -155,4 +154,4 @@ def create_lbry_file(session, lbry_file_manager, file_name, file_handle, key=Non d = lbry_file_creator.setup() d.addCallback(lambda _: start_stream()) - return d \ No newline at end of file + return d diff --git a/lbrynet/lbrynet_console/ControlHandlers.py b/lbrynet/lbrynet_console/ControlHandlers.py index d19d55c88..42e9e2476 100644 --- a/lbrynet/lbrynet_console/ControlHandlers.py +++ b/lbrynet/lbrynet_console/ControlHandlers.py @@ -1,18 +1,12 @@ -import json import logging -from time import sleep -from bitcoinrpc.authproxy import AuthServiceProxy -from twisted.internet.task import LoopingCall from zope.interface import implements -#from lbrynet.core.StreamDescriptor import PlainStreamDescriptorWriter, BlobStreamDescriptorWriter from lbrynet.core.PaymentRateManager import PaymentRateManager from lbrynet.lbryfilemanager.LBRYFileCreator import create_lbry_file from lbrynet.lbryfilemanager.LBRYFileDownloader import ManagedLBRYFileDownloader -# from lbrynet.lbryfile.StreamDescriptor import get_sd_info from lbrynet.lbryfile.StreamDescriptor import publish_sd_blob, create_plain_sd from lbrynet.lbrynet_console.interfaces import ICommandHandler, ICommandHandlerFactory -from lbrynet.core.StreamDescriptor import download_sd_blob#, BlobStreamDescriptorReader +from lbrynet.core.StreamDescriptor import download_sd_blob from lbrynet.core.Error import UnknownNameError, InvalidBlobHashError, InsufficientFundsError from lbrynet.core.Error import InvalidStreamInfoError from lbrynet.core.utils import is_valid_blobhash diff --git a/lbrynet/lbrynet_daemon/LBRYDaemon.py b/lbrynet/lbrynet_daemon/LBRYDaemon.py index 08bd27d3a..47ac1bb49 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemon.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemon.py @@ -1,6 +1,4 @@ import binascii -import distutils.version -import locale import logging.handlers import mimetypes import os @@ -14,7 +12,6 @@ import sys import base58 import requests import simplejson as json -import pkg_resources from urllib2 import urlopen from appdirs import user_data_dir @@ -25,7 +22,7 @@ from twisted.internet import defer, threads, error, reactor from twisted.internet.task import LoopingCall from txjsonrpc import jsonrpclib from txjsonrpc.web import jsonrpc -from txjsonrpc.web.jsonrpc import Handler, Proxy +from txjsonrpc.web.jsonrpc import Handler from lbrynet import __version__ as lbrynet_version from lbryum.version import LBRYUM_VERSION as lbryum_version @@ -46,10 +43,12 @@ from lbrynet.core import utils from lbrynet.core.LBRYMetadata import verify_name_characters from lbrynet.core.utils import generate_id from lbrynet.lbrynet_console.LBRYSettings import LBRYSettings -from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, DEFAULT_MAX_SEARCH_RESULTS, KNOWN_DHT_NODES, DEFAULT_MAX_KEY_FEE, \ - DEFAULT_WALLET, DEFAULT_SEARCH_TIMEOUT, DEFAULT_CACHE_TIME, DEFAULT_UI_BRANCH, LOG_POST_URL, LOG_FILE_NAME, SOURCE_TYPES +from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, DEFAULT_MAX_SEARCH_RESULTS, \ + KNOWN_DHT_NODES, DEFAULT_MAX_KEY_FEE, DEFAULT_WALLET, \ + DEFAULT_SEARCH_TIMEOUT, DEFAULT_CACHE_TIME, DEFAULT_UI_BRANCH, \ + LOG_POST_URL, LOG_FILE_NAME from lbrynet.conf import DEFAULT_SD_DOWNLOAD_TIMEOUT -from lbrynet.conf import DEFAULT_TIMEOUT, WALLET_TYPES +from lbrynet.conf import DEFAULT_TIMEOUT from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier, download_sd_blob, BlobStreamDescriptorReader from lbrynet.core.Session import LBRYSession from lbrynet.core.PTCWallet import PTCWallet diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonCLI.py b/lbrynet/lbrynet_daemon/LBRYDaemonCLI.py index 0b5d0ba0c..116fd32cb 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemonCLI.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemonCLI.py @@ -1,7 +1,7 @@ import sys import json -from lbrynet.conf import API_CONNECTION_STRING, LOG_FILE_NAME +from lbrynet.conf import API_CONNECTION_STRING from jsonrpc.proxy import JSONRPCProxy help_msg = "Useage: lbrynet-cli method json-args\n" \ diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonControl.py b/lbrynet/lbrynet_daemon/LBRYDaemonControl.py index 1bfa62eab..81391d6c7 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemonControl.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemonControl.py @@ -5,7 +5,6 @@ import os import webbrowser import sys import socket -import platform from appdirs import user_data_dir from twisted.web import server @@ -14,8 +13,8 @@ from jsonrpc.proxy import JSONRPCProxy from lbrynet.core import log_support from lbrynet.lbrynet_daemon.LBRYDaemonServer import LBRYDaemonServer, LBRYDaemonRequest -from lbrynet.conf import API_CONNECTION_STRING, API_INTERFACE, API_ADDRESS, API_PORT, \ - DEFAULT_WALLET, UI_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME +from lbrynet.conf import API_CONNECTION_STRING, API_INTERFACE, API_PORT, \ + UI_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME # TODO: stop it! if sys.platform != "darwin": diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py index 3f2107079..dc345bff5 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py @@ -9,15 +9,14 @@ import tempfile import time import cgi -from datetime import datetime from appdirs import user_data_dir from twisted.web import server, static, resource -from twisted.internet import defer, interfaces, error, reactor, task, threads +from twisted.internet import defer, interfaces, error, reactor, threads from zope.interface import implements from lbrynet.lbrynet_daemon.LBRYDaemon import LBRYDaemon -from lbrynet.conf import API_CONNECTION_STRING, API_ADDRESS, DEFAULT_WALLET, UI_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME +from lbrynet.conf import API_ADDRESS, UI_ADDRESS, DEFAULT_UI_BRANCH, LOG_FILE_NAME # TODO: omg, this code is essentially duplicated in LBRYDaemon diff --git a/lbrynet/lbrynet_daemon/LBRYDownloader.py b/lbrynet/lbrynet_daemon/LBRYDownloader.py index 323882eaf..2b1aa4b6d 100644 --- a/lbrynet/lbrynet_daemon/LBRYDownloader.py +++ b/lbrynet/lbrynet_daemon/LBRYDownloader.py @@ -5,14 +5,13 @@ import sys from copy import deepcopy from appdirs import user_data_dir -from datetime import datetime from twisted.internet import defer from twisted.internet.task import LoopingCall -from lbrynet.core.Error import InvalidStreamInfoError, InsufficientFundsError, KeyFeeAboveMaxAllowed +from lbrynet.core.Error import InsufficientFundsError, KeyFeeAboveMaxAllowed from lbrynet.core.PaymentRateManager import PaymentRateManager from lbrynet.core.StreamDescriptor import download_sd_blob -from lbrynet.core.LBRYMetadata import Metadata, LBRYFeeValidator +from lbrynet.core.LBRYMetadata import LBRYFeeValidator from lbrynet.lbryfilemanager.LBRYFileDownloader import ManagedLBRYFileDownloaderFactory from lbrynet.conf import DEFAULT_TIMEOUT, LOG_FILE_NAME diff --git a/lbrynet/lbrynet_daemon/LBRYPublisher.py b/lbrynet/lbrynet_daemon/LBRYPublisher.py index 3e1b78325..2859a09d1 100644 --- a/lbrynet/lbrynet_daemon/LBRYPublisher.py +++ b/lbrynet/lbrynet_daemon/LBRYPublisher.py @@ -4,7 +4,6 @@ import os import sys from appdirs import user_data_dir -from datetime import datetime from lbrynet.core.Error import InsufficientFundsError from lbrynet.lbryfilemanager.LBRYFileCreator import create_lbry_file diff --git a/lbrynet/lbrynet_daemon/Lighthouse.py b/lbrynet/lbrynet_daemon/Lighthouse.py index d12d87841..0c9dadb4c 100644 --- a/lbrynet/lbrynet_daemon/Lighthouse.py +++ b/lbrynet/lbrynet_daemon/Lighthouse.py @@ -1,7 +1,6 @@ import logging import random from txjsonrpc.web.jsonrpc import Proxy -from twisted.internet import defer from lbrynet.conf import SEARCH_SERVERS log = logging.getLogger(__name__) diff --git a/lbrynet/node_rpc_cli.py b/lbrynet/node_rpc_cli.py index d53560d98..7538e3842 100644 --- a/lbrynet/node_rpc_cli.py +++ b/lbrynet/node_rpc_cli.py @@ -6,7 +6,6 @@ CLI for sending rpc commands to a DHT node from twisted.internet import reactor from txjsonrpc.web.jsonrpc import Proxy import argparse -import sys def print_value(value): @@ -39,4 +38,4 @@ def main(): d = proxy.callRemote(args.rpc_command) d.addCallbacks(print_value, print_error) d.addBoth(lambda _: shut_down()) - reactor.run() \ No newline at end of file + reactor.run() diff --git a/packaging/travis/install_dependencies_and_run_tests.sh b/packaging/travis/install_dependencies_and_run_tests.sh index 422e74229..74ccaaeae 100755 --- a/packaging/travis/install_dependencies_and_run_tests.sh +++ b/packaging/travis/install_dependencies_and_run_tests.sh @@ -44,4 +44,5 @@ trial tests # Ignoring distutils because: https://github.com/PyCQA/pylint/issues/73 # TODO: as code quality improves, make pylint be more strict -pylint -E --disable=inherit-non-class --disable=no-member --ignored-modules=distutils lbrynet +pylint -E --disable=inherit-non-class --disable=no-member --ignored-modules=distutils \ + --enable=unused-import lbrynet