hilda 3.2.0__tar.gz → 3.2.2__tar.gz

{hilda-3.2.0 → hilda-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hilda
-Version: 3.2.0
+Version: 3.2.2
 Summary: LLDB wrapped and empowered by iPython's features
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>, netanel cohen <netanelc305@protonmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>, netanel cohen <netanelc305@protonmail.com>

{hilda-3.2.0 → hilda-3.2.2}/hilda/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '3.2.0'
-__version_tuple__ = version_tuple = (3, 2, 0)
+__version__ = version = '3.2.2'
+__version_tuple__ = version_tuple = (3, 2, 2)
+
+__commit_id__ = commit_id = 'g41d3a782e'

{hilda-3.2.0 → hilda-3.2.2}/hilda/breakpoints.py

@@ -157,7 +157,7 @@ class HildaBreakpoint:
         # A single breakpoint may be related to several locations (addresses)
         locations = self.locations
         if len(locations) == 0:
-            result += f'\tNo locations\n'
+            result += '\tNo locations\n'
         for location in self.locations:
             result += f'\tLocation {location}\n'
 
@@ -363,14 +363,13 @@ class BreakpointList:
             :param frame: LLDB frame
             :param bp_loc: LLDB breakpoint location
             """
-            nonlocal regs, expr, retval, stop, bt, cmd, force_return, name
+            nonlocal name
             bp = bp_loc.GetBreakpoint()
             symbol = hilda.symbol(hilda.frame.addr.GetLoadAddress(hilda.target))
             thread = hilda.thread
             printed_name = name if name is not None else str(symbol.lldb_address)
 
             def format_value(fmt: Union[str, Callable], value: Symbol) -> str:
-                nonlocal hilda
                 if callable(fmt):
                     return fmt(hilda, value)
                 formatters = {

{hilda-3.2.0 → hilda-3.2.2}/hilda/decorators.py

@@ -1,5 +1,6 @@
 from hilda.breakpoints import WhereType
 from hilda.lldb_importer import lldb
+
 p = lldb.hilda_client
 
 

{hilda-3.2.0 → hilda-3.2.2}/hilda/hilda_client.py

@@ -10,7 +10,7 @@ import sys
 import time
 import typing
 from collections import namedtuple
-from contextlib import contextmanager, suppress
+from contextlib import contextmanager
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
 from functools import cached_property, wraps
@@ -30,10 +30,9 @@ from traitlets.config import Config
 from hilda import objective_c_class
 from hilda.breakpoints import BreakpointList, HildaBreakpoint, WhereType
 from hilda.common import CfSerializable, selection_prompt
-from hilda.exceptions import AccessingMemoryError, AccessingRegisterError, AddingLldbSymbolError, \
-    ConvertingFromNSObjectError, ConvertingToNsObjectError, CreatingObjectiveCSymbolError, \
-    DisableJetsamMemoryChecksError, EvaluatingExpressionError, HildaException, InvalidThreadIndexError, \
-    SymbolAbsentError
+from hilda.exceptions import AccessingMemoryError, AccessingRegisterError, ConvertingFromNSObjectError, \
+    ConvertingToNsObjectError, CreatingObjectiveCSymbolError, DisableJetsamMemoryChecksError, \
+    EvaluatingExpressionError, HildaException, InvalidThreadIndexError, SymbolAbsentError
 from hilda.ipython_extensions.keybindings import get_keybindings
 from hilda.lldb_importer import lldb
 from hilda.objective_c_symbol import ObjectiveCSymbol

{hilda-3.2.0 → hilda-3.2.2}/hilda/ipython_extensions/events.py

@@ -3,7 +3,7 @@ import builtins
 
 from IPython.terminal.interactiveshell import TerminalInteractiveShell
 
-from hilda.exceptions import EvaluatingExpressionError, SymbolAbsentError
+from hilda.exceptions import EvaluatingExpressionError
 from hilda.hilda_client import HildaClient
 from hilda.lldb_importer import lldb
 

{hilda-3.2.0 → hilda-3.2.2}/hilda/objective_c_class.py

@@ -3,7 +3,7 @@ import time
 from collections import UserList, namedtuple
 from dataclasses import dataclass, field
 from functools import partial
-from typing import Any, Iterator, Optional
+from typing import Any, Optional
 
 from objc_types_decoder.decode import decode as decode_type
 from objc_types_decoder.decode import decode_with_tail

{hilda-3.2.0 → hilda-3.2.2}/hilda/snippets/libmalloc.py

@@ -93,15 +93,15 @@ class NanoV2Arena:
     def __init__(self, arena_base_addr):
         self.nanov2_arena_struct = Struct(
             # Note that this only parses 1 CPU memblock (1MB). Modify it to be 64.
-            *[\
-                f"blocks_{idx}" / Array(self.blocks_per_size[idx], \
-                                        Struct('content' / \
-                                               Array(self.slots_per_size[idx], \
-                                                     Struct('Q' / Bytes(self.size_per_slot[idx]) \
-                                                            )\
-                                                     )\
-                                               ))\
-                for idx in range(len(self.blocks_per_size))\
+            *[
+                f"blocks_{idx}" / Array(self.blocks_per_size[idx],
+                                        Struct('content' /
+                                               Array(self.slots_per_size[idx],
+                                                     Struct('Q' / Bytes(self.size_per_slot[idx])
+                                                            )
+                                                     )
+                                               ))
+                for idx in range(len(self.blocks_per_size))
             ]
         )
         self.arena_struct = self.nanov2_arena_struct.parse_stream(arena_base_addr)

{hilda-3.2.0 → hilda-3.2.2}/hilda/symbol.py

@@ -49,7 +49,8 @@ class Symbol(int):
                      'disass', 'po', 'objc_call']
 
     @classmethod
-    def create(cls, value: int, client, lldb_symbol: Optional[lldb.SBSymbol] = None, lldb_address: Optional[lldb.SBAddress] = None, lldb_type: Optional[int] = None) -> None:
+    def create(cls, value: int, client, lldb_symbol: Optional[lldb.SBSymbol] = None,
+               lldb_address: Optional[lldb.SBAddress] = None, lldb_type: Optional[int] = None) -> None:
         """
         Create a Symbol object.
         :param value: Symbol address.

{hilda-3.2.0 → hilda-3.2.2}/hilda/symbols.py

@@ -1,10 +1,11 @@
-import shlex
 import json
 import re
+import shlex
 from itertools import chain
-from tqdm import tqdm
 from tempfile import NamedTemporaryFile
-from typing import Tuple, Optional, Union, Iterator
+from typing import Iterator, Optional, Tuple, Union
+
+from tqdm import tqdm
 
 from hilda.exceptions import SymbolAbsentError
 from hilda.lldb_importer import lldb
@@ -47,10 +48,12 @@ class SymbolList:
     def __len__(self) -> int:
         return sum(1 for _ in self)
 
-    def __contains__(self, address_or_name_or_id_or_symbol: Union[int, str, HildaSymbolId, lldb.SBSymbol, Symbol]) -> bool:
+    def __contains__(self,
+                     address_or_name_or_id_or_symbol: Union[int, str, HildaSymbolId, lldb.SBSymbol, Symbol]) -> bool:
         return self.get(address_or_name_or_id_or_symbol) is not None
 
-    def __getitem__(self, address_or_name_or_id_or_symbol: Union[int, str, HildaSymbolId, lldb.SBSymbol, Symbol]) -> Symbol:
+    def __getitem__(self,
+                    address_or_name_or_id_or_symbol: Union[int, str, HildaSymbolId, lldb.SBSymbol, Symbol]) -> Symbol:
         """
         Get a symbol by address or name or ID (or the symbol itself, though it usually makes little sense)
 
@@ -62,7 +65,8 @@ class SymbolList:
             # raise KeyError(address_or_name_or_id_or_symbol)
         return symbol
 
-    def __delitem__(self, address_or_name_or_id_or_symbol: Union[int, str, HildaSymbolId, lldb.SBSymbol, Symbol]) -> None:
+    def __delitem__(self,
+                    address_or_name_or_id_or_symbol: Union[int, str, HildaSymbolId, lldb.SBSymbol, Symbol]) -> None:
         """
         Remove a symbol (unless this is the global symbol list - see remove())
 
@@ -79,7 +83,8 @@ class SymbolList:
     def __str__(self) -> str:
         return repr(self)
 
-    def get(self, address_or_name_or_id_or_symbol: Union[int, str, HildaSymbolId, lldb.SBSymbol, Symbol]) -> Optional[Symbol]:
+    def get(self, address_or_name_or_id_or_symbol: Union[int, str, HildaSymbolId, lldb.SBSymbol, Symbol]) \
+            -> Optional[Symbol]:
         """
         Get a symbol by address or name or ID (or the symbol itself, though it usually makes little sense)
 
@@ -146,7 +151,8 @@ class SymbolList:
             else:
                 self._symbols_by_name[name] = [sym_id]
 
-    def add(self, value: Union[int, Symbol], symbol_name: Optional[str] = None, symbol_type: Optional[str] = None, symbol_size: Optional[int] = None) -> Symbol:
+    def add(self, value: Union[int, Symbol], symbol_name: Optional[str] = None, symbol_type: Optional[str] = None,
+            symbol_size: Optional[int] = None) -> Symbol:
         """
         Add a symbol.
         Returns existing symbol if a matching regular (i.e., non-anonymous) symbol exists.
@@ -158,8 +164,12 @@ class SymbolList:
         :return: The symbol
         """
         # Check if we already created the symbol
-        if isinstance(value, Symbol) and (symbol_type, symbol_size) == (None, None) and value.lldb_symbol is not None and (
-            symbol_name is None or symbol_name == value.lldb_name):  # TODO: Is it an error to add again, providing the same name?
+        if (isinstance(value, Symbol) and
+                (symbol_type, symbol_size) == (None, None) and
+                value.lldb_symbol is not None and
+
+                # TODO: Is it an error to add again, providing the same name?
+                (symbol_name is None or symbol_name == value.lldb_name)):
             self._add(value.id, value)
             return value
 
@@ -179,7 +189,8 @@ class SymbolList:
 
         # Check if we can get a global symbol
         symbol_address = value
-        global_symbol = self._global.get(symbol_address) if symbol_name is None else self._global.get((symbol_name, symbol_address))
+        global_symbol = self._global.get(symbol_address) if symbol_name is None else (
+            self._global.get((symbol_name, symbol_address)))
         if global_symbol is not None:
             if (symbol_type, symbol_size) != (None, None):
                 raise ValueError()
@@ -204,7 +215,7 @@ class SymbolList:
         if name is not None and re.match(r'^[a-zA-Z0-9_]+$', name):
             ids = self._symbols_by_name[name]
             if len(ids) == 1:
-                del ids[sym_id]
+                ids.remove(sym_id)
             else:
                 del self._symbols_by_name[name]
 
@@ -253,7 +264,7 @@ class SymbolList:
             return self.add(address)
         value = self.get(attribute_name)
         if value is None:
-            raise AttributeError(f"SymbolList object has no attribute '{attribute_name}'")
+            raise SymbolAbsentError(f"SymbolList object has no attribute '{attribute_name}'")
         return value
 
     def __dir__(self):
@@ -262,7 +273,8 @@ class SymbolList:
         # Return normal attributes and symbol names
         return chain(super().__dir__(), self._symbols_by_name.keys())
 
-    def _get_lldb_symbol_from_name(self, name: str, address: Optional[int] = None) -> Optional[Tuple[lldb.SBSymbol, lldb.SBAddress, str, int, int]]:
+    def _get_lldb_symbol_from_name(self, name: str, address: Optional[int] = None) \
+            -> Optional[Tuple[lldb.SBSymbol, lldb.SBAddress, str, int, int]]:
         lldb_symbol_context_list = list(self._hilda.target.FindSymbols(name))
 
         for lldb_symbol_context in list(lldb_symbol_context_list):
@@ -273,16 +285,18 @@ class SymbolList:
 
         if address is not None:
             for lldb_symbol_context in list(lldb_symbol_context_list):
-                lldb_symbol_context_address = lldb_symbol_context.symbol.GetStartAddress().GetLoadAddress(self._hilda.target)
+                lldb_symbol_context_address = lldb_symbol_context.symbol.GetStartAddress().GetLoadAddress(
+                    self._hilda.target)
                 if lldb_symbol_context_address != address:
                     lldb_symbol_context_list.remove(lldb_symbol_context)
-                    self._hilda.log_debug(f'Ignoring symbol {name}@0x{lldb_symbol_context_address:016X} (beacause address is not 0x{address:016X})')
+                    self._hilda.log_debug(f'Ignoring symbol {name}@0x{lldb_symbol_context_address:016X} '
+                                          f'(beacause address is not 0x{address:016X})')
 
         symbols = []
         for lldb_symbol_context in lldb_symbol_context_list:
             symbol = self._get_lldb_symbol(lldb_symbol_context.symbol)
             if symbol is None:
-                self._hilda.log_debug(f'Ignoring symbol {lldb_symbol_context} (failed to convert)')
+                # Ignoring symbol - failed to convert
                 continue
 
             if address is not None:
@@ -302,7 +316,8 @@ class SymbolList:
 
         return symbols[0]
 
-    def _get_lldb_symbol(self, value: Union[int, str, HildaSymbolId, Symbol, lldb.SBAddress, lldb.SBSymbol]) -> Optional[Tuple[lldb.SBSymbol, lldb.SBAddress, str, int, int]]:
+    def _get_lldb_symbol(self, value: Union[int, str, HildaSymbolId, Symbol, lldb.SBAddress, lldb.SBSymbol]) \
+            -> Optional[Tuple[lldb.SBSymbol, lldb.SBAddress, str, int, int]]:
         if isinstance(value, Symbol):
             symbol = value
             return self._get_lldb_symbol(symbol.id)
@@ -328,7 +343,8 @@ class SymbolList:
             return self._get_lldb_symbol_from_name(name)
         elif isinstance(value, lldb.SBAddress):
             lldb_address = value
-            lldb_symbol_context = self._hilda.target.ResolveSymbolContextForAddress(lldb_address, lldb.eSymbolContextEverything)
+            lldb_symbol_context = self._hilda.target.ResolveSymbolContextForAddress(lldb_address,
+                                                                                    lldb.eSymbolContextEverything)
             lldb_symbol = lldb_symbol_context.symbol
 
             address = lldb_address.GetLoadAddress(self._hilda.target)
@@ -353,11 +369,10 @@ class SymbolList:
 
             # Ignore symbols not having a useful type
             symbol_type = lldb_symbol.GetType()
-            if symbol_type not in (
-                lldb.eSymbolTypeCode,
-                lldb.eSymbolTypeRuntime,
-                lldb.eSymbolTypeData,
-                lldb.eSymbolTypeObjCMetaClass):
+            if symbol_type not in (lldb.eSymbolTypeCode,
+                                   lldb.eSymbolTypeRuntime,
+                                   lldb.eSymbolTypeData,
+                                   lldb.eSymbolTypeObjCMetaClass):
                 return None
 
             return (lldb_symbol, lldb_address, symbol_name, symbol_address, symbol_type)
@@ -391,7 +406,8 @@ class SymbolList:
                     f'Failed to add symbol {symbol_name} to {lldb_module.file}'
                     f' (symbol already exists {symbols_before})')
 
-            result = self._hilda.lldb_handle_command(f'target symbols add {shlex.quote(symbols_file.name)}', capture_output=True)
+            result = self._hilda.lldb_handle_command(f'target symbols add {shlex.quote(symbols_file.name)}',
+                                                     capture_output=True)
 
             # Verify command executed as expected
             if result is None:

{hilda-3.2.0 → hilda-3.2.2}/hilda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hilda
-Version: 3.2.0
+Version: 3.2.2
 Summary: LLDB wrapped and empowered by iPython's features
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>, netanel cohen <netanelc305@protonmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>, netanel cohen <netanelc305@protonmail.com>

{hilda-3.2.0 → hilda-3.2.2}/tests/test_symbols/test_symbol_list.py

@@ -21,12 +21,6 @@ def test_iter(hilda_client):
         i += 1
 
 
-def test_inner_symbol_cache(hilda_client):
-    l = list(hilda_client.symbols)
-    names = set(symbol.id[0] for symbol in l if symbol.id[0] is not None)
-    assert names == set(hilda_client.symbols._symbols_by_name.keys())
-
-
 def test_getitem(hilda_client):
     isdigit = hilda_client.symbols['isdigit']
     assert not isdigit(0x10)
@@ -45,7 +39,7 @@ def test_delitem(hilda_client):
     try:
         del symbols[isdigit]
         assert False
-    except:
+    except:  # noqa: E722
         pass
 
     assert 'isdigit' in hilda_client.symbols