Skip to content

Commit

Permalink
Fix #302, bump version to 1.5.2. update readme and changelo
Browse files Browse the repository at this point in the history
  • Loading branch information
dhoomakethu committed May 14, 2018
1 parent 7f788a4 commit 13de8ab
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Version 1.5.2
------------------------------------------------------------
* Fix serial client `is_socket_open` method

Version 1.5.1
------------------------------------------------------------
* Fix device information selectors
Expand Down
10 changes: 6 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:target: https://gitter.im/pymodbus_dev/Lobby

.. image:: https://readthedocs.org/projects/pymodbus-n/badge/?version=latest
:target: http://pymodbus-n.readthedocs.io/en/latest/?badge=latest
:target: http://pymodbus.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status

============================================================
Expand All @@ -15,8 +15,9 @@ Summary
Pymodbus is a full Modbus protocol implementation using twisted for its
asynchronous communications core. It can also be used without any third
party dependencies (aside from pyserial) if a more lightweight project is
needed. Furthermore, it should work fine under any python version > 2.3
with a python 3.0 branch currently being maintained as well.
needed. Furthermore, it should work fine under any python version > 2.7
(including python 3+)


============================================================
Features
Expand All @@ -40,7 +41,7 @@ Server Features
* TCP, UDP, Serial ASCII, Serial RTU, and Serial Binary
* asynchronous(powered by twisted) and synchronous versions
* Full server control context (device information, counters, etc)
* A number of backing contexts (database, redis, a slave device)
* A number of backing contexts (database, redis, sqlite, a slave device)

============================================================
Use Cases
Expand Down Expand Up @@ -130,6 +131,7 @@ I get time doing such tasks as:
* Architecture documentation
* Functional testing against any reference I can find
* The remaining edges of the protocol (that I think no one uses)
* Asynchronous clients with support to tornado , asyncio

------------------------------------------------------------
Development Instructions
Expand Down
5 changes: 4 additions & 1 deletion pymodbus/client/sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,10 @@ def _recv(self, size):

def is_socket_open(self):
if self.socket:
return self.socket.is_open()
if hasattr(self.socket, "is_open"):
return self.socket.is_open
else:
return self.socket.isOpen()
return False

def __str__(self):
Expand Down
2 changes: 1 addition & 1 deletion pymodbus/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def __str__(self):
return '[%s, version %s]' % (self.package, self.short())


version = Version('pymodbus', 1, 5, 1)
version = Version('pymodbus', 1, 5, 2)


version.__name__ = 'pymodbus' # fix epydoc error
Expand Down

0 comments on commit 13de8ab

Please sign in to comment.