summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTat-Chee Wan (USM)2011-04-30 08:23:54 +0800
committerTat-Chee Wan (USM)2011-04-30 08:23:54 +0800
commit7159d0c9ea305ca1cb766ad783ae95f1b5f30d07 (patch)
tree619f4a10cc2c5b41b9490d127a837410e035a0a0
parentab18bffaf964904081d435eb9344908536aea515 (diff)
fixed fantomglue import
-rw-r--r--nxt-python-fantom/nxt/bluesock.py6
-rw-r--r--nxt-python-fantom/nxt/fantomglue.py8
-rw-r--r--nxt-python-fantom/nxt/usbsock.py4
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