Merge #18585: test: use zero-argument super() shortcut (Python 3.0+)
0956e46bff
test: use zero-argument super() shortcut (Python 3.0+) (Sebastian Falbesoner) Pull request description: This mini-PR replaces all calls to `super(...)` with arguments with the zero-argument shortcut `super()` where applicable. See [PEP 3135](https://www.python.org/dev/peps/pep-3135/#specification): > The new syntax: > > super() > > is equivalent to: > > super(__class__, <firstarg>) > > where __class__ is the class that the method was defined in, and <firstarg> is > the first parameter of the method (normally self for instance methods, and cls > for class methods). ACKs for top commit: fanquake: ACK0956e46bff
Tree-SHA512: 4ac66fe7ab2be2e8a514e5fcfc41dbb298f21b23ebb7b7b0310d704b0b3cef8adf287a8d80346d1ea9418998c597b4f0ff1f66148d0d806bb43db6607e0fe1cf
This commit is contained in:
commit
fd48e7ad99
3 changed files with 9 additions and 9 deletions
|
@ -603,16 +603,16 @@ class CBlock(CBlockHeader):
|
|||
__slots__ = ("vtx",)
|
||||
|
||||
def __init__(self, header=None):
|
||||
super(CBlock, self).__init__(header)
|
||||
super().__init__(header)
|
||||
self.vtx = []
|
||||
|
||||
def deserialize(self, f):
|
||||
super(CBlock, self).deserialize(f)
|
||||
super().deserialize(f)
|
||||
self.vtx = deser_vector(f, CTransaction)
|
||||
|
||||
def serialize(self, with_witness=True):
|
||||
r = b""
|
||||
r += super(CBlock, self).serialize()
|
||||
r += super().serialize()
|
||||
if with_witness:
|
||||
r += ser_vector(self.vtx, "serialize_with_witness")
|
||||
else:
|
||||
|
@ -752,7 +752,7 @@ class P2PHeaderAndShortIDs:
|
|||
class P2PHeaderAndShortWitnessIDs(P2PHeaderAndShortIDs):
|
||||
__slots__ = ()
|
||||
def serialize(self):
|
||||
return super(P2PHeaderAndShortWitnessIDs, self).serialize(with_witness=True)
|
||||
return super().serialize(with_witness=True)
|
||||
|
||||
# Calculate the BIP 152-compact blocks shortid for a given transaction hash
|
||||
def calculate_shortid(k0, k1, tx_hash):
|
||||
|
|
|
@ -97,7 +97,7 @@ class CScriptOp(int):
|
|||
return _opcode_instances[n]
|
||||
except IndexError:
|
||||
assert len(_opcode_instances) == n
|
||||
_opcode_instances.append(super(CScriptOp, cls).__new__(cls, n))
|
||||
_opcode_instances.append(super().__new__(cls, n))
|
||||
return _opcode_instances[n]
|
||||
|
||||
# Populate opcode instance table
|
||||
|
@ -372,7 +372,7 @@ class CScriptTruncatedPushDataError(CScriptInvalidError):
|
|||
"""Invalid pushdata due to truncation"""
|
||||
def __init__(self, msg, data):
|
||||
self.data = data
|
||||
super(CScriptTruncatedPushDataError, self).__init__(msg)
|
||||
super().__init__(msg)
|
||||
|
||||
|
||||
# This is used, eg, for blockchain heights in coinbase scripts (bip34)
|
||||
|
@ -458,14 +458,14 @@ class CScript(bytes):
|
|||
|
||||
def __new__(cls, value=b''):
|
||||
if isinstance(value, bytes) or isinstance(value, bytearray):
|
||||
return super(CScript, cls).__new__(cls, value)
|
||||
return super().__new__(cls, value)
|
||||
else:
|
||||
def coerce_iterable(iterable):
|
||||
for instance in iterable:
|
||||
yield cls.__coerce_instance(instance)
|
||||
# Annoyingly on both python2 and python3 bytes.join() always
|
||||
# returns a bytes instance even when subclassed.
|
||||
return super(CScript, cls).__new__(cls, b''.join(coerce_iterable(value)))
|
||||
return super().__new__(cls, b''.join(coerce_iterable(value)))
|
||||
|
||||
def raw_iter(self):
|
||||
"""Raw iteration
|
||||
|
|
|
@ -29,7 +29,7 @@ class TxnMallTest(BitcoinTestFramework):
|
|||
|
||||
def setup_network(self):
|
||||
# Start with split network:
|
||||
super(TxnMallTest, self).setup_network()
|
||||
super().setup_network()
|
||||
disconnect_nodes(self.nodes[1], 2)
|
||||
disconnect_nodes(self.nodes[2], 1)
|
||||
|
||||
|
|
Loading…
Reference in a new issue