Skip to content

Commit 7e5e2a6

Browse files
jmichelpgeoflisuperskybirdkaczmarczyck
authored
Merge bugfix into stable (#324)
* Add Feitian OpenSK USB Dongle (#257) Co-authored-by: superskybird <skybird.le@gmail.com> * 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 <geoffrey@ftsafe.com> Co-authored-by: superskybird <skybird.le@gmail.com> Co-authored-by: kaczmarczyck <43844792+kaczmarczyck@users.noreply.github.com>
1 parent 5e682d9 commit 7e5e2a6

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

deploy.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ def __call__(self, parser, namespace, values, option_string=None):
243243
# https://github.com/python/cpython/blob/master/Lib/argparse.py#L138-L147
244244
# https://github.com/python/cpython/blob/master/Lib/argparse.py#L1028-L1052
245245
items = getattr(namespace, self.dest, [])
246+
if items is None:
247+
items = []
246248
if isinstance(items, list):
247249
items = items[:]
248250
else:
@@ -916,6 +918,8 @@ def main(args):
916918
help=("When set, the output of elf2tab is appended to this file."),
917919
)
918920

921+
main_parser.set_defaults(features=["with_ctap1"])
922+
919923
# Start parsing to know if we're going to list things or not.
920924
partial_args, _ = main_parser.parse_known_args()
921925

@@ -977,6 +981,4 @@ def main(args):
977981
help=("Compiles and installs the nfct_test example that tests the "
978982
"NFC driver."))
979983

980-
main_parser.set_defaults(features=["with_ctap1"])
981-
982984
main(main_parser.parse_args())

0 commit comments

Comments
 (0)