Skip to content

Commit 365df25

Browse files
jakirkhamDimitriPapadopoulos
authored andcommitted
Apply ruff/flake8-return rule RET504
RET504 Unnecessary assignment before `return` statement
1 parent 86f5ce4 commit 365df25

File tree

10 files changed

+21
-57
lines changed

10 files changed

+21
-57
lines changed

numcodecs/astype.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ def encode(self, buf):
4949
arr = ensure_ndarray(buf).view(self.decode_dtype)
5050

5151
# convert and copy
52-
enc = arr.astype(self.encode_dtype)
53-
54-
return enc
52+
return arr.astype(self.encode_dtype)
5553

5654
def decode(self, buf, out=None):
5755
# normalise input
@@ -61,9 +59,7 @@ def decode(self, buf, out=None):
6159
dec = enc.astype(self.decode_dtype)
6260

6361
# handle output
64-
out = ndarray_copy(dec, out)
65-
66-
return out
62+
return ndarray_copy(dec, out)
6763

6864
def get_config(self):
6965
return {

numcodecs/base64.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ def encode(self, buf):
1313
# normalise inputs
1414
buf = ensure_contiguous_ndarray(buf)
1515
# do compression
16-
compressed = _base64.standard_b64encode(buf)
17-
return compressed
16+
return _base64.standard_b64encode(buf)
1817

1918
def decode(self, buf, out=None):
2019
# normalise inputs

numcodecs/categorize.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,15 @@ def decode(self, buf, out=None):
8080
dec[enc == (i + 1)] = label
8181

8282
# handle output
83-
dec = ndarray_copy(dec, out)
84-
85-
return dec
83+
return ndarray_copy(dec, out)
8684

8785
def get_config(self):
88-
config = dict(
86+
return dict(
8987
id=self.codec_id,
9088
labels=self.labels,
9189
dtype=self.dtype.str,
9290
astype=self.astype.str,
9391
)
94-
return config
9592

9693
def __repr__(self):
9794
# make sure labels part is not too long

numcodecs/delta.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ def decode(self, buf, out=None):
8585
np.cumsum(enc, out=dec)
8686

8787
# handle output
88-
out = ndarray_copy(dec, out)
89-
90-
return out
88+
return ndarray_copy(dec, out)
9189

9290
def get_config(self):
9391
# override to handle encoding dtypes

numcodecs/fixedscaleoffset.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ def encode(self, buf):
9494
enc = np.around(enc)
9595

9696
# convert dtype
97-
enc = enc.astype(self.astype, copy=False)
98-
99-
return enc
97+
return enc.astype(self.astype, copy=False)
10098

10199
def decode(self, buf, out=None):
102100
# interpret buffer as numpy array

numcodecs/gzip.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ def encode(self, buf):
2828
compressed = io.BytesIO()
2929
with _gzip.GzipFile(fileobj=compressed, mode='wb', compresslevel=self.level) as compressor:
3030
compressor.write(buf)
31-
compressed = compressed.getvalue()
32-
33-
return compressed
31+
return compressed.getvalue()
3432

3533
# noinspection PyMethodMayBeStatic
3634
def decode(self, buf, out=None):

numcodecs/quantize.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ def encode(self, buf):
7373
enc = np.around(scale * arr) / scale
7474

7575
# cast dtype
76-
enc = enc.astype(self.astype, copy=False)
77-
78-
return enc
76+
return enc.astype(self.astype, copy=False)
7977

8078
def decode(self, buf, out=None):
8179
# filter is lossy, decoding is no-op

numcodecs/tests/test_blosc.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,12 @@ def test_backwards_compatibility():
215215

216216
def _encode_worker(data):
217217
compressor = Blosc(cname='zlib', clevel=9, shuffle=Blosc.SHUFFLE)
218-
enc = compressor.encode(data)
219-
return enc
218+
return compressor.encode(data)
220219

221220

222221
def _decode_worker(enc):
223222
compressor = Blosc()
224-
data = compressor.decode(enc)
225-
return data
223+
return compressor.decode(enc)
226224

227225

228226
@pytest.mark.parametrize('pool', [Pool, ThreadPool])

numcodecs/tests/test_shuffle.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,12 @@ def test_eq():
7979

8080
def _encode_worker(data):
8181
compressor = Shuffle()
82-
enc = compressor.encode(data)
83-
return enc
82+
return compressor.encode(data)
8483

8584

8685
def _decode_worker(enc):
8786
compressor = Shuffle()
88-
data = compressor.decode(enc)
89-
return data
87+
return compressor.decode(enc)
9088

9189

9290
@pytest.mark.parametrize('pool', [Pool, ThreadPool])

setup.py

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def blosc_extension():
111111
sources = ['numcodecs/blosc.pyx']
112112

113113
# define extension module
114-
extensions = [
114+
return [
115115
Extension(
116116
'numcodecs.blosc',
117117
sources=sources + blosc_sources,
@@ -122,8 +122,6 @@ def blosc_extension():
122122
),
123123
]
124124

125-
return extensions
126-
127125

128126
def zstd_extension():
129127
info('setting up Zstandard extension')
@@ -153,7 +151,7 @@ def zstd_extension():
153151
extra_objects = []
154152

155153
# define extension module
156-
extensions = [
154+
return [
157155
Extension(
158156
'numcodecs.zstd',
159157
sources=sources + zstd_sources,
@@ -164,8 +162,6 @@ def zstd_extension():
164162
),
165163
]
166164

167-
return extensions
168-
169165

170166
def lz4_extension():
171167
info('setting up LZ4 extension')
@@ -182,7 +178,7 @@ def lz4_extension():
182178
sources = ['numcodecs/lz4.pyx']
183179

184180
# define extension module
185-
extensions = [
181+
return [
186182
Extension(
187183
'numcodecs.lz4',
188184
sources=sources + lz4_sources,
@@ -192,8 +188,6 @@ def lz4_extension():
192188
),
193189
]
194190

195-
return extensions
196-
197191

198192
def vlen_extension():
199193
info('setting up vlen extension')
@@ -209,7 +203,7 @@ def vlen_extension():
209203
sources = ['numcodecs/vlen.pyx']
210204

211205
# define extension module
212-
extensions = [
206+
return [
213207
Extension(
214208
'numcodecs.vlen',
215209
sources=sources,
@@ -219,8 +213,6 @@ def vlen_extension():
219213
),
220214
]
221215

222-
return extensions
223-
224216

225217
def fletcher_extension():
226218
info('setting up fletcher32 extension')
@@ -235,7 +227,7 @@ def fletcher_extension():
235227
sources = ['numcodecs/fletcher32.pyx']
236228

237229
# define extension module
238-
extensions = [
230+
return [
239231
Extension(
240232
'numcodecs.fletcher32',
241233
sources=sources,
@@ -245,8 +237,6 @@ def fletcher_extension():
245237
),
246238
]
247239

248-
return extensions
249-
250240

251241
def jenkins_extension():
252242
info('setting up jenkins extension')
@@ -261,7 +251,7 @@ def jenkins_extension():
261251
sources = ['numcodecs/jenkins.pyx']
262252

263253
# define extension module
264-
extensions = [
254+
return [
265255
Extension(
266256
'numcodecs.jenkins',
267257
sources=sources,
@@ -271,8 +261,6 @@ def jenkins_extension():
271261
),
272262
]
273263

274-
return extensions
275-
276264

277265
def compat_extension():
278266
info('setting up compat extension')
@@ -282,16 +270,14 @@ def compat_extension():
282270
sources = ['numcodecs/compat_ext.pyx']
283271

284272
# define extension module
285-
extensions = [
273+
return [
286274
Extension(
287275
'numcodecs.compat_ext',
288276
sources=sources,
289277
extra_compile_args=extra_compile_args,
290278
),
291279
]
292280

293-
return extensions
294-
295281

296282
def shuffle_extension():
297283
info('setting up shuffle extension')
@@ -301,12 +287,10 @@ def shuffle_extension():
301287
sources = ['numcodecs/_shuffle.pyx']
302288

303289
# define extension module
304-
extensions = [
290+
return [
305291
Extension('numcodecs._shuffle', sources=sources, extra_compile_args=extra_compile_args),
306292
]
307293

308-
return extensions
309-
310294

311295
if sys.platform == 'win32':
312296
ext_errors = (CCompilerError, ExecError, PlatformError, IOError, ValueError)

0 commit comments

Comments
 (0)