Minor fixes while adding type annotaions #600
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A method expects `self` as the first argument; they are all functions.
But: they are all de-referenced already during class definition, at
which point they are actually functions; they only become methods after
the `class` scope is finished.
```console
$ test/all_tests.py
E........EE...................E.....E.....E.....................................................................
======================================================================
ERROR: test_reloc (test_arm_call_reloc.TestARMRElocation)
----------------------------------------------------------------------
Traceback (most recent call last):
File "…/pyelftools/test/test_arm_call_reloc.py", line 41, in test_reloc
self.assertEqual(do_relocation(rel_elf),
File "…/pyelftools/test/test_arm_call_reloc.py", line 28, in do_relocation
rh.apply_section_relocations(stream, rel)
File "…/pyelftools/elftools/elf/relocation.py", line 238, in apply_section_relocations
self._do_apply_relocation(stream, reloc, symtab)
File "…/pyelftools/elftools/elf/relocation.py", line 319, in _do_apply_relocation
relocated_value = recipe.calc_func(
TypeError: 'staticmethod' object is not callable
```
For clarity move all those functions into a separate class.
Signed-off-by: Philipp Hahn <phahn-oss@avm.de>
eliben
requested changes
Feb 24, 2025
| @@ -340,167 +340,176 @@ def _do_apply_relocation(self, stream, reloc, symtab): | |||
| _RELOCATION_RECIPE_TYPE = namedtuple('_RELOCATION_RECIPE_TYPE', | |||
| 'bytesize has_addend calc_func') | |||
|
|
|||
| def _reloc_calc_identity(value, sym_value, offset, addend=0): | |||
There was a problem hiding this comment.
Interesting that this is a problem; is mypy complaining that these methods don't take a self?
For standalone functions, we can just make them standalone (move outside the calss) instead of adding an internal class, no?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While working on #514 I – more correctly:
mypy– found two minor issues:ENUM_SUNW_SYMINFO_BOUNDTO@staticmethodas they are used as functions.