Skip to content

Commit 0987c30

Browse files
committed
pyln.proto.message: python-fluency feedback from @darosior
Signed-off-by: Rusty Russell <[email protected]>
1 parent 014cb8c commit 0987c30

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

contrib/pyln-proto/pyln/proto/message/array_types.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,7 @@ def val_to_str(self, v, otherfields):
3434
if self.elemtype.name == 'byte':
3535
return bytes(v).hex()
3636

37-
s = ''
38-
sep = ''
39-
for i in v:
40-
s += sep + self.elemtype.val_to_str(i, otherfields)
41-
sep = ','
42-
37+
s = ','.join(self.elemtype.val_to_str(i, otherfields) for i in v)
4338
return '[' + s + ']'
4439

4540
def write(self, io_out, v, otherfields):

contrib/pyln-proto/pyln/proto/message/message.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ def get_tlvtype(self, name):
8686

8787
def get_type(self, name):
8888
t = self.get_fundamentaltype(name)
89-
if not t:
89+
if t is None:
9090
t = self.get_subtype(name)
91-
if not t:
91+
if t is None:
9292
t = self.get_tlvtype(name)
9393
return t
9494

@@ -203,7 +203,7 @@ def _field_from_csv(self, namespace, parts, ellipsisok=False, option=None):
203203
204204
"""
205205
basetype = namespace.get_type(parts[1])
206-
if not basetype:
206+
if basetype is None:
207207
raise ValueError('Unknown type {}'.format(parts[1]))
208208

209209
# Fixed number, or another field.
@@ -367,7 +367,7 @@ def field_from_csv(namespace, parts):
367367
raise ValueError("msgdata expected 4 CSV parts, not {}"
368368
.format(parts))
369369
messagetype = namespace.get_msgtype(parts[0])
370-
if not messagetype:
370+
if messagetype is None:
371371
raise ValueError("unknown subtype {}".format(parts[0]))
372372

373373
field = messagetype._field_from_csv(namespace, parts[1:4],
@@ -405,7 +405,7 @@ def type_from_csv(namespace, parts):
405405
raise ValueError("tlvtype expected 4 CSV parts, not {}"
406406
.format(parts))
407407
tlvstream = namespace.get_tlvtype(parts[0])
408-
if not tlvstream:
408+
if tlvstream is None:
409409
tlvstream = TlvStreamType(parts[0])
410410
namespace.add_tlvtype(tlvstream)
411411

@@ -422,7 +422,7 @@ def field_from_csv(namespace, parts):
422422
.format(parts))
423423

424424
tlvstream = namespace.get_tlvtype(parts[0])
425-
if not tlvstream:
425+
if tlvstream is None:
426426
raise ValueError("unknown tlvtype {}".format(parts[0]))
427427

428428
field = tlvstream.find_field(parts[1])
@@ -582,7 +582,7 @@ def read(namespace, io_in):
582582
return None
583583

584584
mtype = namespace.get_msgtype_by_number(typenum)
585-
if not mtype:
585+
if mtype is None:
586586
raise ValueError('Unknown message type number {}'.format(typenum))
587587

588588
fields = {}
@@ -605,7 +605,7 @@ def from_str(namespace, s, incomplete_ok=False):
605605
parts = s.split()
606606

607607
mtype = namespace.get_msgtype(parts[0])
608-
if not mtype:
608+
if mtype is None:
609609
raise ValueError('Unknown message type name {}'.format(parts[0]))
610610

611611
args = {}

0 commit comments

Comments
 (0)