Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

pylint fixes

Browse source
This commit is contained in:
Jack 2016-10-19 14:40:01 -04:00
parent 8a95c8b7af
commit 22fc26797d
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lbrynet/lbrynet_console/plugins/BlindRepeater/__init__.py
View file

@ -1,6 +1,6 @@
from lbrynet.lbrynet_console import Plugin from lbrynet.lbrynet_console import Plugin
from twisted.internet import defer 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 BlindRepeater import BlindRepeater
from BlindInfoManager import BlindInfoManager from BlindInfoManager import BlindInfoManager
from BlindRepeaterSettings import BlindRepeaterSettings from BlindRepeaterSettings import BlindRepeaterSettings
@ -59,9 +59,9 @@ class BlindRepeaterPlugin(Plugin.Plugin):
def get_payment_rate_manager(rates): def get_payment_rate_manager(rates):
data_rate = rates[0][1] if rates[0][0] is True else None 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 = 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 = 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, self.payment_rate_manager = BlindRepeaterPaymentRateManager(default_payment_rate_manager,
info_rate, hash_rate, info_rate, hash_rate,
blob_data_rate=data_rate) blob_data_rate=data_rate)

7
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -6,7 +6,6 @@ import platform
import random import random
import re import re
import socket import socket
import string
import subprocess import subprocess
import sys import sys
import base58 import base58
@ -1120,9 +1119,9 @@ class Daemon(AuthJSONRPCServer):
log.info("Removing one time startup scripts") log.info("Removing one time startup scripts")
remaining_scripts = [s for s in self.startup_scripts if 'run_once' not in s.keys()] remaining_scripts = [s for s in self.startup_scripts if 'run_once' not in s.keys()]
startup_scripts = self.startup_scripts startup_scripts = self.startup_scripts
self.startup_scripts = lbrynet_settings['startup_scripts'] = remaining_scripts self.startup_scripts = lbrynet_settings.startup_scripts = remaining_scripts
conf = os.path.join(lbrynet_settings.DATA_DIR, "daemon_settings.yml")
utils.save_settings(self.daemon_conf, lbrynet_settings) utils.save_settings(conf)
for script in startup_scripts: for script in startup_scripts:
if script['script_name'] == 'migrateto025': if script['script_name'] == 'migrateto025':