FIX: handling write timeout exception; created sub-modules for strategies, protocol and utils

Author: Zbigniew Zasieczny

pjon_python/base_client.py

@@ -1,12 +1,13 @@
-from pjon_python import serial_utils
-import serial
-import time
-from pjon_python import crc8
-from pjon_python import pjon_protocol
-from pjon_python import pjon_hwserial_strategy
 import logging
+import time
 from threading import Thread
 
+import serial
+
+from pjon_python.protocol import pjon_protocol
+from pjon_python.strategies import pjon_hwserial_strategy
+from pjon_python.utils import serial_utils, crc8
+
 """
 NOT IMPLEMENTED; it's just fooling around; refer to pjon_protocol for working implementation
 """

pjon_python/protocol/__init__.py

@@ -1,9 +1,10 @@
-from pjon_python import pjon_protocol_constants
-from pjon_python import crc8
 import logging
-import time
-import random
 import math
+import random
+import time
+
+from pjon_python.protocol import pjon_protocol_constants
+from pjon_python.utils import crc8
 
 try:
     xrange
@@ -383,7 +384,7 @@ def send_string(self, recipient_id, string_to_send, string_length=None, packet_h
 
         if response != pjon_protocol_constants.FAIL:
             log.debug("collision or corruption; sleeping")
-            time.sleep( random.randint(0, pjon_protocol_constants.COLLISION_MAX_DELAY/1000))
+            time.sleep(random.randint(0, pjon_protocol_constants.COLLISION_MAX_DELAY / 1000))
 
             # FIXME: original PJON lib does not return anything
             return pjon_protocol_constants.BUSY

pjon_python/pjon_protocol.py pjon_python/protocol/pjon_protocol.pypjon_python/pjon_protocol.py renamed to pjon_python/protocol/pjon_protocol.py

@@ -1,6 +1,9 @@
-from pjon_python import pjon_protocol_constants
-import time
 import logging
+import time
+
+from serial import SerialTimeoutException
+
+from pjon_python.protocol import pjon_protocol_constants
 
 log = logging.getLogger("ser-strat")
 
@@ -53,6 +56,10 @@ def send_byte(self, b):
                 raise TypeError
         except TypeError:
                 raise UnsupportedPayloadType("byte type should be str length 1 or int but %s found" % type(b))
+
+        except SerialTimeoutException:
+            log.exception("write timeout")
+
         return 0
 
     def receive_byte(self, is_ack_response=False):

pjon_python/pjon_protocol_constants.py …thon/protocol/pjon_protocol_constants.pypjon_python/pjon_protocol_constants.py renamed to pjon_python/protocol/pjon_protocol_constants.py pjon_python/pjon_protocol_constants.py renamed to pjon_python/protocol/pjon_protocol_constants.py

@@ -1,7 +1,10 @@
 from unittest import TestCase
-from pjon_python.pjon_hwserial_strategy import PJONserialStrategy, UnsupportedPayloadType
+
 import mock
 
+from pjon_python.strategies.pjon_hwserial_strategy import PJONserialStrategy, UnsupportedPayloadType
+
+
 class TestPJONserialStrategy(TestCase):
 
     def test_send_byte_should_convert_int_to_chr(self):