Merge branch 'dev' into repl-improvements

Author: dhoomakethu

CHANGELOG.rst

@@ -1,3 +1,8 @@
+Version 2.0.1
+-----------------------------------------------------------
+* Fix unicode decoder error with BinaryPayloadDecoder in some platforms
+* Avoid unnecessary import of deprecated modules with dependencies on twisted
+
 Version 2.0.0
 -----------------------------------------------------------
 **Note This is a Major release and might affect your existing Async client implementation. Refer examples on how to use the latest async clients.**

pymodbus/client/async/__init__.py

@@ -31,4 +31,14 @@
     # For asyncio the actual client is returned and event loop is asyncio loop
 
 """
-from pymodbus.client.async.deprecated.async import *
+from pymodbus.compat import is_installed
+
+installed = is_installed('twisted')
+if installed:
+    # Import deprecated async client only if twisted is installed #338
+    from pymodbus.client.async.deprecated.async import *
+else:
+    import logging
+    logger = logging.getLogger(__name__)
+    logger.warning("Not Importing deprecated clients. "
+                   "Dependency Twisted is not Installed")

pymodbus/client/async/deprecated/__init__.py

@@ -43,5 +43,5 @@
 """
 
 
-def deprecated(name): # pragma: no cover
+def deprecated(name):  # pragma: no cover
     warnings.warn(WARNING.format(name), DeprecationWarning)

pymodbus/compat.py

@@ -58,6 +58,16 @@
     implements_to_string = lambda x: x
 
     byte2int = lambda b: b
+    if PYTHON_VERSION >= (3, 4):
+        def is_installed(module):
+            import importlib.util
+            found = importlib.util.find_spec(module)
+            return found
+    else:
+        def is_installed(module):
+            import importlib
+            found = importlib.find_loader(module)
+            return found
 # --------------------------------------------------------------------------- #
 # python > 2.5 compatability layer
 # --------------------------------------------------------------------------- #
@@ -76,3 +86,11 @@ def implements_to_string(klass):
         klass.__unicode__ = klass.__str__
         klass.__str__ = lambda x: x.__unicode__().encode('utf-8')
         return klass
+
+    def is_installed(module):
+        import imp
+        try:
+            imp.find_module(module)
+            return True
+        except ImportError:
+            return False

pymodbus/payload.py

@@ -331,7 +331,7 @@ def _unpack_words(self, fstring, handle):
         :return:
         """
         handle = make_byte_string(handle)
-        wc = WC.get(fstring.lower())//2
+        wc = WC.get(fstring.lower()) // 2
         up = "!{}H".format(wc)
         handle = unpack(up, handle)
         if self._wordorder == Endian.Little:
@@ -340,8 +340,8 @@ def _unpack_words(self, fstring, handle):
         # Repack as unsigned Integer
         pk = self._byteorder + 'H'
         handle = [pack(pk, p) for p in handle]
+        _logger.debug(handle)
         handle = b''.join(handle)
-        _logger.debug(unicode_string(handle))
         return handle
 
     def reset(self):

pymodbus/version.py

@@ -41,7 +41,7 @@ def __str__(self):
         return '[%s, version %s]' % (self.package, self.short())
 
 
-version = Version('pymodbus', 2, 0, 0)
+version = Version('pymodbus', 2, 0, 1)
 
 
 version.__name__ = 'pymodbus'  # fix epydoc error

requirements-docs.txt

@@ -1,5 +1,5 @@
 # Python packages required to run `make docs'.
-cryptography==2.1.4 # Required to parse some files
+cryptography>= 2.3 # Required to parse some files
 humanfriendly==4.4.1
 pyasn1==0.4.2       # Required to parse some files
 pyserial-asyncio==0.4.0;python_version>="3.4"