Skip to content

Commit 13de8ab

Browse files
committed
Fix #302, bump version to 1.5.2. update readme and changelo
1 parent 7f788a4 commit 13de8ab

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Version 1.5.2
2+
------------------------------------------------------------
3+
* Fix serial client `is_socket_open` method
4+
15
Version 1.5.1
26
------------------------------------------------------------
37
* Fix device information selectors

README.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
:target: https://gitter.im/pymodbus_dev/Lobby
66

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

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

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

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

134136
------------------------------------------------------------
135137
Development Instructions

pymodbus/client/sync.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,10 @@ def _recv(self, size):
529529

530530
def is_socket_open(self):
531531
if self.socket:
532-
return self.socket.is_open()
532+
if hasattr(self.socket, "is_open"):
533+
return self.socket.is_open
534+
else:
535+
return self.socket.isOpen()
533536
return False
534537

535538
def __str__(self):

pymodbus/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def __str__(self):
4141
return '[%s, version %s]' % (self.package, self.short())
4242

4343

44-
version = Version('pymodbus', 1, 5, 1)
44+
version = Version('pymodbus', 1, 5, 2)
4545

4646

4747
version.__name__ = 'pymodbus' # fix epydoc error

0 commit comments

Comments
 (0)