about summary refs log tree commit diff stats
path: root/miasm2/core/bin_stream.py
diff options
context:
space:
mode:
authorPierre Lalet <pierre@droids-corp.org>2015-02-18 20:55:26 +0100
committerPierre Lalet <pierre@droids-corp.org>2015-02-18 20:55:26 +0100
commit736befb2b6fab02e601eae392a9969ac91f2caa3 (patch)
tree66b6208ca4ca21ac8efb3606930ffb664ecddc69 /miasm2/core/bin_stream.py
parent5b3589b4735024e96becb5dbd8d25de4416f7cfb (diff)
parentdf19d375b8552406de77290c95ff41ef366b76c6 (diff)
downloadmiasm-736befb2b6fab02e601eae392a9969ac91f2caa3.tar.gz
miasm-736befb2b6fab02e601eae392a9969ac91f2caa3.zip
Merge pull request #76 from commial/pylinting
Pylinting (thanks for this work!)
Diffstat (limited to 'miasm2/core/bin_stream.py')
-rw-r--r--miasm2/core/bin_stream.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/miasm2/core/bin_stream.py b/miasm2/core/bin_stream.py
index 19614661..6e158061 100644
--- a/miasm2/core/bin_stream.py
+++ b/miasm2/core/bin_stream.py
@@ -96,9 +96,9 @@ class bin_stream_str(bin_stream):
 
 class bin_stream_file(bin_stream):
 
-    def __init__(self, bin, offset=0L, shift=0):
+    def __init__(self, binary, offset=0L, shift=0):
         bin_stream.__init__(self)
-        self.bin = bin
+        self.bin = binary
         self.bin.seek(0, 2)
         self.shift = shift
         self.l = self.bin.tell()