This commit is contained in:
Lex Berezhny 2020-06-05 00:51:55 -04:00
parent ec4e36446c
commit 82b69109bd
9 changed files with 15 additions and 12 deletions

View file

@ -372,7 +372,10 @@ class Output(InputOutput):
def is_signature_valid(encoded_signature, signature_digest, public_key_bytes): def is_signature_valid(encoded_signature, signature_digest, public_key_bytes):
try: try:
public_key = load_der_public_key(public_key_bytes, default_backend()) public_key = load_der_public_key(public_key_bytes, default_backend())
public_key.verify(encoded_signature, signature_digest, ec.ECDSA(Prehashed(hashes.SHA256()))) public_key.verify( # pylint: disable=no-value-for-parameter
encoded_signature, signature_digest,
ec.ECDSA(Prehashed(hashes.SHA256()))
)
return True return True
except (ValueError, InvalidSignature): except (ValueError, InvalidSignature):
pass pass

View file

@ -41,7 +41,7 @@ class ArgumentParser(argparse.ArgumentParser):
self._optionals.title = 'Options' self._optionals.title = 'Options'
if group_name is None: if group_name is None:
self.epilog = ( self.epilog = (
f"Run 'lbrynet COMMAND --help' for more information on a command or group." "Run 'lbrynet COMMAND --help' for more information on a command or group."
) )
else: else:
self.epilog = ( self.epilog = (

View file

@ -192,7 +192,7 @@ class MaxKeyFee(Setting[dict]):
) )
parser.add_argument( parser.add_argument(
self.no_cli_name, self.no_cli_name,
help=f"Disable maximum key fee check.", help="Disable maximum key fee check.",
dest=self.name, dest=self.name,
const=None, const=None,
action="store_const", action="store_const",

View file

@ -35,7 +35,7 @@ class Basic(Console):
elif isinstance(self.service, LightClient): elif isinstance(self.service, LightClient):
s.append('Light Client') s.append('Light Client')
if conf.processes == -1: if conf.processes == -1:
s.append(f'Threads Only') s.append('Threads Only')
elif conf.processes == 0: elif conf.processes == 0:
s.append(f'{os.cpu_count()} Process(es)') s.append(f'{os.cpu_count()} Process(es)')
else: else:

View file

@ -171,7 +171,7 @@ def decode_datagram(datagram: bytes) -> typing.Union[RequestDatagram, ResponseDa
def make_compact_ip(address: str) -> bytearray: def make_compact_ip(address: str) -> bytearray:
compact_ip = reduce(lambda buff, x: buff + bytearray([int(x)]), address.split('.'), bytearray()) compact_ip = reduce(lambda buff, x: buff + bytearray([int(x)]), address.split('.'), bytearray())
if len(compact_ip) != 4: if len(compact_ip) != 4:
raise ValueError(f"invalid IPv4 length") raise ValueError("invalid IPv4 length")
return compact_ip return compact_ip
@ -180,7 +180,7 @@ def make_compact_address(node_id: bytes, address: str, port: int) -> bytearray:
if not 0 < port < 65536: if not 0 < port < 65536:
raise ValueError(f'Invalid port: {port}') raise ValueError(f'Invalid port: {port}')
if len(node_id) != constants.HASH_BITS // 8: if len(node_id) != constants.HASH_BITS // 8:
raise ValueError(f"invalid node node_id length") raise ValueError("invalid node node_id length")
return compact_ip + port.to_bytes(2, 'big') + node_id return compact_ip + port.to_bytes(2, 'big') + node_id
@ -191,5 +191,5 @@ def decode_compact_address(compact_address: bytes) -> typing.Tuple[bytes, str, i
if not 0 < port < 65536: if not 0 < port < 65536:
raise ValueError(f'Invalid port: {port}') raise ValueError(f'Invalid port: {port}')
if len(node_id) != constants.HASH_BITS // 8: if len(node_id) != constants.HASH_BITS // 8:
raise ValueError(f"invalid node node_id length") raise ValueError("invalid node node_id length")
return node_id, address, port return node_id, address, port

View file

@ -63,7 +63,7 @@ class ErrorClass:
@staticmethod @staticmethod
def get_fields(args): def get_fields(args):
if len(args) > 1: if len(args) > 1:
return f''.join(f'\n{INDENT*2}self.{field} = {field}' for field in args[1:]) return ''.join(f'\n{INDENT*2}self.{field} = {field}' for field in args[1:])
return '' return ''
@staticmethod @staticmethod

View file

@ -69,8 +69,8 @@ class VideoFileAnalyzer:
version = str(e) version = str(e)
if code != 0 or not version.startswith("ffmpeg"): if code != 0 or not version.startswith("ffmpeg"):
log.warning("Unable to run ffmpeg, but it was requested. Code: %d; Message: %s", code, version) log.warning("Unable to run ffmpeg, but it was requested. Code: %d; Message: %s", code, version)
raise FileNotFoundError(f"Unable to locate or run ffmpeg or ffprobe. Please install FFmpeg " raise FileNotFoundError("Unable to locate or run ffmpeg or ffprobe. Please install FFmpeg "
f"and ensure that it is callable via PATH or conf.ffmpeg_path") "and ensure that it is callable via PATH or conf.ffmpeg_path")
log.debug("Using %s at %s", version.splitlines()[0].split(" Copyright")[0], self._which_ffmpeg) log.debug("Using %s at %s", version.splitlines()[0].split(" Copyright")[0], self._which_ffmpeg)
return version return version

View file

@ -285,7 +285,7 @@ def get_api_definitions(cls):
def write(fp): def write(fp):
fp.write('# pylint: skip-file\n') fp.write('# pylint: skip-file\n')
fp.write('# DO NOT EDIT: GENERATED FILE\n') fp.write('# DO NOT EDIT: GENERATED FILE\n')
fp.write(f'interface = ') fp.write('interface = ')
defs = get_api_definitions(api.API) defs = get_api_definitions(api.API)
for c in defs['commands'].values(): for c in defs['commands'].values():
del c['method'] del c['method']

View file

@ -75,7 +75,7 @@ class AddressManager:
async def ensure_address_gap(self): async def ensure_address_gap(self):
raise NotImplementedError raise NotImplementedError
def get_address_records(self, only_usable: bool = False, **constraints): async def get_address_records(self, only_usable: bool = False, **constraints):
raise NotImplementedError raise NotImplementedError
async def get_addresses(self, only_usable: bool = False, **constraints) -> List[str]: async def get_addresses(self, only_usable: bool = False, **constraints) -> List[str]: