python3 improvements

Author: gerhc

beacon.py

@@ -51,7 +51,6 @@ def getDistance(self):
         if self.rssi == 0:
             return -1.0
 
-        # print type(self.rssi)
         if self.txpower == 0:
             return -1.0
 

blescan.py

@@ -51,21 +51,21 @@ def returnnumberpacket(pkt):
     myInteger = 0
     multiple = 256
     for c in pkt:
-        myInteger += struct.unpack("B", c)[0] * multiple
+        myInteger += c * multiple
         multiple = 1
     return myInteger
 
 
 def returnstringpacket(pkt):
     myString = ""
     for c in pkt:
-        myString += "%02x" % struct.unpack("B", c)[0]
+        myString += "%02x" % c
     return myString
 
 
 def printpacket(pkt):
     for c in pkt:
-        sys.stdout.write("%02x " % struct.unpack("B", c)[0])
+        sys.stdout.write("%02x " % c)
 
 
 def get_packed_bdaddr(bdaddr_string):
@@ -141,14 +141,14 @@ def parse_events(sock, loop_count=100):
         elif event == bluez.EVT_DISCONN_COMPLETE:
             i = 0
         elif event == LE_META_EVENT:
-            subevent, = struct.unpack("B", pkt[3])
+            subevent, = struct.unpack("B", pkt[3:4])
             pkt = pkt[4:]
             if subevent == EVT_LE_CONN_COMPLETE:
                 pass
                 # le_handle_connection_complete(pkt)
             elif subevent == EVT_LE_ADVERTISING_REPORT:
                 # print "advertising report"
-                num_reports = struct.unpack("B", pkt[0])[0]
+                num_reports = struct.unpack("B", pkt[0:1])[0]
                 report_pkt_offset = 0
                 for i in range(0, num_reports):
                     if (DEBUG):
@@ -176,8 +176,8 @@ def parse_events(sock, loop_count=100):
                         pkt[report_pkt_offset - 6: report_pkt_offset - 4])
                     minor = returnnumberpacket(
                         pkt[report_pkt_offset - 4: report_pkt_offset - 2])
-                    txp, = struct.unpack("b", pkt[report_pkt_offset - 2])
-                    rssi, = struct.unpack("b", pkt[report_pkt_offset - 1])
+                    txp, = (pkt[report_pkt_offset - 2],)
+                    rssi, = (pkt[report_pkt_offset - 1],)
 
                     beac = {'uuid': uuid, 'mac': mac, 'major': major,
                             'minor': minor, 'txp': txp, 'rssi': rssi}

main.py

@@ -4,17 +4,16 @@
 
 import blescan
 import sys
-import json
 
 import bluetooth._bluetooth as bluez
 from beacon import Beacon
 
 dev_id = 0
 try:
     sock = bluez.hci_open_dev(dev_id)
-    print ("ble thread started")
+    print("ble thread started")
 except:
-    print ("error accessing bluetooth device...")
+    print("error accessing bluetooth device...")
     sys.exit(1)
 
 blescan.hci_le_set_scan_parameters(sock)
@@ -30,4 +29,4 @@
         allbs[beacon.uuid] = beacon
 
     for key, _ in allbs.iteritems():
-        print (allbs[key])
+        print(allbs[key])