Commit 5a6458c5 by devttys0

Merge pull request #104 from anthraxx/master

binwalk does not start if python3 capstone bindings are installed [fixing python3 --disas option (using compat dict iterator)]
parents 08726a47 002c0f3d
...@@ -5,12 +5,12 @@ from binwalk.core.module import Module, Option, Kwarg ...@@ -5,12 +5,12 @@ from binwalk.core.module import Module, Option, Kwarg
class ArchResult(object): class ArchResult(object):
def __init__(self, **kwargs): def __init__(self, **kwargs):
for (k,v) in kwargs.iteritems(): for (k,v) in binwalk.core.compat.iterator(kwargs):
setattr(self, k, v) setattr(self, k, v)
class Architecture(object): class Architecture(object):
def __init__(self, **kwargs): def __init__(self, **kwargs):
for (k, v) in kwargs.iteritems(): for (k, v) in binwalk.core.compat.iterator(kwargs):
setattr(self, k, v) setattr(self, k, v)
class Disasm(Module): class Disasm(Module):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment