Skip to content

Commit 55894a0

Browse files
authored
Run black. (#1067)
1 parent af67679 commit 55894a0

26 files changed

+363
-339
lines changed

examples/common/updating_server.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,7 @@ async def run_updating_server():
8686
# ----------------------------------------------------------------------- #
8787
log.debug("Start server")
8888
await StartTcpServer(
89-
context,
90-
identity=identity,
91-
address=("localhost", 5020),
92-
defer_start=False
89+
context, identity=identity, address=("localhost", 5020), defer_start=False
9390
)
9491
log.debug("Done")
9592

examples/server_async.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ async def run_server(args=None):
163163
# broadcast_enable=False, # treat unit_id 0 as broadcast address,
164164
# TBD timeout=1, # waiting time for request to complete
165165
# TBD strict=True, # use strict timing, t1.5 for Modbus RTU
166-
defer_start=defer_start # Only define server do not activate
166+
defer_start=defer_start, # Only define server do not activate
167167
)
168168
elif server_id == "udp":
169169
server = await StartUdpServer(
@@ -178,7 +178,7 @@ async def run_server(args=None):
178178
# broadcast_enable=False, # treat unit_id 0 as broadcast address,
179179
# TBD timeout=1, # waiting time for request to complete
180180
# TBD strict=True, # use strict timing, t1.5 for Modbus RTU
181-
defer_start=defer_start # Only define server do not activate
181+
defer_start=defer_start, # Only define server do not activate
182182
)
183183
elif server_id == "serial":
184184
# socat -d -d PTY,link=/tmp/ptyp0,raw,echo=0,ispeed=9600 PTY,
@@ -199,7 +199,7 @@ async def run_server(args=None):
199199
# ignore_missing_slaves=True, # ignore request to a missing slave
200200
# broadcast_enable=False, # treat unit_id 0 as broadcast address,
201201
# strict=True, # use strict timing, t1.5 for Modbus RTU
202-
defer_start=defer_start # Only define server do not activate
202+
defer_start=defer_start, # Only define server do not activate
203203
)
204204
elif server_id == "tls":
205205
server = await StartTlsServer(
@@ -221,10 +221,11 @@ async def run_server(args=None):
221221
# broadcast_enable=False, # treat unit_id 0 as broadcast address,
222222
# TBD timeout=1, # waiting time for request to complete
223223
# TBD strict=True, # use strict timing, t1.5 for Modbus RTU
224-
defer_start=defer_start # Only define server do not activate
224+
defer_start=defer_start, # Only define server do not activate
225225
)
226226
return server
227227

228+
228229
# --------------------------------------------------------------------------- #
229230
# Extra code, to allow commandline parameters instead of changing the code
230231
# --------------------------------------------------------------------------- #

examples/server_sync.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def run_server(args=None):
162162
# broadcast_enable=False, # treat unit_id 0 as broadcast address,
163163
# TBD timeout=1, # waiting time for request to complete
164164
# TBD strict=True, # use strict timing, t1.5 for Modbus RTU
165-
defer_start=defer_start # Only define server do not activate
165+
defer_start=defer_start, # Only define server do not activate
166166
)
167167
elif server_id == "udp":
168168
server = StartUdpServer(
@@ -179,7 +179,7 @@ def run_server(args=None):
179179
# broadcast_enable=False, # treat unit_id 0 as broadcast address,
180180
# TBD timeout=1, # waiting time for request to complete
181181
# TBD strict=True, # use strict timing, t1.5 for Modbus RTU
182-
defer_start=defer_start # Only define server do not activate
182+
defer_start=defer_start, # Only define server do not activate
183183
)
184184
elif server_id == "serial":
185185
# socat -d -d PTY,link=/tmp/ptyp0,raw,echo=0,ispeed=9600 PTY,
@@ -200,7 +200,7 @@ def run_server(args=None):
200200
# ignore_missing_slaves=True, # ignore request to a missing slave
201201
# broadcast_enable=False, # treat unit_id 0 as broadcast address,
202202
# strict=True, # use strict timing, t1.5 for Modbus RTU
203-
defer_start=defer_start # Only define server do not activate
203+
defer_start=defer_start, # Only define server do not activate
204204
)
205205
elif server_id == "tls":
206206
server = StartTlsServer(
@@ -222,7 +222,7 @@ def run_server(args=None):
222222
# broadcast_enable=False, # treat unit_id 0 as broadcast address,
223223
# TBD timeout=1, # waiting time for request to complete
224224
# TBD strict=True, # use strict timing, t1.5 for Modbus RTU
225-
defer_start=defer_start # Only define server do not activate
225+
defer_start=defer_start, # Only define server do not activate
226226
)
227227
return server
228228

pymodbus/client/async_serial.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,7 @@ def protocol_lost_connection(self, protocol):
119119
if self.connected:
120120
_logger.info("Serial lost connection.")
121121
if protocol is not self.protocol:
122-
_logger.error(
123-
"Serial: protocol is not self.protocol."
124-
)
122+
_logger.error("Serial: protocol is not self.protocol.")
125123

126124
self._connected_event.clear()
127125
self.protocol = None

pymodbus/client/async_tcp.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ def protocol_lost_connection(self, protocol):
105105
_logger.info("Protocol lost connection.")
106106
if protocol is not self.protocol:
107107
_logger.error(
108-
"Factory protocol callback called "
109-
"from unexpected protocol instance."
108+
"Factory protocol callback called from unexpected protocol instance."
110109
)
111110

112111
self.connected = False

pymodbus/client/async_tls.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
_logger = logging.getLogger(__name__)
1515

1616

17-
def sslctx_provider(sslctx=None, certfile=None, keyfile=None, password=None): # pylint: disable=missing-type-doc
17+
def sslctx_provider(
18+
sslctx=None, certfile=None, keyfile=None, password=None
19+
): # pylint: disable=missing-type-doc
1820
"""Provide the SSLContext for ModbusTlsClient.
1921
2022
If the user defined SSLContext is not passed in, sslctx_provider will

pymodbus/client/async_udp.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ async def close(self): # pylint: disable=invalid-overridden-method
9595
def _create_protocol(self, host=None, port=0):
9696
"""Create initialized protocol instance with factory function."""
9797
protocol = ModbusClientProtocol(
98-
use_udp=True,
99-
framer=self.params.framer,
100-
**self.params.kwargs
98+
use_udp=True, framer=self.params.framer, **self.params.kwargs
10199
)
102100
protocol.params.host = host
103101
protocol.params.port = port

pymodbus/client/base.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def __init__(
9090
strict: bool = Defaults.Strict,
9191
broadcast_enable: bool = Defaults.BroadcastEnable,
9292
reconnect_delay: int = Defaults.ReconnectDelay,
93-
**kwargs: any
93+
**kwargs: any,
9494
) -> None:
9595
"""Initialize a client instance."""
9696
self.params = self._params()
@@ -249,12 +249,7 @@ class ModbusClientProtocol(
249249
transport = None
250250

251251
def __init__(
252-
self,
253-
host="127.0.0.1",
254-
port=502,
255-
source_address=None,
256-
use_udp=False,
257-
**kwargs
252+
self, host="127.0.0.1", port=502, source_address=None, use_udp=False, **kwargs
258253
):
259254
"""Initialize a Modbus TCP/UDP asynchronous client"""
260255
super().__init__(**kwargs)
@@ -287,7 +282,9 @@ def connection_made(self, transport):
287282
self._connection_made()
288283

289284
if self.factory:
290-
self.factory.protocol_made_connection(self) # pylint: disable=no-member,useless-suppression
285+
self.factory.protocol_made_connection( # pylint: disable=no-member,useless-suppression
286+
self
287+
)
291288

292289
async def close(self): # pylint: disable=invalid-overridden-method
293290
"""Close connection."""
@@ -304,7 +301,9 @@ def connection_lost(self, reason):
304301
self._connection_lost(reason)
305302

306303
if self.factory:
307-
self.factory.protocol_lost_connection(self) # pylint: disable=no-member,useless-suppression
304+
self.factory.protocol_lost_connection( # pylint: disable=no-member,useless-suppression
305+
self
306+
)
308307

309308
def data_received(self, data):
310309
"""Call when some data is received.

0 commit comments

Comments
 (0)