Add patches for nxt_python to fix imports

Author: dbworth

nxt/nxt_python/Makefile

@@ -14,10 +14,12 @@ nxt-python: $(INSTALL_DIR)/installed
 $(INSTALL_DIR)/installed: $(SOURCE_DIR)/unpacked
 	rm -rf src/nxt
 	cd $(SOURCE_DIR) && python setup.py install --prefix=$(INSTALL_DIR) --install-purelib=$(INSTALL_DIR)/src
-	patch -p0 bin/nxt_filer  patches/nxt_filer.patch
-	patch -p0 bin/nxt_push   patches/nxt_push.patch
-	patch -p0 bin/nxt_server patches/nxt_server.patch
-	patch -p0 bin/nxt_test   patches/nxt_test.patch
+	patch -p0  src/nxt/brick.py           patches/brick.patch
+	patch -p0  src/nxt/sensor/digital.py  patches/digital.patch
+	patch -p0  bin/nxt_filer              patches/nxt_filer.patch
+	patch -p0  bin/nxt_push               patches/nxt_push.patch
+	patch -p0  bin/nxt_server             patches/nxt_server.patch
+	patch -p0  bin/nxt_test               patches/nxt_test.patch
 	touch $(INSTALL_DIR)/installed
 
 clean:

nxt/nxt_python/patches/brick.patch

@@ -0,0 +1,20 @@
+--- brick.py
++++ brick-new.py
+@@ -13,7 +13,7 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ 
+-from time import sleep
++import time # sleep()
+ from threading import Lock
+ from nxt.error import FileNotFound, ModuleNotFound
+ from nxt.telegram import OPCODES, Telegram
+@@ -224,7 +224,7 @@
+ 
+     def play_tone_and_wait(self, frequency, duration):
+         self.play_tone(frequency, duration)
+-        sleep(duration / 1000.0)
++        time.sleep(duration / 1000.0)
+ 
+     def __del__(self):
+         self.sock.close()

nxt/nxt_python/patches/digital.patch

@@ -0,0 +1,53 @@
+--- digital.py
++++ digital-new.py
+@@ -16,7 +16,7 @@
+ from nxt.error import I2CError, I2CPendingError, DirProtError
+ 
+ from common import *
+-from time import sleep, time
++import time # sleep(), time()
+ import struct
+ 
+ 
+@@ -63,9 +63,9 @@
+         """
+         super(BaseDigitalSensor, self).__init__(brick, port)
+         self.set_input_mode(Type.LOW_SPEED_9V, Mode.RAW)
+-        self.last_poll = time()
++        self.last_poll = time.time()
+         self.poll_delay = 0.01
+-        sleep(0.1)  # Give I2C time to initialize
++        time.sleep(0.1)  # Give I2C time to initialize
+         #Don't do type checking if this class has no compatible sensors listed.
+         try: self.compatible_sensors
+         except AttributeError: check_compatible = False
+@@ -96,11 +96,11 @@
+         """
+         value = struct.pack(format, *value)
+         msg = chr(self.I2C_DEV) + chr(address) + value
+-        now = time()
++        now = time.time()
+         if self.last_poll+self.poll_delay > now:
+             diff = now - self.last_poll
+-            sleep(self.poll_delay - diff)
+-        self.last_poll = time()
++            time.sleep(self.poll_delay - diff)
++        self.last_poll = time.time()
+         self.brick.ls_write(self.port, msg, 0)
+ 
+     def _i2c_query(self, address, format):
+@@ -110,11 +110,11 @@
+         """
+         n_bytes = struct.calcsize(format)
+         msg = chr(self.I2C_DEV) + chr(address)
+-        now = time()
++        now = time.time()
+         if self.last_poll+self.poll_delay > now:
+             diff = now - self.last_poll
+-            sleep(self.poll_delay - diff)
+-        self.last_poll = time()
++            time.sleep(self.poll_delay - diff)
++        self.last_poll = time.time()
+         self.brick.ls_write(self.port, msg, n_bytes)
+         try:
+             self._ls_get_status(n_bytes)