From e9b9118c2acf1dfff2324b6cb41bce71b11bafb1 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Mon, 12 Feb 2018 14:16:43 -0500 Subject: [PATCH] whitespace --- lbrynet/blob/blob_file.py | 1 + lbrynet/core/BlobInfo.py | 1 + lbrynet/core/Session.py | 21 ++++++++++--------- lbrynet/cryptstream/CryptStreamCreator.py | 1 - .../lbry_file/client/EncryptedFileOptions.py | 8 +++---- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lbrynet/blob/blob_file.py b/lbrynet/blob/blob_file.py index 42b402030..df17b25b5 100644 --- a/lbrynet/blob/blob_file.py +++ b/lbrynet/blob/blob_file.py @@ -12,6 +12,7 @@ log = logging.getLogger(__name__) MAX_BLOB_SIZE = 2 * 2 ** 20 + class BlobFile(object): """ A chunk of data available on the network which is specified by a hashsum diff --git a/lbrynet/core/BlobInfo.py b/lbrynet/core/BlobInfo.py index 19fe72253..a15d2bc03 100644 --- a/lbrynet/core/BlobInfo.py +++ b/lbrynet/core/BlobInfo.py @@ -16,3 +16,4 @@ class BlobInfo(object): self.blob_hash = blob_hash self.blob_num = blob_num self.length = length + diff --git a/lbrynet/core/Session.py b/lbrynet/core/Session.py index b75d00d07..33314f2a1 100644 --- a/lbrynet/core/Session.py +++ b/lbrynet/core/Session.py @@ -233,11 +233,13 @@ class Session(object): # best not to rely on this external ip, the router can be behind layers of NATs self.external_ip = external_ip if self.peer_port: - self.upnp_redirects.append(get_port_mapping(u, self.peer_port, 'TCP', - 'LBRY peer port')) + self.upnp_redirects.append( + get_port_mapping(u, self.peer_port, 'TCP', 'LBRY peer port') + ) if self.dht_node_port: - self.upnp_redirects.append(get_port_mapping(u, self.dht_node_port, 'UDP', - 'LBRY DHT port')) + self.upnp_redirects.append( + get_port_mapping(u, self.dht_node_port, 'UDP', 'LBRY DHT port') + ) return True return False @@ -320,14 +322,13 @@ class Session(object): ) if self.blob_tracker is None: - self.blob_tracker = self.blob_tracker_class(self.blob_manager, - self.peer_finder, - self.dht_node) + self.blob_tracker = self.blob_tracker_class( + self.blob_manager, self.peer_finder, self.dht_node + ) if self.payment_rate_manager is None: self.payment_rate_manager = self.payment_rate_manager_class( - self.base_payment_rate_manager, - self.blob_tracker, - self.is_generous) + self.base_payment_rate_manager, self.blob_tracker, self.is_generous + ) self.rate_limiter.start() d = self.storage.setup() diff --git a/lbrynet/cryptstream/CryptStreamCreator.py b/lbrynet/cryptstream/CryptStreamCreator.py index b0a2db2d2..e9a380ed7 100644 --- a/lbrynet/cryptstream/CryptStreamCreator.py +++ b/lbrynet/cryptstream/CryptStreamCreator.py @@ -128,7 +128,6 @@ class CryptStreamCreator(object): d.addCallback(self._blob_finished) self.finished_deferreds.append(d) - def _write(self, data): while len(data) > 0: if self.current_blob is None: diff --git a/lbrynet/lbry_file/client/EncryptedFileOptions.py b/lbrynet/lbry_file/client/EncryptedFileOptions.py index 5ee2e86d1..963e5b69d 100644 --- a/lbrynet/lbry_file/client/EncryptedFileOptions.py +++ b/lbrynet/lbry_file/client/EncryptedFileOptions.py @@ -1,11 +1,11 @@ -from lbrynet.lbry_file.StreamDescriptor import EncryptedFileStreamType -from lbrynet.lbry_file.StreamDescriptor import EncryptedFileStreamDescriptorValidator +from lbrynet.core.StreamDescriptor import EncryptedFileStreamType +from lbrynet.core.StreamDescriptor import EncryptedFileStreamDescriptorValidator from lbrynet.core.DownloadOption import DownloadOption, DownloadOptionChoice def add_lbry_file_to_sd_identifier(sd_identifier): - sd_identifier.add_stream_type( - EncryptedFileStreamType, EncryptedFileStreamDescriptorValidator, EncryptedFileOptions()) + sd_identifier.add_stream_type(EncryptedFileStreamType, EncryptedFileStreamDescriptorValidator, + EncryptedFileOptions()) class EncryptedFileOptions(object):