Merge pull request #71 from chrisjz/python3

Add Python 3 compatibility

Author: AJ Keller

openbci/plugins/udp_server.py

@@ -7,7 +7,10 @@
   - websockets
 """
 
-import cPickle as pickle
+try:
+    import cPickle as pickle
+except ImportError:
+    import _pickle as pickle
 import json
 import socket
 

openbci/utils/parse.py

@@ -1,7 +1,7 @@
 import time
 import struct
 
-from constants import Constants as k
+from openbci.utils.constants import Constants as k
 
 
 class ParseRaw(object):
@@ -174,7 +174,10 @@ def transform_raw_data_packet_to_sample(self, raw_data):
             sample.packet_type = packet_type
         except BaseException as e:
             sample = OpenBCISample()
-            sample.error = e.message
+            if hasattr(e, 'message'):
+                sample.error = e.message
+            else:
+                sample.error = e
             sample.valid = False
 
         return sample

openbci/utils/ssdp.py

@@ -13,12 +13,18 @@
 #   limitations under the License.
 
 import socket
-import httplib
-import StringIO
+try:
+    import httplib
+except ImportError:
+    import http.client
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 
 class SSDPResponse(object):
-    class _FakeSocket(StringIO.StringIO):
+    class _FakeSocket(StringIO):
         def makefile(self, *args, **kw):
             return self
 

openbci/utils/utilities.py

@@ -1,4 +1,4 @@
-from constants import Constants as k
+from openbci.utils.constants import Constants as k
 
 
 def make_tail_byte_from_packet_type(packet_type):

openbci/wifi.py

@@ -23,7 +23,10 @@ def handle_sample(sample):
 import re
 import socket
 import timeit
-import urllib2
+try:
+    import urllib2
+except ImportError:
+    import urllib
 
 import requests
 import xmltodict
@@ -89,7 +92,7 @@ def __init__(self, ip_address=None, shield_name=None, sample_rate=None, log=True
 
         # Intentionally bind to port 0
         self.local_wifi_server = WiFiShieldServer(self.local_ip_address, 0)
-        self.local_wifi_server_port = self.local_wifi_server.getsockname()[1]
+        self.local_wifi_server_port = self.local_wifi_server.socket.getsockname()[1]
         if self.log:
             print("Opened socket on %s:%d" % (self.local_ip_address, self.local_wifi_server_port))
 
@@ -139,7 +142,7 @@ def connect(self):
             raise ValueError('self.ip_address cannot be None')
 
         if self.log:
-            print ("Init WiFi connection with IP: " + self.ip_address)
+            print("Init WiFi connection with IP: " + self.ip_address)
 
         """
         Docs on these HTTP requests and more are found:
@@ -495,7 +498,7 @@ def handle_read(self):
         data = self.recv(3000)  # 3000 is the max data the WiFi shield is allowed to send over TCP
         if len(data) > 2:
             if self.high_speed:
-                packets = len(data)/33
+                packets = int(len(data)/33)
                 raw_data_packets = []
                 for i in range(packets):
                     raw_data_packets.append(bytearray(data[i * k.RAW_PACKET_SIZE: i * k.RAW_PACKET_SIZE + k.RAW_PACKET_SIZE]))
@@ -535,9 +538,9 @@ def handle_read(self):
                                 print("not a sample packet")
                 except ValueError as e:
                     print("failed to parse: %s" % data)
-                    print e
+                    print(e)
                 except BaseException as e:
-                    print e
+                    print(e)
 
 
 class WiFiShieldServer(asyncore.dispatcher):
@@ -558,7 +561,7 @@ def handle_accept(self):
         pair = self.accept()
         if pair is not None:
             sock, addr = pair
-            print 'Incoming connection from %s' % repr(addr)
+            print('Incoming connection from %s' % repr(addr))
             self.handler = WiFiShieldHandler(sock, self.callback, high_speed=self.high_speed,
                                              parser=self.parser, daisy=self.daisy)
 

scripts/socket_client.py

@@ -1,7 +1,7 @@
 from socketIO_client import SocketIO
 
 def on_sample(*args):
-    print args
+    print(args)
 
 socketIO = SocketIO('10.0.1.194', 8880)
 socketIO.on('openbci', on_sample)

scripts/stream_data.py

@@ -53,10 +53,10 @@ def run(self):
             elapsed_time = new_tick - self.tick
             current_samples_in =  nb_samples_in
             current_samples_out = nb_samples_out
-            print "--- at t: ", (new_tick - self.start_tick), " ---"
-            print "elapsed_time: ", elapsed_time
-            print "nb_samples_in: ", current_samples_in - self.nb_samples_in
-            print "nb_samples_out: ", current_samples_out - self.nb_samples_out
+            print("--- at t: ", (new_tick - self.start_tick), " ---")
+            print("elapsed_time: ", elapsed_time)
+            print("nb_samples_in: ", current_samples_in - self.nb_samples_in)
+            print("nb_samples_out: ", current_samples_out - self.nb_samples_out)
             self.tick = new_tick
             self.nb_samples_in = nb_samples_in
             self.nb_samples_out = nb_samples_out
@@ -75,7 +75,7 @@ def streamData(sample):
     global last_id
     # TODO: duplicate packet if skipped to stay sync
     if sample.id != last_id + 1:
-        print "time", tick, ": paquet skipped!"
+        print("time", tick, ": paquet skipped!")
     if sample.id == 255:
         last_id = -1
     else:
@@ -109,10 +109,10 @@ def streamData(sample):
             # OK, it's a very rough interpolation
             interpol_values[i] = (last_values[i] + sample.channel_data[i]) / 2
         if DEBUG:
-            print "  --"
-            print "  last values: ", last_values
-            print "  interpolation: ", interpol_values
-            print "  current sample: ", sample.channel_data
+            print("  --")
+            print("  last values: ", last_values)
+            print("  interpolation: ", interpol_values)
+            print("  current sample: ", sample.channel_data)
         # send to clients interpolated sample
         # leftover_duplications = 0
         server.broadcast_values(interpol_values)

scripts/test.py

@@ -5,11 +5,11 @@
 
 def printData(sample):
     #os.system('clear')
-    print "----------------"
+    print("----------------")
     print("%f" %(sample.id))
-    print sample.channel_data
-    print sample.aux_data
-    print "----------------"
+    print(sample.channel_data)
+    print(sample.aux_data)
+    print("----------------")
 
 
 

scripts/udp_client.py

@@ -1,7 +1,10 @@
 """A sample client for the OpenBCI UDP server."""
 
 import argparse
-import cPickle as pickle
+try:
+    import cPickle as pickle
+except ImportError:
+    import _pickle as pickle
 import json
 import sys; sys.path.append('..') # help python find cyton.py relative to scripts folder
 import socket
@@ -41,12 +44,12 @@ def start_listening(self, callback=None):
       if self.json:
         sample = json.loads(data)
         # In JSON mode we only recieve channel data.
-        print data
+        print(data)
       else:
         sample = pickle.loads(data)
         # Note that sample is an OpenBCISample object.
-        print sample.id
-        print sample.channel_data
+        print(sample.id)
+        print(sample.channel_data)
 
 
 args = parser.parse_args()

scripts/udp_server.py

@@ -8,7 +8,10 @@
 """
 
 import argparse
-import cPickle as pickle
+try:
+    import cPickle as pickle
+except ImportError:
+    import _pickle as pickle
 import json
 import sys; sys.path.append('..') # help python find cyton.py relative to scripts folder
 from openbci import cyton as open_bci
@@ -49,7 +52,7 @@ def __init__(self, ip, port, json):
     self.ip = ip
     self.port = port
     self.json = json
-    print "Selecting raw UDP streaming. IP: ", self.ip, ", port: ", str(self.port)
+    print("Selecting raw UDP streaming. IP: ", self.ip, ", port: ", str(self.port))
     self.server = socket.socket(
         socket.AF_INET, # Internet
         socket.SOCK_DGRAM)