diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2024-08-20 17:11:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-20 17:11:44 +0200 |
| commit | 7ffe28628ac4d6c9758c63220de0070727996277 (patch) | |
| tree | e47a62b02df5b228a86d06de1291c61b96ca7b50 | |
| parent | c8aafe1654ae387356ca2b977e2bdd7a0da5ac59 (diff) | |
| parent | 0dfc5505348b2ca40e0d94be07e322ecf3c73c71 (diff) | |
| download | focaccia-miasm-7ffe28628ac4d6c9758c63220de0070727996277.tar.gz focaccia-miasm-7ffe28628ac4d6c9758c63220de0070727996277.zip | |
Merge pull request #1502 from W0ni/fix_expression_division
fix expression division
| -rw-r--r-- | miasm/expression/expression.py | 4 | ||||
| -rw-r--r-- | test/expression/expression.py | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/miasm/expression/expression.py b/miasm/expression/expression.py index e5debb34..4b0bbe6b 100644 --- a/miasm/expression/expression.py +++ b/miasm/expression/expression.py @@ -568,11 +568,11 @@ class Expr(object): def __sub__(self, other): return ExprOp('+', self, ExprOp('-', other)) - def __div__(self, other): + def __truediv__(self, other): return ExprOp('/', self, other) def __floordiv__(self, other): - return self.__div__(other) + return self.__truediv__(other) def __mod__(self, other): return ExprOp('%', self, other) diff --git a/test/expression/expression.py b/test/expression/expression.py index 9b0c2807..fa3cf0f7 100644 --- a/test/expression/expression.py +++ b/test/expression/expression.py @@ -80,16 +80,22 @@ assert mem.get_r(mem_read=True) == set([mem, A]) C = A+B D = C + A +E = A / B +F = A // B +assert E is F assert A in A assert A in C assert B in C assert C in C +assert E in E assert A in D assert B in D assert C in D assert D in D +assert A in E +assert B in E assert C not in A assert C not in B |