From 3b5a34f331e208c17b55f4e3a009283669ddeb8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 06:18:59 +0000 Subject: [PATCH 1/2] build(deps-dev): bump mypy from 0.971 to 0.982 Bumps [mypy](https://github.com/python/mypy) from 0.971 to 0.982. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.971...v0.982) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0b285d42..0d9398b3 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ setuptools.setup( "pycodestyle==2.9.1", "black==22.10.0", "isort==5.10.1", - "mypy==0.971", + "mypy==0.982", "psutil==5.9.2", "stix2==3.0.1", "requests==2.28.0", From 85b14075cda12aeead75d14a1f50a605939a459e Mon Sep 17 00:00:00 2001 From: Willi Ballenthin Date: Tue, 11 Oct 2022 09:47:25 +0000 Subject: [PATCH 2/2] address: explicitly resolve hash from int --- capa/features/address.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/capa/features/address.py b/capa/features/address.py index d716aa2d..251b498a 100644 --- a/capa/features/address.py +++ b/capa/features/address.py @@ -32,6 +32,9 @@ class AbsoluteVirtualAddress(int, Address): def __repr__(self): return f"absolute(0x{self:x})" + def __hash__(self): + return int.__hash__(self) + class RelativeVirtualAddress(int, Address): """a memory address relative to a base address""" @@ -39,6 +42,9 @@ class RelativeVirtualAddress(int, Address): def __repr__(self): return f"relative(0x{self:x})" + def __hash__(self): + return int.__hash__(self) + class FileOffsetAddress(int, Address): """an address relative to the start of a file""" @@ -50,6 +56,9 @@ class FileOffsetAddress(int, Address): def __repr__(self): return f"file(0x{self:x})" + def __hash__(self): + return int.__hash__(self) + class DNTokenAddress(int, Address): """a .NET token""" @@ -60,6 +69,9 @@ class DNTokenAddress(int, Address): def __repr__(self): return f"token(0x{self:x})" + def __hash__(self): + return int.__hash__(self) + class DNTokenOffsetAddress(Address): """an offset into an object specified by a .NET token"""