updated references after moving conf to lbrynet.extras.daemon.conf

lbrynet/blob/EncryptedFileDownloader.py

@@ -5,7 +5,7 @@ import logging
 from binascii import hexlify, unhexlify
 
 from twisted.internet import defer
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.p2p.client.StreamProgressManager import FullStreamProgressManager
 from lbrynet.p2p.HTTPBlobDownloader import HTTPBlobDownloader
 from lbrynet.p2p.utils import short_hash

lbrynet/blob/EncryptedFileManager.py

@@ -14,8 +14,7 @@ from lbrynet.p2p.StreamDescriptor import EncryptedFileStreamType, get_sd_info
 from lbrynet.blob.client.CryptStreamDownloader import AlreadyStoppedError
 from lbrynet.blob.client.CryptStreamDownloader import CurrentlyStoppingError
 from lbrynet.p2p.utils import safe_start_looping_call, safe_stop_looping_call
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
-
 
 log = logging.getLogger(__name__)
 

lbrynet/dht/hashannouncer.py

@@ -3,7 +3,7 @@ import logging
 
 from twisted.internet import defer, task
 from lbrynet.p2p import utils
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 
 log = logging.getLogger(__name__)
 

lbrynet/dht/peerfinder.py

@@ -2,8 +2,7 @@ import binascii
 import logging
 
 from twisted.internet import defer
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
-
 
 log = logging.getLogger(__name__)
 

lbrynet/extras/daemon/Components.py

@@ -11,7 +11,7 @@ import lbrynet.schema
 from aioupnp import __version__ as aioupnp_version
 from aioupnp.upnp import UPnP
 from aioupnp.fault import UPnPError
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.p2p.utils import DeferredDict
 from lbrynet.p2p.PaymentRateManager import OnlyFreePaymentsManager
 from lbrynet.p2p.RateLimiter import RateLimiter

lbrynet/extras/daemon/Daemon.py

@@ -26,7 +26,7 @@ from lbrynet.schema.decode import smart_decode
 
 # TODO: importing this when internet is disabled raises a socket.gaierror
 from lbrynet.p2p.system_info import get_lbrynet_version
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.extras.reflector import reupload
 from .Components import d2f, f2d
 from .Components import WALLET_COMPONENT, DATABASE_COMPONENT, DHT_COMPONENT, BLOB_COMPONENT

lbrynet/extras/daemon/DaemonConsole.py

@@ -6,8 +6,7 @@ import logging.handlers
 from twisted.internet import defer, reactor, threads
 from aiohttp import client_exceptions
 
-from lbrynet.extras.daemon import analytics
+from lbrynet.extras.daemon import analytics, conf
-from lbrynet import conf
 from lbrynet.p2p import utils
 from lbrynet.p2p import log_support
 from .auth.client import LBRYAPIClient

lbrynet/extras/daemon/DaemonControl.py

@@ -14,7 +14,7 @@ import logging.handlers
 
 from twisted.internet import reactor
 
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.p2p import utils, system_info
 from .Daemon import Daemon
 

lbrynet/extras/daemon/Downloader.py

@@ -11,7 +11,7 @@ from lbrynet.p2p.Error import DownloadDataTimeout, DownloadCanceledError, Downlo
 from lbrynet.p2p.utils import safe_start_looping_call, safe_stop_looping_call
 from lbrynet.p2p.StreamDescriptor import download_sd_blob
 from lbrynet.blob.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from torba.client.constants import COIN
 from lbrynet.extras.wallet.dewies import dewies_to_lbc
 

lbrynet/extras/daemon/analytics.py

@@ -4,7 +4,7 @@ import logging
 import treq
 from twisted.internet import defer, task
 
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.p2p import looping_call_manager, utils, system_info
 
 # Things We Track

lbrynet/extras/daemon/auth/client.py

@@ -3,7 +3,7 @@ import aiohttp
 import logging
 from urllib.parse import urlparse
 
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from .keyring import Keyring, APIKey
 
 log = logging.getLogger(__name__)

lbrynet/extras/daemon/auth/factory.py

@@ -3,7 +3,7 @@ import logging
 from twisted.web import server, guard, resource
 from twisted.cred import portal
 
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from .auth import PasswordChecker, HttpPasswordRealm
 from ..auth.keyring import Keyring
 

lbrynet/extras/daemon/auth/keyring.py

@@ -13,7 +13,7 @@ from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import serialization
 from twisted.internet import ssl
 import logging
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 
 log = logging.getLogger(__name__)
 

lbrynet/extras/daemon/auth/server.py

@@ -14,8 +14,7 @@ from twisted.internet.error import ConnectionDone, ConnectionLost
 from txjsonrpc import jsonrpclib
 from traceback import format_exc
 
-from lbrynet import conf
+from lbrynet.extras.daemon import analytics, conf
-from lbrynet.extras.daemon import analytics
 from lbrynet.p2p.Error import InvalidAuthenticationToken
 from lbrynet.p2p import utils
 from lbrynet.p2p.Error import ComponentsNotStarted, ComponentStartConditionNotMet

lbrynet/extras/daemon/conf.py

@@ -15,7 +15,7 @@ from lbrynet.androidhelpers.paths import (
 )
 
 try:
-    from extras.winpaths import get_path, FOLDERID, UserHandle
+    from .winpaths import get_path, FOLDERID, UserHandle
 except (ImportError, ValueError, NameError):
     # Android platform: NameError: name 'c_wchar' is not defined
     pass

lbrynet/extras/daemon/migrator/migrate5to6.py

@@ -3,7 +3,7 @@ import os
 import json
 import logging
 from lbrynet.schema.decode import smart_decode
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 
 log = logging.getLogger(__name__)
 

lbrynet/extras/daemon/storage.py

@@ -9,7 +9,7 @@ from twisted.enterprise import adbapi
 
 from lbrynet.schema.claim import ClaimDict
 from lbrynet.schema.decode import smart_decode
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.blob.CryptBlob import CryptBlobInfo
 from lbrynet.dht.constants import dataExpireTimeout
 from torba.client.constants import COIN

lbrynet/extras/reflector/reupload.py

@@ -1,7 +1,7 @@
 import random
 
 from twisted.internet import reactor, defer
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from . import ClientFactory, BlobClientFactory
 
 

lbrynet/p2p/PaymentRateManager.py

@@ -1,5 +1,5 @@
 from lbrynet.p2p.Strategy import get_default_strategy, OnlyFreeStrategy
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from decimal import Decimal
 
 

lbrynet/p2p/PriceModel.py

@@ -2,7 +2,7 @@ from zope.interface import implementer
 from decimal import Decimal
 
 from lbrynet.interfaces import IBlobPriceModel
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 
 
 def get_default_price_model(blob_tracker, base_price, **kwargs):

lbrynet/p2p/Strategy.py

@@ -1,6 +1,6 @@
 from zope.interface import implementer
 from decimal import Decimal
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.interfaces import INegotiationStrategy
 from lbrynet.p2p.Offer import Offer
 from lbrynet.p2p.PriceModel import MeanAvailabilityWeightedPrice, ZeroPrice

lbrynet/p2p/client/ClientProtocol.py

@@ -5,7 +5,7 @@ from twisted.internet import error, defer
 from twisted.internet.protocol import Protocol, ClientFactory
 from twisted.protocols.policies import TimeoutMixin
 from twisted.python import failure
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.p2p import utils
 from lbrynet.p2p.Error import ConnectionClosedBeforeResponseError, NoResponseError
 from lbrynet.p2p.Error import DownloadCanceledError, MisbehavingPeerError

lbrynet/p2p/client/ConnectionManager.py

@@ -1,7 +1,7 @@
 import random
 import logging
 from twisted.internet import defer, reactor
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.p2p.client.ClientProtocol import ClientProtocolFactory
 from lbrynet.p2p.Error import InsufficientFundsError
 from lbrynet.p2p import utils

lbrynet/p2p/log_support.py

@@ -8,7 +8,8 @@ import treq
 from twisted.internet import defer
 import twisted.python.log
 
-from lbrynet import __version__ as lbrynet_version, build_type, conf
+from lbrynet import __version__ as lbrynet_version, build_type
+from lbrynet.extras.daemon import conf
 from lbrynet.p2p import utils
 
 

lbrynet/p2p/system_info.py

@@ -7,7 +7,7 @@ from six.moves.urllib import request
 from six.moves.urllib.error import URLError
 from lbrynet.schema import __version__ as schema_version
 from lbrynet import build_type, __version__ as lbrynet_version
-from lbrynet.conf import ROOT_DIR
+from lbrynet.extras.daemon.conf import ROOT_DIR
 import logging.handlers
 
 log = logging.getLogger(__name__)

tests/functional/test_misc.py

@@ -2,7 +2,7 @@ import os
 from hashlib import md5
 from twisted.internet import defer, reactor
 from twisted.trial import unittest
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.p2p.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory
 from lbrynet.p2p.StreamDescriptor import StreamDescriptorIdentifier
 from lbrynet.p2p.StreamDescriptor import download_sd_blob

tests/integration/cli/test_cli.py

@@ -3,8 +3,8 @@ from twisted.trial import unittest
 from io import StringIO
 from twisted.internet import defer
 
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
-from lbrynet import cli
+from lbrynet.extras import cli
 from lbrynet.extras.daemon.Components import DATABASE_COMPONENT, BLOB_COMPONENT, HEADERS_COMPONENT, WALLET_COMPONENT, \
     DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, STREAM_IDENTIFIER_COMPONENT, FILE_MANAGER_COMPONENT, \
     PEER_PROTOCOL_SERVER_COMPONENT, REFLECTOR_COMPONENT, UPNP_COMPONENT, EXCHANGE_RATE_MANAGER_COMPONENT, \

tests/integration/wallet/test_commands.py

@@ -13,7 +13,7 @@ from torba.testcase import IntegrationTestCase as BaseIntegrationTestCase
 import lbrynet.schema
 lbrynet.schema.BLOCKCHAIN_NAME = 'lbrycrd_regtest'
 
-from lbrynet import conf as lbry_conf
+from lbrynet.extras.daemon import conf as lbry_conf
 from lbrynet.dht.node import Node
 from lbrynet.extras.daemon.Daemon import Daemon
 from lbrynet.extras.wallet import LbryWalletManager

tests/mocks.py

@@ -13,8 +13,7 @@ from lbrynet.p2p.Error import RequestCanceledError
 from lbrynet.p2p import BlobAvailability
 from lbrynet.blob.EncryptedFileManager import EncryptedFileManager
 from lbrynet.dht.node import Node as RealNode
-from lbrynet.extras.daemon import ExchangeRateManager as ERM
+from lbrynet.extras.daemon import ExchangeRateManager as ERM, conf
-from lbrynet import conf
 
 KB = 2**10
 PUBLIC_EXPONENT = 65537  # http://www.daemonology.net/blog/2009-06-11-cryptographic-right-answers.html

tests/unit/core/client/test_ConnectionManager.py

@@ -10,7 +10,7 @@ from twisted.trial.unittest import TestCase
 from twisted.internet import defer, reactor, task
 from twisted.internet.task import deferLater
 from twisted.internet.protocol import ServerFactory
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.p2p import utils
 
 PEER_PORT = 5551

tests/unit/core/test_BlobManager.py

@@ -10,7 +10,7 @@ from tests.util import random_lbry_hash
 from lbrynet.p2p.BlobManager import DiskBlobManager
 from lbrynet.extras.daemon.storage import SQLiteStorage
 from lbrynet.p2p.Peer import Peer
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.p2p.cryptoutils import get_lbry_hash_obj
 
 

tests/unit/database/test_SQLiteStorage.py

@@ -5,7 +5,7 @@ import logging
 from copy import deepcopy
 from twisted.internet import defer
 from twisted.trial import unittest
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.extras.daemon.storage import SQLiteStorage, open_file_for_writing
 from lbrynet.blob.EncryptedFileDownloader import ManagedEncryptedFileDownloader
 from tests.util import random_lbry_hash

tests/unit/dht/test_hash_announcer.py

@@ -1,6 +1,5 @@
 from twisted.trial import unittest
 from twisted.internet import defer, task
-from lbrynet import conf
 from lbrynet.p2p import utils
 from lbrynet.dht.hashannouncer import DHTHashAnnouncer
 from tests.util import random_lbry_hash

tests/unit/lbrynet_daemon/auth/test_server.py

@@ -1,7 +1,7 @@
 import mock
 from twisted.internet import reactor
 from twisted.trial import unittest
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.extras.daemon.auth import server
 
 from tests.mocks import mock_conf_settings

tests/unit/lbrynet_daemon/test_Daemon.py

@@ -9,7 +9,7 @@ from twisted.trial import unittest
 from faker import Faker
 
 from lbrynet.schema.decode import smart_decode
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.extras.daemon.storage import SQLiteStorage
 from lbrynet.extras.daemon.ComponentManager import ComponentManager
 from lbrynet.extras.daemon.Components import DATABASE_COMPONENT, DHT_COMPONENT, WALLET_COMPONENT, STREAM_IDENTIFIER_COMPONENT

tests/unit/test_cli.py

@@ -2,7 +2,7 @@ import contextlib
 from io import StringIO
 from twisted.trial import unittest
 
-from lbrynet.cli import normalize_value, main
+from lbrynet.extras.cli import normalize_value, main
 from lbrynet.p2p.system_info import get_platform
 
 

tests/unit/test_conf.py

@@ -4,7 +4,7 @@ import sys
 import tempfile
 from unittest import skipIf
 from twisted.trial import unittest
-from lbrynet import conf
+from lbrynet.extras.daemon import conf
 from lbrynet.p2p.Error import InvalidCurrencyError