simplified findbits.main() loop

[proxmark3-svn] / tools / findbits.py

diff --git a/tools/findbits.py b/tools/findbits.py
index 03e0c4e08345f4818c1884a589dd761e5574495e..4e2f18dccea61dda05b32efb7bedb4eeb92d7161 100755 (executable)
--- a/tools/findbits.py
+++ b/tools/findbits.py
@@ -26,15 +26,7 @@ import string
 
 # invert binary string
 def invert(data):
-       i=  0
-       out= ''
-       while(i < len(data)):
-               if data[i] == '0':
-                       out += '1'
-               else:
-                       out += '0'
-               i += 1
-       return out
+       return ''.join('0' if c == '1' else '1' for c in data)
 
 # do the actual search
 def search(target,data):
@@ -47,18 +39,11 @@ def search(target,data):
 
 # convert integer to binary string
 def binstring(number):
-       out= ''
-       while number > 0:
-               out += chr(0x30 + (number & 0x01))
-               number= number >> 1
-       return stringreverse(out)
+       return bin(number)[2:] if number > 0 else ''
 
 # reverse string order
 def stringreverse(data):
-       out= ''
-       for x in range(len(data) -1,-1,-1):
-               out += data[x]
-       return out
+       return data[::-1]
 
 # match forward, backward and inverted
 def domatch(number,binary):
@@ -100,11 +85,11 @@ def main():
                16:'HEX',
                        }
 
-       for base in 2,8,10,16:
+       for base, base_name in sorted(bases.iteritems()):
                try:
                        number= int(sys.argv[1],base)
                        print
-                       print 'Trying', bases[base]
+                       print 'Trying', base_name
                        # do BINARY as specified to preserve leading zeros
                        if base == 2:
                                domatch(sys.argv[1],sys.argv[2])