diff --git a/lbrynet/core/Wallet.py b/lbrynet/core/Wallet.py index d016f7843..334a9390c 100644 --- a/lbrynet/core/Wallet.py +++ b/lbrynet/core/Wallet.py @@ -859,7 +859,7 @@ class LBRYumWallet(Wallet): def setup_network(): self.config = make_config(self._config) self.network = Network(self.config) - alert.info("Loading the wallet...") + alert.info("Loading the wallet") return defer.succeed(self.network.start()) d = setup_network() @@ -867,7 +867,7 @@ class LBRYumWallet(Wallet): def check_started(): if self.network.is_connecting(): if not self.printed_retrieving_headers and self.network.blockchain.retrieving_headers: - alert.info("Running the wallet for the first time...this may take a moment.") + alert.info("Running the wallet for the first time. This may take a moment.") self.printed_retrieving_headers = True return False self._start_check.stop() diff --git a/lbrynet/create_network.py b/lbrynet/create_network.py index 2c321d4c3..ea814ea11 100644 --- a/lbrynet/create_network.py +++ b/lbrynet/create_network.py @@ -14,7 +14,7 @@ amount = 0 def destroyNetwork(nodes): - print 'Destroying Kademlia network...' + print 'Destroying Kademlia network' i = 0 for node in nodes: i += 1 @@ -50,12 +50,12 @@ def main(): else: import socket ipAddress = socket.gethostbyname(socket.gethostname()) - print 'Network interface IP address omitted; using %s...' % ipAddress + print 'Network interface IP address omitted; using %s' % ipAddress startPort = 4000 port = startPort+1 nodes = [] - print 'Creating Kademlia network...' + print 'Creating Kademlia network' try: node = os.spawnlp( os.P_NOWAIT, 'lbrynet-launch-node', 'lbrynet-launch-node', str(startPort)) diff --git a/lbrynet/dht_scripts.py b/lbrynet/dht_scripts.py index dc8709015..6c3e503bb 100644 --- a/lbrynet/dht_scripts.py +++ b/lbrynet/dht_scripts.py @@ -16,10 +16,10 @@ def print_usage(): def join_network(udp_port, known_nodes): lbryid = generate_id() - log.info('Creating Node...') + log.info('Creating Node') node = Node(udpPort=udp_port, lbryid=lbryid) - log.info('Joining network...') + log.info('Joining network') d = node.joinNetwork(known_nodes) def log_network_size(): diff --git a/lbrynet/dhttest.py b/lbrynet/dhttest.py index c31773381..8470353b7 100644 --- a/lbrynet/dhttest.py +++ b/lbrynet/dhttest.py @@ -59,7 +59,7 @@ def storeValueCallback(*args, **kwargs): """ Callback function that is invoked when the storeValue() operation succeeds """ print 'Value has been stored in the DHT' # Now that the value has been stored, schedule that the value is read again after 2.5 seconds - print 'Scheduling retrieval in 2.5 seconds...' + print 'Scheduling retrieval in 2.5 seconds' twisted.internet.reactor.callLater(2.5, getValue) @@ -72,7 +72,7 @@ def getValue(): """ Retrieves the value of the specified key (KEY) from the DHT """ global node, KEY # Get the value for the specified key (immediately returns a Twisted deferred result) - print ('\nRetrieving value from DHT for key "%s"...' % + print ('\nRetrieving value from DHT for key "%s"' % binascii.unhexlify("f7d9dc4de674eaa2c5a022eb95bc0d33ec2e75c6")) deferredResult = node.iterativeFindValue( binascii.unhexlify("f7d9dc4de674eaa2c5a022eb95bc0d33ec2e75c6")) @@ -91,13 +91,13 @@ def getValueCallback(result): print result # Either way, schedule a "delete" operation for the key - print 'Scheduling shutdown in 2.5 seconds...' + print 'Scheduling shutdown in 2.5 seconds' twisted.internet.reactor.callLater(2.5, stop) def stop(): """ Stops the Twisted reactor, and thus the script """ - print '\nStopping Kademlia node and terminating script...' + print '\nStopping Kademlia node and terminating script' twisted.internet.reactor.stop() if __name__ == '__main__': @@ -145,7 +145,7 @@ if __name__ == '__main__': # # If you wish to have a pure Kademlia network, use the # entangled.kademlia.node.Node class instead - print 'Creating Node...' + print 'Creating Node' node = Node(udpPort=int(sys.argv[1]), lbryid=lbryid) # Schedule the node to join the Kademlia/Entangled DHT diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py index 517239a13..bf07a8060 100644 --- a/lbrynet/lbrynet_daemon/Daemon.py +++ b/lbrynet/lbrynet_daemon/Daemon.py @@ -75,7 +75,7 @@ DOWNLOAD_TIMEOUT_CODE = 'timeout' DOWNLOAD_RUNNING_CODE = 'running' DOWNLOAD_STOPPED_CODE = 'stopped' STREAM_STAGES = [ - (INITIALIZING_CODE, 'Initializing...'), + (INITIALIZING_CODE, 'Initializing'), (DOWNLOAD_METADATA_CODE, 'Downloading metadata'), (DOWNLOAD_RUNNING_CODE, 'Started %s, got %s/%s blobs, stream status: %s'), (DOWNLOAD_STOPPED_CODE, 'Paused stream'), @@ -637,7 +637,7 @@ class Daemon(AuthJSONRPCServer): def _setup_data_directory(self): old_revision = 1 self.startup_status = STARTUP_STAGES[1] - log.info("Loading databases...") + log.info("Loading databases") if self.created_data_dir: self._write_db_revision_file(self.current_db_revision) log.debug("Created the db revision file: %s", self.db_revision_file) @@ -662,7 +662,7 @@ class Daemon(AuthJSONRPCServer): if old_revision < self.current_db_revision: from lbrynet.db_migrator import dbmigrator - log.info("Upgrading your databases...") + log.info("Upgrading your databases") d = threads.deferToThread( dbmigrator.migrate_db, self.db_dir, old_revision, self.current_db_revision) d.addCallback(lambda _: update_version_file_and_print_success()) @@ -1315,7 +1315,8 @@ class Daemon(AuthJSONRPCServer): elif 'function' in p: fn = self.callable_methods.get(p['function']) if fn is None: - return self._render_response("Function not found", OK_CODE) + return self._render_response( + "Function '" + p['function'] + "' is not a valid function", OK_CODE) return self._render_response(textwrap.dedent(fn.__doc__), OK_CODE) else: return self._render_response(textwrap.dedent(self.jsonrpc_help.__doc__), OK_CODE) diff --git a/lbrynet/lbrynet_daemon/Downloader.py b/lbrynet/lbrynet_daemon/Downloader.py index 88eb10163..f17fb34e3 100644 --- a/lbrynet/lbrynet_daemon/Downloader.py +++ b/lbrynet/lbrynet_daemon/Downloader.py @@ -18,7 +18,7 @@ DOWNLOAD_RUNNING_CODE = 'running' # TODO: is this ever used? DOWNLOAD_STOPPED_CODE = 'stopped' STREAM_STAGES = [ - (INITIALIZING_CODE, 'Initializing...'), + (INITIALIZING_CODE, 'Initializing'), (DOWNLOAD_METADATA_CODE, 'Downloading metadata'), (DOWNLOAD_RUNNING_CODE, 'Started stream'), (DOWNLOAD_STOPPED_CODE, 'Paused stream'), diff --git a/packaging/osx/lbry-osx-app/lbry_uri_handler/LBRYURIHandler.py b/packaging/osx/lbry-osx-app/lbry_uri_handler/LBRYURIHandler.py index f6990cfea..f90bce9b3 100644 --- a/packaging/osx/lbry-osx-app/lbry_uri_handler/LBRYURIHandler.py +++ b/packaging/osx/lbry-osx-app/lbry_uri_handler/LBRYURIHandler.py @@ -34,7 +34,7 @@ class LBRYURIHandler(object): except: cmd = r'DIR = "$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"' \ r'if [-z "$(pgrep lbrynet-daemon)"]; then' \ - r'echo "running lbrynet-daemon..."' \ + r'echo "running lbrynet-daemon"' \ r'$DIR / lbrynet - daemon &' \ r'sleep 3 # let the daemon load before connecting' \ r'fi' diff --git a/packaging/ubuntu/lbry b/packaging/ubuntu/lbry index f84c33fb6..4bd051dcd 100755 --- a/packaging/ubuntu/lbry +++ b/packaging/ubuntu/lbry @@ -27,7 +27,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" if [ -z "$(pgrep lbrynet-daemon)" ]; then - echo "running lbrynet-daemon..." + echo "running lbrynet-daemon" $DIR/lbrynet-daemon --no-launch & sleep 3 # let the daemon load before connecting fi diff --git a/packaging/uri_handler/LBRYURIHandler.py b/packaging/uri_handler/LBRYURIHandler.py index 14f117c5b..1ff002833 100644 --- a/packaging/uri_handler/LBRYURIHandler.py +++ b/packaging/uri_handler/LBRYURIHandler.py @@ -27,7 +27,7 @@ class LBRYURIHandler(object): if not self.started_daemon: cmd = r'DIR = "$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd )"' \ r'if [-z "$(pgrep lbrynet-daemon)"]; then' \ - r'echo "running lbrynet-daemon..."' \ + r'echo "running lbrynet-daemon"' \ r'$DIR / lbrynet - daemon &' \ r'sleep 3 # let the daemon load before connecting' \ r'fi' diff --git a/tests/functional/test_misc.py b/tests/functional/test_misc.py index 1e0efc37e..61af9e337 100644 --- a/tests/functional/test_misc.py +++ b/tests/functional/test_misc.py @@ -944,7 +944,7 @@ class TestTransfer(TestCase): self.assertEqual(hashsum.hexdigest(), "4ca2aafb4101c1e42235aad24fbb83be") def delete_lbry_file(): - logging.debug("deleting the file...") + logging.debug("deleting the file") d = self.lbry_file_manager.delete_lbry_file(downloaders[0]) d.addCallback(lambda _: self.lbry_file_manager.get_count_for_stream_hash(downloaders[0].stream_hash)) d.addCallback(