black: fix formatting

Author: Johannes Holland

src/tpmstream/__main__.py

@@ -267,7 +267,7 @@ def parse_all_types(format_in, buffer):
 format_in_arg = {
     "dest": "format_in",
     "type": str,
-    "choices": ["binary", "hex", "pcapng", "swtpm-log" ,"auto"],
+    "choices": ["binary", "hex", "pcapng", "swtpm-log", "auto"],
     "default": "auto",
     "help": "input stream format, default is auto (--in=auto only works with --type=CommandResponseStream)",
 }

src/tpmstream/io/swtpm_log/marshal.py

@@ -6,10 +6,10 @@
 VALID_HEX = b"0123456789ABCDEF"
 VALID_WS = b" \r\n"
 
-STATE_WANT_CMD_MARKER  = 0
-STATE_WANT_CMD_START   = 1
+STATE_WANT_CMD_MARKER = 0
+STATE_WANT_CMD_START = 1
 STATE_WANT_HIGH_NIBBLE = 2
-STATE_WANT_LOW_NIBBLE  = 3
+STATE_WANT_LOW_NIBBLE = 3
 
 # File format we're parsing looks like this:
 #
@@ -44,6 +44,7 @@
 # TPM commands and responses respectively, where we
 # capture the following data and convert to binary.
 
+
 def parse_hex_string(buffer):
     """Generator: hex string to bytes."""
     buffer = iter(buffer)
@@ -63,7 +64,7 @@ def parse_hex_string(buffer):
                 if len(marker) != 0:
                     raise ValueError("Incomplete command marker '%s'" % str(marker))
                 return
-            elif b == CMD_MARKER[len(marker):len(marker)+1]:
+            elif b == CMD_MARKER[len(marker) : len(marker) + 1]:
                 marker += b
 
                 if marker == CMD_MARKER:
@@ -75,11 +76,11 @@ def parse_hex_string(buffer):
         elif state == STATE_WANT_CMD_START:
             if b is None:
                 raise ValueError("Missing command payload")
-            elif b == b'\n':
+            elif b == b"\n":
                 state = STATE_WANT_HIGH_NIBBLE
             else:
                 continue
-        elif state  == STATE_WANT_HIGH_NIBBLE:
+        elif state == STATE_WANT_HIGH_NIBBLE:
             if b is None:
                 return
             elif b in VALID_WS:

test/test_events.py

@@ -14,7 +14,12 @@
 from tpmstream.io import bytes_from_files
 from tpmstream.io.binary import Binary
 from tpmstream.io.swtpm_log import SWTPMLog
-from tpmstream.spec.commands import CommandResponseStream, Command, Response, command_handle_types
+from tpmstream.spec.commands import (
+    Command,
+    CommandResponseStream,
+    Response,
+    command_handle_types,
+)
 from tpmstream.spec.structures.attribute_structures import TPMA_SESSION
 from tpmstream.spec.structures.constants import TPM_CC
 
@@ -285,10 +290,7 @@ def test_binary_marshalling_unmarshalling_response(
 
 class TestSWTPMLogs:
 
-    @pytest.mark.parametrize(
-        "log_name",
-        [ "fedora38", "win11" ]
-    )
+    @pytest.mark.parametrize("log_name", ["fedora38", "win11"])
     def test_marshalling(self, log_name):
         log_file = os.path.join("test", "swtpm", log_name + "-swtpm.log")
         with open(log_file, "rb") as log: