Merge pull request ondryaso#5 from penguintutor/master

Update to work with Python 3

Author: ondryaso

ChipReader/KeyChange.py

@@ -9,38 +9,38 @@
 
 def end_read(signal,frame):
     global run
-    print "\nCtrl+C captured, ending read."
+    print ("\nCtrl+C captured, ending read.")
     run = False
     rdr.cleanup()
 
 signal.signal(signal.SIGINT, end_read)
 
-print "Starting"
+print ("Starting")
 while run:
     (error, data) = rdr.request()
     if not error:
-        print "\nDetected: " + format(data, "02x")
+        print ("\nDetected: " + format(data, "02x"))
 
     (error, uid) = rdr.anticoll()
     if not error:
-        print "Card read UID: "+str(uid[0])+","+str(uid[1])+","+str(uid[2])+","+str(uid[3])
+        print ("Card read UID: "+str(uid[0])+","+str(uid[1])+","+str(uid[2])+","+str(uid[3]))
 
-        print "Setting tag"
+        print ("Setting tag")
         util.set_tag(uid)
-        print "\nAuthorizing"
+        print ("\nAuthorizing")
         util.auth(rdr.auth_a, [0xFF,0xFF,0xFF,0xFF,0xFF,0xFF])
-        print "\nWriting modified bytes"
+        print ("\nWriting modified bytes")
         util.rewrite(4, [None, None, 0x69, 0x24, 0x40])
         util.read_out(4)
         """
-        print "\nWriting zero bytes"
+        print ("\nWriting zero bytes")
         util.rewrite(2, [None, None, 0, 0, 0])
         util.read_out(2)
-        print "\nDeauthorizing"
+        print ("\nDeauthorizing")
         util.deauth()
         """
 
         util.write_trailer(1, (0x12, 0x34, 0x56, 0x78, 0x96, 0x92), (0x0F, 0x07, 0x8F), 105, (0x74, 0x00, 0x52, 0x35, 0x00, 0xFF))
         util.deauth()
 
-        time.sleep(1)
+        time.sleep(1)

ChipReader/RFIDUtil.py

@@ -32,7 +32,7 @@ def set_tag(self, uid):
         Returns called select_tag() error state.
         """
         if self.debug:
-            print "Selecting UID " + str(uid)
+            print ("Selecting UID " + str(uid))
 
         if self.uid != None:
             self.deauth()
@@ -48,7 +48,7 @@ def auth(self, auth_method, key):
         self.key = key
 
         if self.debug:
-            print "Changing used auth key to " + str(key) + " using method " + ("A" if auth_method == self.rfid.auth_a else "B")
+            print ("Changing used auth key to " + str(key) + " using method " + ("A" if auth_method == self.rfid.auth_a else "B"))
 
     def deauth(self):
         """
@@ -59,12 +59,12 @@ def deauth(self):
         self.last_auth = None
 
         if self.debug:
-            print "Changing auth key and method to None"
+            print ("Changing auth key and method to None")
 
         if self.rfid.authed:
             self.rfid.stop_crypto()
             if self.debug:
-                print "Stopping crypto1"
+                print ("Stopping crypto1")
 
     def is_tag_set_auth(self):
         return (self.uid != None) and (self.key != None) and (self.method != None)
@@ -77,13 +77,13 @@ def do_auth(self, block_address, force=False):
         auth_data = (block_address, self.method, self.key, self.uid)
         if (self.last_auth != auth_data) or force:
             if self.debug:
-                print "Calling card_auth on UID " + str(self.uid)
+                print ("Calling card_auth on UID " + str(self.uid))
 
             self.last_auth = auth_data
             return self.rfid.card_auth(self.method, block_address, self.key, self.uid)
         else:
             if self.debug:
-                print "Not calling card_auth - already authed"
+                print ("Not calling card_auth - already authed")
             return False
 
     def write_trailer(self, sector, key_a=(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF), auth_bits=(0xFF, 0x07, 0x80), 
@@ -111,13 +111,13 @@ def rewrite(self, block_address, new_bytes):
                 for i in range(len(new_bytes)):
                     if new_bytes[i] != None:
                         if self.debug:
-                            print "Changing pos " + str(i) + " with current value " + str(data[i]) + " to " + str(new_bytes[i])
+                            print ("Changing pos " + str(i) + " with current value " + str(data[i]) + " to " + str(new_bytes[i]))
 
                         data[i] = new_bytes[i]
 
                 error = self.rfid.write(block_address, data)
                 if self.debug:
-                    print "Writing " + str(data) + " to " + self.sector_string(block_address)
+                    print ("Writing " + str(data) + " to " + self.sector_string(block_address))
 
         return error
 
@@ -131,9 +131,9 @@ def read_out(self, block_address):
         error = self.do_auth(block_address)
         if not error:
             (error, data) = self.rfid.read(block_address)
-            print self.sector_string(block_address) + ": " + str(data)
+            print (self.sector_string(block_address) + ": " + str(data))
         else:
-            print "Error on " + self.sector_string(block_address)
+            print ("Error on " + self.sector_string(block_address))
 
     def dump(self, sectors=16):
         for i in range(sectors * 4):

ChipReader/Read.py

@@ -9,30 +9,30 @@
 
 def end_read(signal,frame):
     global run
-    print "\nCtrl+C captured, ending read."
+    print ("\nCtrl+C captured, ending read.")
     run = False
     rdr.cleanup()
 
 signal.signal(signal.SIGINT, end_read)
 
-print "Starting"
+print ("Starting")
 while run:
     (error, data) = rdr.request()
     if not error:
-        print "\nDetected: " + format(data, "02x")
+        print ("\nDetected: " + format(data, "02x"))
 
     (error, uid) = rdr.anticoll()
     if not error:
-        print "Card read UID: "+str(uid[0])+","+str(uid[1])+","+str(uid[2])+","+str(uid[3])
+        print ("Card read UID: "+str(uid[0])+","+str(uid[1])+","+str(uid[2])+","+str(uid[3]))
 
-        print "Setting tag"
+        print ("Setting tag")
         util.set_tag(uid)
-        print "\nAuthorizing"
+        print ("\nAuthorizing")
         #util.auth(rdr.auth_a, [0x12, 0x34, 0x56, 0x78, 0x96, 0x92])
         util.auth(rdr.auth_b, [0x74, 0x00, 0x52, 0x35, 0x00, 0xFF])
-        print "\nReading"
+        print ("\nReading")
         util.read_out(4)
-        print "\nDeauthorizing"
+        print ("\nDeauthorizing")
         util.deauth()
 
-        time.sleep(1)
+        time.sleep(1)

ChipReader/UtilExample.py

@@ -11,12 +11,12 @@
     #Request tag
     (error, data) = rdr.request()
     if not error:
-        print "\nDetected"
+        print ("\nDetected")
 
         (error, uid) = rdr.anticoll()
         if not error:
             #Print UID
-            print "Card read UID: "+str(uid[0])+","+str(uid[1])+","+str(uid[2])+","+str(uid[3])
+            print ("Card read UID: "+str(uid[0])+","+str(uid[1])+","+str(uid[2])+","+str(uid[3]))
 
             #Set tag as used in util. This will call RFID.select_tag(uid)
             util.set_tag(uid)
@@ -46,4 +46,4 @@
             #We must stop crypto
             util.deauth()
 
-            time.sleep(1)
+            time.sleep(1)