From 22fc26797d6c37533f4377b7c5ea4f11bda6e872 Mon Sep 17 00:00:00 2001 From: Jack Date: Wed, 19 Oct 2016 14:40:01 -0400 Subject: [PATCH] pylint fixes --- lbrynet/lbrynet_console/plugins/BlindRepeater/__init__.py | 6 +++--- lbrynet/lbrynet_daemon/Daemon.py | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lbrynet/lbrynet_console/plugins/BlindRepeater/__init__.py b/lbrynet/lbrynet_console/plugins/BlindRepeater/__init__.py index 01686de4c..84afefce8 100644 --- a/lbrynet/lbrynet_console/plugins/BlindRepeater/__init__.py +++ b/lbrynet/lbrynet_console/plugins/BlindRepeater/__init__.py @@ -1,6 +1,6 @@ from lbrynet.lbrynet_console import Plugin from twisted.internet import defer -from lbrynet.conf import MIN_VALUABLE_BLOB_HASH_PAYMENT_RATE, MIN_VALUABLE_BLOB_INFO_PAYMENT_RATE +from lbrynet import settings from BlindRepeater import BlindRepeater from BlindInfoManager import BlindInfoManager from BlindRepeaterSettings import BlindRepeaterSettings @@ -59,9 +59,9 @@ class BlindRepeaterPlugin(Plugin.Plugin): def get_payment_rate_manager(rates): data_rate = rates[0][1] if rates[0][0] is True else None info_rate = rates[1][1] if rates[1][0] is True else None - info_rate = info_rate if info_rate is not None else MIN_VALUABLE_BLOB_INFO_PAYMENT_RATE + info_rate = info_rate if info_rate is not None else settings.MIN_VALUABLE_BLOB_INFO_PAYMENT_RATE hash_rate = rates[2][1] if rates[2][0] is True else None - hash_rate = hash_rate if hash_rate is not None else MIN_VALUABLE_BLOB_HASH_PAYMENT_RATE + hash_rate = hash_rate if hash_rate is not None else settings.MIN_VALUABLE_BLOB_HASH_PAYMENT_RATE self.payment_rate_manager = BlindRepeaterPaymentRateManager(default_payment_rate_manager, info_rate, hash_rate, blob_data_rate=data_rate) diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py index fec8f142b..b6b71aad0 100644 --- a/lbrynet/lbrynet_daemon/Daemon.py +++ b/lbrynet/lbrynet_daemon/Daemon.py @@ -6,7 +6,6 @@ import platform import random import re import socket -import string import subprocess import sys import base58 @@ -1120,9 +1119,9 @@ class Daemon(AuthJSONRPCServer): log.info("Removing one time startup scripts") remaining_scripts = [s for s in self.startup_scripts if 'run_once' not in s.keys()] startup_scripts = self.startup_scripts - self.startup_scripts = lbrynet_settings['startup_scripts'] = remaining_scripts - - utils.save_settings(self.daemon_conf, lbrynet_settings) + self.startup_scripts = lbrynet_settings.startup_scripts = remaining_scripts + conf = os.path.join(lbrynet_settings.DATA_DIR, "daemon_settings.yml") + utils.save_settings(conf) for script in startup_scripts: if script['script_name'] == 'migrateto025':