Retroactive branching for v1.1.0 from v1.1 branch r99.

Author: marcusw

nxt/bluesock.py

@@ -12,67 +12,64 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-try:
-    import bluetooth
-except ImportError:
-    import lightblueglue as bluetooth
+import bluetooth
 import os
-from .brick import Brick
+from nxt.brick import Brick
 
 class BlueSock(object):
 
-    bsize = 118 # Bluetooth socket block size
-    PORT = 1    # Standard NXT rfcomm port
+	bsize = 118	# Bluetooth socket block size
+	PORT = 1	# Standard NXT rfcomm port
 
-    def __init__(self, host):
-        self.host = host
-        self.sock = None
-        self.debug = False
+	def __init__(self, host):
+		self.host = host
+		self.sock = None
+		self.debug = False
 
-    def __str__(self):
-        return 'Bluetooth (%s)' % self.host
+	def __str__(self):
+		return 'Bluetooth (%s)' % self.host
 
-    def connect(self):
-        if self.debug:
-            print 'Connecting via Bluetooth...'
-        sock = bluetooth.BluetoothSocket(bluetooth.RFCOMM)
-        sock.connect((self.host, BlueSock.PORT))
-        self.sock = sock
-        if self.debug:
-            print 'Connected.'
-        return Brick(self)
+	def connect(self):
+                if self.debug:
+                        print 'Connecting via Bluetooth...'
+		sock = bluetooth.BluetoothSocket(bluetooth.RFCOMM)
+		sock.connect((self.host, BlueSock.PORT))
+		self.sock = sock
+		if self.debug:
+                        print 'Connected.'
+		return Brick(self)
 
-    def close(self):
-        if self.debug:
-            print 'Closing Bluetooth connection...'
-        self.sock.close()
-        if self.debug:
-            print 'Bluetooth connection closed.'
+	def close(self):
+                if self.debug:
+                        print 'Closing Bluetooth connection...'
+		self.sock.close()
+		if self.debug:
+                        print 'Bluetooth connection closed.'
 
-    def send(self, data):
-        if self.debug:
-            print 'Send:',
-            print ':'.join('%02x' % ord(c) for c in data)
-        l0 = len(data) & 0xFF
-        l1 = (len(data) >> 8) & 0xFF
-        d = chr(l0) + chr(l1) + data
-        self.sock.send(d)
+	def send(self, data):
+		if self.debug:
+			print 'Send:',
+			print ':'.join('%02x' % ord(c) for c in data)
+		l0 = len(data) & 0xFF
+		l1 = (len(data) >> 8) & 0xFF
+		d = chr(l0) + chr(l1) + data
+		self.sock.send(d)
 
-    def recv(self):
-        data = self.sock.recv(2)
-        l0 = ord(data[0])
-        l1 = ord(data[1])
-        plen = l0 + (l1 << 8)
-        data = self.sock.recv(plen)
-        if self.debug:
-            print 'Recv:',
-            print ':'.join('%02x' % ord(c) for c in data)
-        return data
+	def recv(self):
+		data = self.sock.recv(2)
+		l0 = ord(data[0])
+		l1 = ord(data[1])
+		plen = l0 + (l1 << 8)
+		data = self.sock.recv(plen)
+		if self.debug:
+			print 'Recv:',
+			print ':'.join('%02x' % ord(c) for c in data)
+		return data
 
 def _check_brick(arg, value):
-    return arg is None or arg == value
+	return arg is None or arg == value
 
 def find_bricks(host=None, name=None):
-    for h, n in bluetooth.discover_devices(lookup_names=True):
-        if _check_brick(host, h) and _check_brick(name, n):
-            yield BlueSock(h)
+	for h, n in bluetooth.discover_devices(lookup_names=True):
+		if _check_brick(host, h) and _check_brick(name, n):
+			yield BlueSock(h)

nxt/lightblueglue.py

@@ -13,8 +13,8 @@
 # GNU General Public License for more details.
 
 class BrickNotFoundError(Exception):
-    pass
-    
+	pass
+	
 class NoBackendError(Exception):
     pass
 
@@ -33,12 +33,13 @@ def find_bricks(host=None, name=None):
         print >>sys.stderr, "USB unavailable, not searching there"
 
     try:
-        import bluesock
+        from bluetooth import BluetoothError
         try:
+            import bluesock
             socks = bluesock.find_bricks(host, name)
             for s in socks:
                 yield s
-        except (bluesock.bluetooth.BluetoothError, IOError):
+        except BluetoothError:
             pass
     except ImportError:
         import sys