From d2316ef4cbc3c9c738765a28c653d0c8de5c9380 Mon Sep 17 00:00:00 2001
From: Ferdinando Ametrano <ferdinando@ametrano.net>
Date: Tue, 18 Aug 2020 18:16:59 +0200
Subject: [PATCH 1/4] avoided bare except

---
 ckcc/cli.py    | 4 ++--
 ckcc/client.py | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ckcc/cli.py b/ckcc/cli.py
index ca3d56c..4895f4d 100755
--- a/ckcc/cli.py
+++ b/ckcc/cli.py
@@ -198,7 +198,7 @@ def real_file_upload(fd, blksize=MAX_BLK_LEN, do_upgrade=False, do_reboot=True,
 
             magic = struct.unpack_from("<I", hdr)[0]
             #print("hdr @ 0x%x: %s" % (FW_HEADER_OFFSET, b2a_hex(hdr)))
-        except:
+        except Exception:
             magic = None
 
         if magic != FW_HEADER_MAGIC:
@@ -302,7 +302,7 @@ def get_pubkey(subpath):
 
     try:
         from pycoin.key.BIP32Node import BIP32Node
-    except:
+    except Exception:
         raise click.Abort("pycoin must be installed, not found.")
 
     dev = ColdcardDevice(sn=force_serial)
diff --git a/ckcc/client.py b/ckcc/client.py
index 6610cd4..0b50874 100644
--- a/ckcc/client.py
+++ b/ckcc/client.py
@@ -164,7 +164,7 @@ class ColdcardDevice:
         except CCProtoError as e:
             if expect_errors: raise
             raise
-        except:
+        except Exception:
             #print("Corrupt response: %r" % resp)
             raise
 
@@ -346,7 +346,7 @@ class UnixSimulatorPipe:
         self.pipe = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
         try:
             self.pipe.connect(path)
-        except:
+        except Exception:
             self.close()
             raise RuntimeError("Cannot connect to simulator. Is it running?")
 
@@ -388,7 +388,8 @@ class UnixSimulatorPipe:
         self.pipe.close()
         try:
             os.unlink(self.pipe_name)
-        except: pass
+        except Exception:
+            pass
 
     def get_serial_number_string(self):
         return 'simulator'

From 8f4ed81410de2daf4e0521a8005b36f5e163ac1a Mon Sep 17 00:00:00 2001
From: Ferdinando Ametrano <ferdinando@ametrano.net>
Date: Tue, 25 Aug 2020 18:33:41 +0200
Subject: [PATCH 2/4] extended sign_message to also sign bytes, not only string

---
 ckcc/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckcc/cli.py b/ckcc/cli.py
index ca3d56c..34f4c9c 100755
--- a/ckcc/cli.py
+++ b/ckcc/cli.py
@@ -403,7 +403,7 @@ def sign_message(message, path, verbose=True, just_sig=False, wrap=False, segwit
     # standard very much still in flux, see: <https://github.com/bitcoin/bitcoin/issues/10542>
 
     # not enforcing policy here on msg contents, so we can define that on product
-    message = message.encode('ascii')
+    message = message.encode('ascii') if not isinstance(message, bytes) else message
 
     ok = dev.send_recv(CCProtocolPacker.sign_message(message, path, addr_fmt), timeout=None)
     assert ok == None

From ee01da3e5cdfafb52baf11b6002768783ab18d2b Mon Sep 17 00:00:00 2001
From: Ferdinando Ametrano <ferdinando@ametrano.net>
Date: Tue, 18 Aug 2020 19:10:25 +0200
Subject: [PATCH 3/4] silenced unused variables

---
 ckcc/client.py | 5 +++--
 ckcc/utils.py  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ckcc/client.py b/ckcc/client.py
index 6610cd4..3fc23d5 100644
--- a/ckcc/client.py
+++ b/ckcc/client.py
@@ -161,7 +161,7 @@ class ColdcardDevice:
                 print("Rx [%2d]: %r" % (len(resp), b2a_hex(bytes(resp))))
 
             return CCProtocolUnpacker.decode(resp)
-        except CCProtoError as e:
+        except CCProtoError:
             if expect_errors: raise
             raise
         except:
@@ -260,7 +260,8 @@ class ColdcardDevice:
 
         # If Pycoin is not available, do it using ecdsa
         from ecdsa import BadSignatureError, SECP256k1, VerifyingKey
-        pubkey, chaincode = decode_xpub(expected_xpub)
+        # of the returned (pubkey, chaincode) tuple, chaincode is not used
+        pubkey, _ = decode_xpub(expected_xpub)
         vk = VerifyingKey.from_string(get_pubkey_string(pubkey), curve=SECP256k1)
         try:
             ok = vk.verify_digest(sig[1:], self.session_key)
diff --git a/ckcc/utils.py b/ckcc/utils.py
index 3f4e6e6..5389293 100644
--- a/ckcc/utils.py
+++ b/ckcc/utils.py
@@ -24,14 +24,14 @@ def dfu_parse(fd):
 
     assert dfu_prefix.signature == b'DfuSe', "Not a DFU file (bad magic)"
 
-    for idx in range(dfu_prefix.targets):
+    for _ in range(dfu_prefix.targets):
 
         prefix = consume(fd, 'Target', '<6sBI255s2I', 
                                    'signature altsetting named name size elements')
 
         #print("target%d: %r" % (idx, prefix))
 
-        for ei in range(prefix.elements):
+        for _ in range(prefix.elements):
             # Decode target prefix
             #   <   little endian
             #   I   uint32_t    element address

From cf1ad47a07d76daf596039a63fc531fc5ecb768f Mon Sep 17 00:00:00 2001
From: "Ferdinando M. Ametrano" <fametrano@users.noreply.github.com>
Date: Tue, 25 Aug 2020 20:06:37 +0200
Subject: [PATCH 4/4] fixed typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 04cb1ea..87ac6a1 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Coldcard is a Cheap, Ultra-secure & Opensource Hardware Wallet for #Bitcoin.
 
 Get yours at [ColdcardWallet.com](http://coldcardwallet.com)
 
-This is the python code and command-line utilities you need to communciate with it over USB.
+This is the python code and command-line utilities you need to communicate with it over USB.
 
 ## Setup For Everyday Use