Skip to content

Commit 83e0a79

Browse files
More readable fix for RUF017
1 parent d4aaeba commit 83e0a79

File tree

2 files changed

+21
-29
lines changed

2 files changed

+21
-29
lines changed

distributed/client.py

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import itertools
88
import json
99
import logging
10-
import operator
1110
import os
1211
import pickle
1312
import re
@@ -2298,27 +2297,23 @@ def map(
22982297
keys = [list(element) for element in partition_all(batch_size, key)]
22992298
else:
23002299
keys = [key for _ in range(len(batches))]
2301-
return reduce(
2302-
operator.iadd,
2303-
(
2304-
self.map(
2305-
func,
2306-
*batch,
2307-
key=key,
2308-
workers=workers,
2309-
retries=retries,
2310-
priority=priority,
2311-
allow_other_workers=allow_other_workers,
2312-
fifo_timeout=fifo_timeout,
2313-
resources=resources,
2314-
actor=actor,
2315-
actors=actors,
2316-
pure=pure,
2317-
**kwargs,
2318-
)
2319-
for key, batch in zip(keys, batches)
2320-
),
2321-
[],
2300+
return list(flatten(
2301+
self.map(
2302+
func,
2303+
*batch,
2304+
key=key,
2305+
workers=workers,
2306+
retries=retries,
2307+
priority=priority,
2308+
allow_other_workers=allow_other_workers,
2309+
fifo_timeout=fifo_timeout,
2310+
resources=resources,
2311+
actor=actor,
2312+
actors=actors,
2313+
pure=pure,
2314+
**kwargs,
2315+
)
2316+
for key, batch in zip(keys, batches)
23222317
)
23232318

23242319
key = key or funcname(func)

distributed/utils.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,12 @@
6161
except ImportError:
6262
resource = None # type: ignore
6363

64-
import operator
65-
6664
import tlz as toolz
6765
from tornado import gen
6866
from tornado.ioloop import IOLoop
6967

7068
import dask
69+
from dask.core import flatten
7170
from dask.utils import _deprecated, key_split
7271
from dask.utils import ensure_bytes as _ensure_bytes
7372
from dask.utils import parse_timedelta as _parse_timedelta
@@ -1475,11 +1474,9 @@ def convert_value(v):
14751474
out = '"' + out + '"'
14761475
return out
14771476

1478-
return functools.reduce(
1479-
operator.iadd,
1480-
(["--" + k.replace("_", "-"), convert_value(v)] for k, v in d.items()),
1481-
[],
1482-
)
1477+
return list(flatten(
1478+
["--" + k.replace("_", "-"), convert_value(v)] for k, v in d.items()
1479+
))
14831480

14841481

14851482
def is_valid_xml(text):

0 commit comments

Comments
 (0)