STEP 3 - the actual new files for Ultralight.

[proxmark3-svn] / tools / findbits.py

diff --git a/tools/findbits.py b/tools/findbits.py
index 4e2f18dccea61dda05b32efb7bedb4eeb92d7161..1860964b11a144490489c87284d57d3dda1e4f92 100755 (executable)
--- a/tools/findbits.py
+++ b/tools/findbits.py
@@ -22,7 +22,6 @@
 
 import sys
 import os
 
 import sys
 import os

-import string

 
 # invert binary string
 def invert(data):
 
 # invert binary string
 def invert(data):


@@ -30,7 +29,7 @@ def invert(data):
 
 # do the actual search
 def search(target,data):
 
 # do the actual search
 def search(target,data):

-       location= string.find(data,target)
+       location = data.find(target)

        if location >= 0:
                print '*** Match at bit %d:' % location,
                print '%s<%s>%s' % (data[:location],target,data[location+len(target):])
        if location >= 0:
                print '*** Match at bit %d:' % location,
                print '%s<%s>%s' % (data[:location],target,data[location+len(target):])


@@ -46,7 +45,7 @@ def stringreverse(data):
        return data[::-1]
 
 # match forward, backward and inverted
        return data[::-1]
 
 # match forward, backward and inverted

-def domatch(number,binary):
+def domatch(binary,number):

        reversed= stringreverse(number)
        inverted= invert(binary)
 
        reversed= stringreverse(number)
        inverted= invert(binary)