From 7e5e2a665ff4f9ba68b7e8d098ee2248a3a85bb8 Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Wed, 9 Jun 2021 16:50:00 +0200 Subject: [PATCH] Merge bugfix into stable (#324) * Add Feitian OpenSK USB Dongle (#257) Co-authored-by: superskybird * Fix `config.py` tool according to the new API of fido2 python package (#284) * Fix fido2 API update. Since fido2 0.8.1 the device descriptor moved to NamedTuple, breaking our configuration tool. Code is now updated accordingly and the setup script ensure we're using the correct version for fido2 package. * Make Yapf happy * Fix missing update for fido2 0.9.1 Also split the comment into 2 lines so that the touch is not hidden at the end of the screen. * adds README changes, logo and certificate (#285) * Fix broken parsing. (#317) * Fix broken parsing. By setting the default value before pre-parsing we ensure that the item can't be None. As an extra safety the custom action also checks for None. Co-authored-by: Geoffrey Co-authored-by: superskybird Co-authored-by: kaczmarczyck <43844792+kaczmarczyck@users.noreply.github.com> --- deploy.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy.py b/deploy.py index b3daa6f..2bae96c 100755 --- a/deploy.py +++ b/deploy.py @@ -243,6 +243,8 @@ class RemoveConstAction(argparse.Action): # https://github.com/python/cpython/blob/master/Lib/argparse.py#L138-L147 # https://github.com/python/cpython/blob/master/Lib/argparse.py#L1028-L1052 items = getattr(namespace, self.dest, []) + if items is None: + items = [] if isinstance(items, list): items = items[:] else: @@ -916,6 +918,8 @@ if __name__ == "__main__": help=("When set, the output of elf2tab is appended to this file."), ) + main_parser.set_defaults(features=["with_ctap1"]) + # Start parsing to know if we're going to list things or not. partial_args, _ = main_parser.parse_known_args() @@ -977,6 +981,4 @@ if __name__ == "__main__": help=("Compiles and installs the nfct_test example that tests the " "NFC driver.")) - main_parser.set_defaults(features=["with_ctap1"]) - main(main_parser.parse_args())