Rename to uModbus.

AdvancedClimateSystems · Nov 7, 2015 · fb30edb · fb30edb
1 parent f77d98b
commit fb30edb
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 18 deletions.
diff --git a/scripts/data_server.py b/scripts/data_server.py
@@ -5,8 +5,8 @@
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)),
                                 '../'))
 
-from modbus.server import get_server
-from modbus.utils import log_to_stream
+from umodbus.server import get_server
+from umodbus.utils import log_to_stream
 
 fmt = '%(asctime)s - %(name)s - %(levelname)-8s - %(module)s.%(funcName)s: ' +\
       '%(message)s'
@@ -19,6 +19,12 @@ def single_bit(slave_id, address):
     return address % 2
 
 
+@server.route(slave_ids=[1], function_codes=[3, 4], addresses=list(range(100, 200)))
+def return_address(slave_id, address):
+    """ Return address. """
+    print('Called with slave_id {0} and address {1}.'.format(slave_id, address))
+    return address
+
 @server.route(slave_ids=[1], function_codes=[3, 4], addresses=set(range(100, 200)))
 def multi_bit(slave_id, address):
     return address
@@ -29,6 +35,7 @@ def single_coil(slave_id, address, value):
     print(value)
 
 
+
 @server.route(slave_ids=[1], function_codes=[15, 16], addresses=set(range(100, 200)))
 def multiple_coils(slave_id, address, value):
     print(value)

diff --git a/tests/test_functions.py b/tests/test_functions.py
@@ -7,13 +7,13 @@
 except ImportError:
     from mock import MagicMock
 
-from modbus.route import Map
-from modbus.functions import (function_factory, ReadCoils,
-                              WriteMultipleValueFunction, ReadDiscreteInputs,
-                              ReadInputRegisters, ReadHoldingRegisters,
-                              WriteSingleCoil, WriteSingleRegister,
-                              WriteMultipleCoils, WriteMultipleRegisters)
-from modbus.exceptions import IllegalDataValueError, IllegalDataAddressError
+from umodbus.route import Map
+from umodbus.exceptions import IllegalDataValueError, IllegalDataAddressError
+from umodbus.functions import (function_factory, ReadCoils,
+                               WriteMultipleValueFunction, ReadDiscreteInputs,
+                               ReadInputRegisters, ReadHoldingRegisters,
+                               WriteSingleCoil, WriteSingleRegister,
+                               WriteMultipleCoils, WriteMultipleRegisters)
 
 
 @pytest.fixture

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -1,4 +1,4 @@
-from modbus.utils import unpack_mbap, pack_mbap
+from umodbus.utils import unpack_mbap, pack_mbap
 
 
 def test_unpack_mbap():

diff --git a/modbus/__init__.py → umodbus/__init__.py b/modbus/__init__.py → umodbus/__init__.py
diff --git a/modbus/exceptions.py → umodbus/exceptions.py b/modbus/exceptions.py → umodbus/exceptions.py
diff --git a/modbus/functions.py → umodbus/functions.py b/modbus/functions.py → umodbus/functions.py
@@ -2,9 +2,9 @@
 import struct
 from math import ceil
 
-from modbus import log
-from modbus.utils import memoize, integer_to_binary_list
-from modbus.exceptions import IllegalDataValueError, IllegalDataAddressError
+from umodbus import log
+from umodbus.utils import memoize, integer_to_binary_list
+from umodbus.exceptions import IllegalDataValueError, IllegalDataAddressError
 
 try:
     from functools import reduce

diff --git a/modbus/route.py → umodbus/route.py b/modbus/route.py → umodbus/route.py
diff --git a/modbus/server.py → umodbus/server.py b/modbus/server.py → umodbus/server.py
@@ -4,10 +4,10 @@
     from SocketServer import TCPServer, BaseRequestHandler
 from binascii import hexlify
 
-from modbus import log
-from modbus.route import Map
-from modbus.functions import function_factory
-from modbus.utils import unpack_mbap, pack_mbap
+from umodbus import log
+from umodbus.route import Map
+from umodbus.functions import function_factory
+from umodbus.utils import unpack_mbap, pack_mbap
 
 
 def get_server(host, port):

diff --git a/modbus/utils.py → umodbus/utils.py b/modbus/utils.py → umodbus/utils.py
@@ -4,7 +4,7 @@
 from logging import StreamHandler, Formatter
 from functools import wraps
 
-from modbus import log
+from umodbus import log
 
 
 def log_to_stream(stream=sys.stdout, level=logging.WARNING,