Last typing issues (#610)

* Mark files as (not) executable

Mark data- and text files as not executable.
Mark scripts as executable.
Mark main tests runners as executable.

- https://docs.astral.sh/ruff/rules/#flake8-executable-exe

Signed-off-by: Philipp Hahn <[email protected]>

* Convert DW_OP_opcode2name into a dict-comprehension

Signed-off-by: Philipp Hahn <[email protected]>

* callframe: Simplify default value

Signed-off-by: Philipp Hahn <[email protected]>

* elf.descriptions: Simplify range check

Signed-off-by: Philipp Hahn <[email protected]>

* DWARFInfo: Remove inner self

`resolve_strings()` is an internal helper function and does not need
`self`.

Signed-off-by: Philipp Hahn <[email protected]>

* Fix DWARFInfo._parse_line_program_at_offset bytes

`replace_value()` works on `bytes`, as such encode the string using the
default `utf-8` encoding.

Signed-off-by: Philipp Hahn <[email protected]>

* Turn TypeDesc.dimensions into a tuple

`(… for … in …)` is a generator expression, which only can be walked
once compared to a `tuple`.

Signed-off-by: Philipp Hahn <[email protected]>

* Fix return type of _parse_cie_augmentation()

`elftools.dwarf.callframe.CallFrameInfo._parse_cie_augmentation()`
returns a `tuple[bytes, …]`.

Signed-off-by: Philipp Hahn <[email protected]>

---------

Signed-off-by: Philipp Hahn <[email protected]>

Author: pmhahn

TODO

@@ -269,7 +269,7 @@ def _parse_cie_augmentation(self, header, entry_structs):
         """
         augmentation = header.get('augmentation')
         if not augmentation:
-            return ('', {})
+            return (b'', {})
 
         # Ignore armcc augmentations.
         if augmentation.startswith(b'armcc'):
@@ -489,7 +489,7 @@ def __init__(self, header, structs, instructions, offset,
         self.offset = offset
         self.cie = cie
         self._decoded_table = None
-        self.augmentation_dict = augmentation_dict if augmentation_dict else {}
+        self.augmentation_dict = augmentation_dict or {}
         self.augmentation_bytes = augmentation_bytes
 
     def get_decoded(self):

elftools/dwarf/callframe.py

@@ -84,7 +84,7 @@ def parse_cpp_datatype(var_die):
         dt.tag = "ptr_to_member_type" # Not a function pointer per se
         return dt
     elif t.tag == 'array':
-        t.dimensions = (_array_subtype_size(sub)
+        t.dimensions = tuple(_array_subtype_size(sub)
             for sub
             in type_die.iter_children()
             if sub.tag == 'DW_TAG_subrange_type')

elftools/dwarf/datatype_cpp.py

@@ -112,7 +112,7 @@ def _generate_dynamic_values(map, prefix, index_start, index_end, value_start):
 _generate_dynamic_values(DW_OP_name2opcode, 'DW_OP_breg', 0, 31, 0x70)
 
 # opcode -> name mapping
-DW_OP_opcode2name = dict((v, k) for k, v in DW_OP_name2opcode.items())
+DW_OP_opcode2name = {v: k for k, v in DW_OP_name2opcode.items()}
 
 
 # Each parsed DWARF expression is returned as this type with its numeric opcode,

elftools/dwarf/die.py

@@ -662,7 +662,7 @@ def _parse_line_program_at_offset(self, offset, structs):
             offset)
 
         # DWARF5: resolve names
-        def resolve_strings(self, lineprog_header, format_field, data_field):
+        def resolve_strings(lineprog_header, format_field, data_field) -> None:
             if lineprog_header.get(format_field, False):
                 data = lineprog_header[data_field]
                 for field in lineprog_header[format_field]:
@@ -678,12 +678,12 @@ def replace_value(data, content_type, replacer):
                         if self.supplementary_dwarfinfo:
                             replace_value(data, field.content_type, self.supplementary_dwarfinfo.get_string_from_table)
                         else:
-                            replace_value(data, field.content_type, lambda x: str(x))
+                            replace_value(data, field.content_type, lambda x: str(x).encode())
                     elif field.form in ('DW_FORM_strp_sup', 'DW_FORM_strx', 'DW_FORM_strx1', 'DW_FORM_strx2', 'DW_FORM_strx3', 'DW_FORM_strx4'):
                         raise NotImplementedError()
 
-        resolve_strings(self, lineprog_header, 'directory_entry_format', 'directories')
-        resolve_strings(self, lineprog_header, 'file_name_entry_format', 'file_names')
+        resolve_strings(lineprog_header, 'directory_entry_format', 'directories')
+        resolve_strings(lineprog_header, 'file_name_entry_format', 'file_names')
 
         # DWARF5: provide compatible file/directory name arrays for legacy lineprogram consumers
         if lineprog_header.get('directories', False):

elftools/dwarf/dwarf_expr.py

@@ -130,7 +130,7 @@ def describe_symbol_local(x):
 
 def describe_symbol_other(x):
     vis = describe_symbol_visibility(x['visibility'])
-    if x['local'] > 1 and x['local'] < 7:
+    if 1 < x['local'] < 7:
         return vis + ' ' + describe_symbol_local(x['local'])
     return vis