diff --git a/.pylintrc b/.pylintrc index 501e9f3..5c1b324 100644 --- a/.pylintrc +++ b/.pylintrc @@ -437,6 +437,6 @@ valid-metaclass-classmethod-first-arg=mcs # Exceptions that will emit a warning when being caught. Defaults to # "Exception" -overgeneral-exceptions=StandardError, - Exception, - BaseException +overgeneral-exceptions=builtins.StandardError, + builtins.Exception, + builtins.BaseException diff --git a/deploy.py b/deploy.py index 35bb0fb..7af3ce1 100755 --- a/deploy.py +++ b/deploy.py @@ -1160,7 +1160,7 @@ if __name__ == "__main__": # We only need the apps_group if we have a board set apps_group = main_parser.add_mutually_exclusive_group( - required=(partial_args.board is not None)) + required=partial_args.board is not None) apps_group.add_argument( "--no-app", dest="application", diff --git a/src/ctap/mod.rs b/src/ctap/mod.rs index 5c897aa..97e1bc4 100644 --- a/src/ctap/mod.rs +++ b/src/ctap/mod.rs @@ -111,8 +111,7 @@ const STATEFUL_COMMAND_TIMEOUT_DURATION: Milliseconds = Milliseconds(3 pub const FIDO2_VERSION_STRING: &str = "FIDO_2_0"; #[cfg(feature = "with_ctap1")] pub const U2F_VERSION_STRING: &str = "U2F_V2"; -// TODO(#106) change to final string when ready -pub const FIDO2_1_VERSION_STRING: &str = "FIDO_2_1_PRE"; +pub const FIDO2_1_VERSION_STRING: &str = "FIDO_2_1"; // We currently only support one algorithm for signatures: ES256. // This algorithm is requested in MakeCredential and advertized in GetInfo. diff --git a/tools/vendor_hid_test.py b/tools/vendor_hid_test.py index 310d744..1bb1950 100644 --- a/tools/vendor_hid_test.py +++ b/tools/vendor_hid_test.py @@ -124,7 +124,7 @@ class HidInterfaces(unittest.TestCase): def get_device(cls, usage_page) -> HidDevice: devices = list(get_devices(usage_page)) if len(devices) != 1: - raise Exception(f'Found {len(devices)} devices') + raise RuntimeError(f'Found {len(devices)} devices') return HidDevice(devices[0]) def setUp(self) -> None: @@ -277,7 +277,7 @@ def get_fido_device() -> CtapHidDevice: for d in CtapHidDevice.list_devices(): if d.descriptor.vid == _OPENSK_VID and d.descriptor.pid == _OPENSK_PID: return d - raise Exception('Unable to find Fido device') + raise RuntimeError('Unable to find Fido device') def get_fido_device_vendor() -> CtapHidDevice: