diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c410402e..ca2f70285 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,6 @@ can and probably will change functionality and break backwards compatability at anytime. ## [Unreleased] - -## [0.20.3] - 2018-07-20 -### Changed -* Additional information added to the balance error message when editing a claim. -(https://github.com/lbryio/lbry/pull/1309) - ### Security * * @@ -40,7 +34,7 @@ at anytime. * `requires` decorator to register the components required by a `jsonrpc_` command, to facilitate commands registering asynchronously * unittests for `ComponentManager` * script to generate docs/api.json file (https://github.com/lbryio/lbry.tech/issues/42) - + * additional information to the balance error message when editing a claim (https://github.com/lbryio/lbry/pull/1309) ### Removed * most of the internal attributes from `Daemon` diff --git a/lbrynet/__init__.py b/lbrynet/__init__.py index a93812309..0a9c7f041 100644 --- a/lbrynet/__init__.py +++ b/lbrynet/__init__.py @@ -1,5 +1,4 @@ import logging -import customLogger __version__ = "0.20.4" version = tuple(__version__.split('.')) diff --git a/lbrynet/core/__init__.py b/lbrynet/core/__init__.py index 6ac1f3432..df7d37558 100644 --- a/lbrynet/core/__init__.py +++ b/lbrynet/core/__init__.py @@ -5,3 +5,5 @@ This includes classes for connecting to other peers and downloading blobs from t connections from peers and responding to their requests, managing locally stored blobs, sending and receiving payments, and locating peers in the DHT. """ + +from lbrynet import custom_logger diff --git a/lbrynet/customLogger.py b/lbrynet/custom_logger.py similarity index 100% rename from lbrynet/customLogger.py rename to lbrynet/custom_logger.py diff --git a/lbrynet/daemon/__init__.py b/lbrynet/daemon/__init__.py index 8e0f5feca..c428bbb3b 100644 --- a/lbrynet/daemon/__init__.py +++ b/lbrynet/daemon/__init__.py @@ -1,3 +1,4 @@ +from lbrynet import custom_logger import Components # register Component classes from lbrynet.daemon.auth.client import LBRYAPIClient get_client = LBRYAPIClient.get_client diff --git a/lbrynet/tests/unit/test_customLogger.py b/lbrynet/tests/unit/test_customLogger.py index 8648b7068..74cfbb8e6 100644 --- a/lbrynet/tests/unit/test_customLogger.py +++ b/lbrynet/tests/unit/test_customLogger.py @@ -6,7 +6,7 @@ import unittest from twisted.internet import defer from twisted import trial -from lbrynet import customLogger +from lbrynet import custom_logger from lbrynet.tests.util import is_android @@ -22,7 +22,7 @@ class TestLogger(trial.unittest.TestCase): return d def setUp(self): - self.log = customLogger.Logger('test') + self.log = custom_logger.Logger('test') self.stream = StringIO.StringIO() handler = logging.StreamHandler(self.stream) handler.setFormatter(logging.Formatter("%(filename)s:%(lineno)d - %(message)s"))