From 7159d0c9ea305ca1cb766ad783ae95f1b5f30d07 Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Sat, 30 Apr 2011 08:23:54 +0800 Subject: fixed fantomglue import --- nxt-python-fantom/nxt/bluesock.py | 6 +++--- nxt-python-fantom/nxt/fantomglue.py | 8 ++++---- nxt-python-fantom/nxt/usbsock.py | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nxt-python-fantom/nxt/bluesock.py b/nxt-python-fantom/nxt/bluesock.py index b4a2739..99917f2 100644 --- a/nxt-python-fantom/nxt/bluesock.py +++ b/nxt-python-fantom/nxt/bluesock.py @@ -13,12 +13,12 @@ # GNU General Public License for more details. try: - import bluetooth + import fantomglue as bluetooth except ImportError: try: - import lightblueglue as bluetooth + import bluetooth except ImportError: - import pyfantom as bluetooth + import lightblueglue as bluetooth import os from .brick import Brick diff --git a/nxt-python-fantom/nxt/fantomglue.py b/nxt-python-fantom/nxt/fantomglue.py index 5e85e03..a4b6056 100644 --- a/nxt-python-fantom/nxt/fantomglue.py +++ b/nxt-python-fantom/nxt/fantomglue.py @@ -23,7 +23,7 @@ FANTOM_USB = 0 # Bluetooth Iterator def discover_devices(lookup_names=False): # parameter is ignored pairs = [] - for d in NXTIterator(True): + for d in pyfantom.NXTIterator(True): # h: host, n: name h = d.get_resource_string() nxt = d.get_nxt() @@ -44,7 +44,7 @@ class BluetoothSocket: addr, port = addrport if self._sock is None: # Port is ignored - self._sock = NXT(addr) + self._sock = pyfantom.NXT(addr) def send(self, data): return self._sock.write( data ) @@ -64,7 +64,7 @@ def _check_brick(arg, value): def find_devices(lookup_names=False): # parameter is ignored devicelist = [] - for d in NXTIterator(False): + for d in pyfantom.NXTIterator(False): nxt = d.get_nxt() devicelist.append(nxt) return devicelist @@ -99,7 +99,7 @@ class USBSocket: addr, port = addrport if self._sock is None: # Port is ignored - self._sock = NXT(addr) + self._sock = pyfantom.NXT(addr) def send(self, data): return self._sock.write( data ) diff --git a/nxt-python-fantom/nxt/usbsock.py b/nxt-python-fantom/nxt/usbsock.py index 78c21ab..0375869 100644 --- a/nxt-python-fantom/nxt/usbsock.py +++ b/nxt-python-fantom/nxt/usbsock.py @@ -13,9 +13,9 @@ # GNU General Public License for more details. try: - import pyusbglue as usb + import fantomglue as usb except ImportError: - import pyfantom as usb + import pyusbglue as usb from nxt.brick import Brick -- cgit v1.2.3