Merge pull request #409 from andlaus/minor_python3.10_fixes

Minor python3.10 fixes

Author: andlaus

odxtools/multiplexer.py

@@ -118,7 +118,7 @@ def encode_into_pdu(self, physical_value: ParameterValue, encode_state: EncodeSt
         orig_origin = encode_state.origin_byte_position
         encode_state.origin_byte_position = encode_state.cursor_byte_position
 
-        if isinstance(physical_value, list | tuple) and len(physical_value) == 2:
+        if isinstance(physical_value, (list, tuple)) and len(physical_value) == 2:
             case_spec, case_value = physical_value
         elif isinstance(physical_value, dict) and len(physical_value) == 1:
             case_spec, case_value = next(iter(physical_value.items()))

odxtools/standardlengthtype.py

@@ -72,11 +72,7 @@ def __get_used_mask(self, internal_value: AtomicOdxType) -> bytes | None:
         if self.is_condensed:
             # if a condensed bitmask is specified, the number of bits
             # set to one in the bit mask are used in the PDU
-
-            # TODO: this is pretty slow. replace it by
-            # `self.bit_mask.bit_count()` once we require python >=
-            # 3.10.
-            bit_sz = bin(self.bit_mask).count("1")
+            bit_sz = self.bit_mask.bit_count()
             used_mask = (1 << bit_sz) - 1
 
             return used_mask.to_bytes((bit_sz + 7) // 8, endianness)
@@ -171,10 +167,7 @@ def __unapply_mask(self, raw_value: AtomicOdxType) -> AtomicOdxType:
 
     def get_static_bit_length(self) -> int | None:
         if self.bit_mask is not None and self.is_condensed:
-            # TODO: this is pretty slow. replace it by
-            # `self.bit_mask.bit_count()` once we require python >=
-            # 3.10.
-            return bin(self.bit_mask).count("1")
+            return self.bit_mask.bit_count()
 
         return self.bit_length