Browse Source

Merge pull request #7828 from JeremyRand/is-none-bitcoin

Fix "== None" linter fails
patch-4
ThomasV 3 years ago
committed by GitHub
parent
commit
bb0f4b5a65
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      electrum/plugins/bitbox02/bitbox02.py
  2. 2
      electrum/plugins/coldcard/coldcard.py
  3. 2
      electrum/rsakey.py
  4. 2
      electrum/tests/test_bolt11.py

2
electrum/plugins/bitbox02/bitbox02.py

@ -444,7 +444,7 @@ class BitBox02Client(HardwareClientBase):
} }
) )
if tx_script_type == None: if tx_script_type is None:
tx_script_type = txin.script_type tx_script_type = txin.script_type
elif tx_script_type != txin.script_type: elif tx_script_type != txin.script_type:
raise Exception("Cannot mix different input script types") raise Exception("Cannot mix different input script types")

2
electrum/plugins/coldcard/coldcard.py

@ -228,7 +228,7 @@ class CKCCClient(HardwareClientBase):
resp = self.dev.send_recv(CCProtocolPacker.sign_transaction(dlen, chk, finalize=finalize), resp = self.dev.send_recv(CCProtocolPacker.sign_transaction(dlen, chk, finalize=finalize),
timeout=None) timeout=None)
if resp != None: if resp is not None:
raise ValueError(resp) raise ValueError(resp)
@runs_in_hwd_thread @runs_in_hwd_thread

2
electrum/rsakey.py

@ -79,7 +79,7 @@ def numberToByteArray(n, howManyBytes=None):
not be larger. The returned bytearray will contain a big-endian not be larger. The returned bytearray will contain a big-endian
encoding of the input integer (n). encoding of the input integer (n).
""" """
if howManyBytes == None: if howManyBytes is None:
howManyBytes = numBytes(n) howManyBytes = numBytes(n)
b = bytearray(howManyBytes) b = bytearray(howManyBytes)
for count in range(howManyBytes-1, -1, -1): for count in range(howManyBytes-1, -1, -1):

2
electrum/tests/test_bolt11.py

@ -49,7 +49,7 @@ class TestBolt11(ElectrumTestCase):
b.tags = [t for t in b.tags if t[0] != 'h' and t[0] != 'n'] b.tags = [t for t in b.tags if t[0] != 'h' and t[0] != 'n']
assert b.pubkey.serialize() == PUBKEY, (hexlify(b.pubkey.serialize()), hexlify(PUBKEY)) assert b.pubkey.serialize() == PUBKEY, (hexlify(b.pubkey.serialize()), hexlify(PUBKEY))
assert b.signature != None assert b.signature is not None
# Unset these, they are generated during encoding/decoding # Unset these, they are generated during encoding/decoding
b.pubkey = None b.pubkey = None

Loading…
Cancel
Save