Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
fbbf69e
Rebase to dev3.7
dices Sep 28, 2018
b8c968c
Adding 3.7 to travis configuration
dices Sep 22, 2018
38f1dc1
Updated documentation to resolve warnings introduced with the longer …
dices Sep 23, 2018
e40c78d
Fixed reference to deprecated asynchronous
dices Sep 28, 2018
44668d9
Merge pull request #2 from dices/Py37
dices Sep 28, 2018
e0829bd
Adding gmp disable to fix pypy build issues
dices Sep 28, 2018
06627b8
Adding gmp disable to fix pypy build issues
dices Sep 28, 2018
e11bff7
Removing travis python 3.7 configuration
dices Oct 2, 2018
0fce5b5
Adding asserts for Payload Endianness
EricDuminil Oct 8, 2018
3838f5f
Fixing example of Payload. Same Endianness for builder and decoder.
EricDuminil Oct 8, 2018
826a76c
Merge pull request #350 from EricDuminil/master
dhoomakethu Oct 9, 2018
13adf0a
Fix Sql db slave context validate and get methods - #139
dhoomakethu Oct 9, 2018
cd1cb1c
Merge branch 'dev3.7' of https://github.com/riptideio/pymodbus into d…
dices Oct 10, 2018
05afbb0
Merge pull request #351 from riptideio/#139-SqlDb-Context
dhoomakethu Oct 15, 2018
d00a8cd
#353 - debugging, Add debug logs to check size of avaialble data in r…
dhoomakethu Oct 16, 2018
e85057a
#353 Provide an option to disable inter char timeouts
dhoomakethu Oct 17, 2018
c0a2359
#353 Bump version, update changelog
dhoomakethu Oct 18, 2018
aef3e0a
Merge pull request #355 from riptideio/#353-Error-Reading-Registers
dhoomakethu Oct 23, 2018
e09fed7
Merge pull request #346 from dices/dev3.7
dhoomakethu Oct 23, 2018
b3281fe
Merge pull request #362 from riptideio/dev3.7
dhoomakethu Jan 12, 2019
7e1c728
check self.socket (#354)
mpf82 Jan 14, 2019
d14318f
Fix typo (#378)
kimhanse Jan 26, 2019
9ff42d1
Pymodbus 2.2.0 (#375)
dhoomakethu Apr 18, 2019
9dcdca8
Fix docs (#407)
dhoomakethu Apr 19, 2019
c42d619
Merge branch 'master' into dev
dhoomakethu Apr 19, 2019
14af637
Remove pycrypto dep (#411)
tracernz Apr 22, 2019
13384e4
Fix --upgrade option in install dependencies (#413)
acanidio May 13, 2019
92b4428
Padding for odd sized responses (#425)
tcplomp Jul 25, 2019
ca74132
README update: REPL stands for Read Evaluate **Print** Loop (#426)
alecjohanson Jul 30, 2019
6a6ebde
Drop python 3.4 support (#440)
tracernz Sep 9, 2019
b6429fc
Re-enable travis python 3.7 builds (#441)
tracernz Sep 9, 2019
68932a3
Update __init__.py (#436)
hackerboygn Sep 9, 2019
c645605
Use SPDX identifier to specify the exact license type (#427)
yegorich Sep 9, 2019
e6da559
asyncio server implementation (#400)
memetb Sep 9, 2019
050b03c
Add option to repl allowing Modbus RTU framing on a TCP socket (#447)
Sekenre Sep 26, 2019
cc6e976
Fix asynci server test failures on python3.6 and below
Oct 7, 2019
507e8a0
Bump version to 2.2.0rc1, update six requirements and Changelog
Oct 7, 2019
fedea33
Support multiple Python versions to fix test error from PR #400 (#444)
starnight Oct 17, 2019
4bdf738
Add TLS feature for Modbus synchronous (#446)
starnight Oct 28, 2019
3fb83cc
Fix #461 - Udp client/server , Fix #401 - package license with source…
dhoomakethu Oct 29, 2019
b97659d
Fix examples, Merge #431
dhoomakethu Oct 29, 2019
632d300
#401 Move license to root folder from docs
dhoomakethu Oct 29, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed reference to deprecated asynchronous
  • Loading branch information
dices committed Sep 28, 2018
commit e40c78d849591e6d7f57c0324aa5a5ba3d694dd3
2 changes: 1 addition & 1 deletion pymodbus/client/asynchronous/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
installed = is_installed('twisted')
if installed:
# Import deprecated async client only if twisted is installed #338
from pymodbus.client.asynchronous.deprecated.async import *
from pymodbus.client.asynchronous.deprecated.asynchronous import *
else:
import logging
logger = logging.getLogger(__name__)
Expand Down