Skip to content

Commit f011db7

Browse files
committed
Merge branch 'dependabot/pip/py-1.10.0'
2 parents 50034c9 + 83b5b6a commit f011db7

File tree

4 files changed

+166
-119
lines changed

4 files changed

+166
-119
lines changed

Pipfile.lock

Lines changed: 102 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nats/aio/client.py

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@
7171

7272
class Subscription:
7373
def __init__(
74-
self,
75-
subject='',
76-
queue='',
77-
future=None,
78-
max_msgs=0,
79-
is_async=False,
80-
cb=None,
81-
coro=None
74+
self,
75+
subject='',
76+
queue='',
77+
future=None,
78+
max_msgs=0,
79+
is_async=False,
80+
cb=None,
81+
coro=None
8282
):
8383
self.subject = subject
8484
self.queue = queue
@@ -119,6 +119,7 @@ class Srv:
119119
"""
120120
Srv is a helper data structure to hold state of a server.
121121
"""
122+
122123
def __init__(self, uri):
123124
self.uri = uri
124125
self.reconnects = 0
@@ -228,38 +229,38 @@ def __init__(self):
228229
}
229230

230231
async def connect(
231-
self,
232-
servers=["nats://127.0.0.1:4222"],
233-
io_loop=None,
234-
loop=None,
235-
error_cb=None,
236-
disconnected_cb=None,
237-
closed_cb=None,
238-
discovered_server_cb=None,
239-
reconnected_cb=None,
240-
name=None,
241-
pedantic=False,
242-
verbose=False,
243-
allow_reconnect=True,
244-
connect_timeout=DEFAULT_CONNECT_TIMEOUT,
245-
reconnect_time_wait=DEFAULT_RECONNECT_TIME_WAIT,
246-
max_reconnect_attempts=DEFAULT_MAX_RECONNECT_ATTEMPTS,
247-
ping_interval=DEFAULT_PING_INTERVAL,
248-
max_outstanding_pings=DEFAULT_MAX_OUTSTANDING_PINGS,
249-
dont_randomize=False,
250-
flusher_queue_size=DEFAULT_MAX_FLUSHER_QUEUE_SIZE,
251-
pending_size=DEFAULT_PENDING_SIZE,
252-
no_echo=False,
253-
tls=None,
254-
tls_hostname=None,
255-
user=None,
256-
password=None,
257-
token=None,
258-
drain_timeout=DEFAULT_DRAIN_TIMEOUT,
259-
signature_cb=None,
260-
user_jwt_cb=None,
261-
user_credentials=None,
262-
nkeys_seed=None,
232+
self,
233+
servers=["nats://127.0.0.1:4222"],
234+
io_loop=None,
235+
loop=None,
236+
error_cb=None,
237+
disconnected_cb=None,
238+
closed_cb=None,
239+
discovered_server_cb=None,
240+
reconnected_cb=None,
241+
name=None,
242+
pedantic=False,
243+
verbose=False,
244+
allow_reconnect=True,
245+
connect_timeout=DEFAULT_CONNECT_TIMEOUT,
246+
reconnect_time_wait=DEFAULT_RECONNECT_TIME_WAIT,
247+
max_reconnect_attempts=DEFAULT_MAX_RECONNECT_ATTEMPTS,
248+
ping_interval=DEFAULT_PING_INTERVAL,
249+
max_outstanding_pings=DEFAULT_MAX_OUTSTANDING_PINGS,
250+
dont_randomize=False,
251+
flusher_queue_size=DEFAULT_MAX_FLUSHER_QUEUE_SIZE,
252+
pending_size=DEFAULT_PENDING_SIZE,
253+
no_echo=False,
254+
tls=None,
255+
tls_hostname=None,
256+
user=None,
257+
password=None,
258+
token=None,
259+
drain_timeout=DEFAULT_DRAIN_TIMEOUT,
260+
signature_cb=None,
261+
user_jwt_cb=None,
262+
user_credentials=None,
263+
nkeys_seed=None,
263264
):
264265
for cb in [error_cb, disconnected_cb, closed_cb, reconnected_cb,
265266
discovered_server_cb]:
@@ -675,15 +676,15 @@ async def _publish(self, subject, reply, payload, payload_size):
675676
await self._flush_pending()
676677

677678
async def subscribe(
678-
self,
679-
subject,
680-
queue="",
681-
cb=None,
682-
future=None,
683-
max_msgs=0,
684-
is_async=False,
685-
pending_msgs_limit=DEFAULT_SUB_PENDING_MSGS_LIMIT,
686-
pending_bytes_limit=DEFAULT_SUB_PENDING_BYTES_LIMIT,
679+
self,
680+
subject,
681+
queue="",
682+
cb=None,
683+
future=None,
684+
max_msgs=0,
685+
is_async=False,
686+
pending_msgs_limit=DEFAULT_SUB_PENDING_MSGS_LIMIT,
687+
pending_bytes_limit=DEFAULT_SUB_PENDING_BYTES_LIMIT,
687688
):
688689
"""
689690
Takes a subject string and optional queue string to send a SUB cmd,
@@ -851,7 +852,7 @@ async def _subscribe(self, sub, ssid):
851852
await self._flush_pending()
852853

853854
async def request(
854-
self, subject, payload, timeout=0.5, expected=1, cb=None
855+
self, subject, payload, timeout=0.5, expected=1, cb=None
855856
):
856857
"""
857858
Implements the request/response pattern via pub/sub

nats/aio/nuid.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class NUID:
3131
NUID is an implementation of the approach for fast generation of
3232
unique identifiers used for inboxes in NATS.
3333
"""
34+
3435
def __init__(self):
3536
self._srand = SystemRandom()
3637
self._prand = Random(self._srand.randint(0, MaxInt))

tests/utils.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717

1818
class Gnatsd:
1919
def __init__(
20-
self,
21-
port=4222,
22-
user="",
23-
password="",
24-
token="",
25-
timeout=0,
26-
http_port=8222,
27-
debug=False,
28-
tls=False,
29-
cluster_listen=None,
30-
routes=[],
31-
config_file=None,
20+
self,
21+
port=4222,
22+
user="",
23+
password="",
24+
token="",
25+
timeout=0,
26+
http_port=8222,
27+
debug=False,
28+
tls=False,
29+
cluster_listen=None,
30+
routes=[],
31+
config_file=None,
3232
):
3333
self.port = port
3434
self.user = user

0 commit comments

Comments
 (0)