Skip to content

Commit 40372b3

Browse files
daveisferaaiven-sal
daveisfera
authored and
aiven-sal
committed
Run pyupgrade for 3.8 (redis#3236)
Run pyupgrade for 3.8. Signed-off-by: Salvatore Mesoraca <[email protected]>
1 parent 949159c commit 40372b3

File tree

12 files changed

+31
-43
lines changed

12 files changed

+31
-43
lines changed

‎tests/ssl_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ def get_ssl_filename(name):
99
os.path.join(root, "..", "dockers", "stunnel", "keys")
1010
)
1111
if not os.path.isdir(cert_dir):
12-
raise IOError(f"No SSL certificates found. They should be in {cert_dir}")
12+
raise OSError(f"No SSL certificates found. They should be in {cert_dir}")
1313

1414
return os.path.join(cert_dir, name)

‎tests/test_asyncio/compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
try:
55
mock.AsyncMock
66
except AttributeError:
7-
import mock
7+
from unittest import mock
88

99
try:
1010
from contextlib import aclosing

‎tests/test_asyncio/test_search.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,14 +1491,14 @@ async def test_withsuffixtrie(decoded_r: valkey.Valkey):
14911491
assert await decoded_r.ft().dropindex("idx")
14921492

14931493
# create withsuffixtrie index (text field)
1494-
assert await decoded_r.ft().create_index((TextField("t", withsuffixtrie=True)))
1494+
assert await decoded_r.ft().create_index(TextField("t", withsuffixtrie=True))
14951495
await waitForIndex(decoded_r, getattr(decoded_r.ft(), "index_name", "idx"))
14961496
info = await decoded_r.ft().info()
14971497
assert "WITHSUFFIXTRIE" in info["attributes"][0]
14981498
assert await decoded_r.ft().dropindex("idx")
14991499

15001500
# create withsuffixtrie index (tag field)
1501-
assert await decoded_r.ft().create_index((TagField("t", withsuffixtrie=True)))
1501+
assert await decoded_r.ft().create_index(TagField("t", withsuffixtrie=True))
15021502
await waitForIndex(decoded_r, getattr(decoded_r.ft(), "index_name", "idx"))
15031503
info = await decoded_r.ft().info()
15041504
assert "WITHSUFFIXTRIE" in info["attributes"][0]
@@ -1508,14 +1508,14 @@ async def test_withsuffixtrie(decoded_r: valkey.Valkey):
15081508
assert await decoded_r.ft().dropindex("idx")
15091509

15101510
# create withsuffixtrie index (text fields)
1511-
assert await decoded_r.ft().create_index((TextField("t", withsuffixtrie=True)))
1511+
assert await decoded_r.ft().create_index(TextField("t", withsuffixtrie=True))
15121512
waitForIndex(decoded_r, getattr(decoded_r.ft(), "index_name", "idx"))
15131513
info = await decoded_r.ft().info()
15141514
assert "WITHSUFFIXTRIE" in info["attributes"][0]["flags"]
15151515
assert await decoded_r.ft().dropindex("idx")
15161516

15171517
# create withsuffixtrie index (tag field)
1518-
assert await decoded_r.ft().create_index((TagField("t", withsuffixtrie=True)))
1518+
assert await decoded_r.ft().create_index(TagField("t", withsuffixtrie=True))
15191519
waitForIndex(decoded_r, getattr(decoded_r.ft(), "index_name", "idx"))
15201520
info = await decoded_r.ft().info()
15211521
assert "WITHSUFFIXTRIE" in info["attributes"][0]["flags"]

‎tests/test_search.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,16 +1383,14 @@ def test_aggregations_apply(client):
13831383
)
13841384
res = client.ft().aggregate(req)
13851385
if is_resp2_connection(client):
1386-
res_set = set([res.rows[0][1], res.rows[1][1]])
1387-
assert res_set == set(["6373878785249699840", "6373878758592700416"])
1386+
res_set = {res.rows[0][1], res.rows[1][1]}
1387+
assert res_set == {"6373878785249699840", "6373878758592700416"}
13881388
else:
1389-
res_set = set(
1390-
[
1391-
res["results"][0]["extra_attributes"]["CreatedDateTimeUTC"],
1392-
res["results"][1]["extra_attributes"]["CreatedDateTimeUTC"],
1393-
],
1394-
)
1395-
assert res_set == set(["6373878785249699840", "6373878758592700416"])
1389+
res_set = {
1390+
res["results"][0]["extra_attributes"]["CreatedDateTimeUTC"],
1391+
res["results"][1]["extra_attributes"]["CreatedDateTimeUTC"],
1392+
}
1393+
assert res_set == {"6373878785249699840", "6373878758592700416"}
13961394

13971395

13981396
@pytest.mark.valkeymod
@@ -2097,7 +2095,7 @@ def test_numeric_params(client):
20972095
@pytest.mark.valkeymod
20982096
@skip_ifmodversion_lt("2.4.3", "search")
20992097
def test_geo_params(client):
2100-
client.ft().create_index((GeoField("g")))
2098+
client.ft().create_index(GeoField("g"))
21012099
client.hset("doc1", mapping={"g": "29.69465, 34.95126"})
21022100
client.hset("doc2", mapping={"g": "29.69350, 34.94737"})
21032101
client.hset("doc3", mapping={"g": "29.68746, 34.94882"})
@@ -2225,14 +2223,14 @@ def test_withsuffixtrie(client: valkey.Valkey):
22252223
assert client.ft().dropindex("idx")
22262224

22272225
# create withsuffixtrie index (text fields)
2228-
assert client.ft().create_index((TextField("t", withsuffixtrie=True)))
2226+
assert client.ft().create_index(TextField("t", withsuffixtrie=True))
22292227
waitForIndex(client, getattr(client.ft(), "index_name", "idx"))
22302228
info = client.ft().info()
22312229
assert "WITHSUFFIXTRIE" in info["attributes"][0]
22322230
assert client.ft().dropindex("idx")
22332231

22342232
# create withsuffixtrie index (tag field)
2235-
assert client.ft().create_index((TagField("t", withsuffixtrie=True)))
2233+
assert client.ft().create_index(TagField("t", withsuffixtrie=True))
22362234
waitForIndex(client, getattr(client.ft(), "index_name", "idx"))
22372235
info = client.ft().info()
22382236
assert "WITHSUFFIXTRIE" in info["attributes"][0]
@@ -2242,14 +2240,14 @@ def test_withsuffixtrie(client: valkey.Valkey):
22422240
assert client.ft().dropindex("idx")
22432241

22442242
# create withsuffixtrie index (text fields)
2245-
assert client.ft().create_index((TextField("t", withsuffixtrie=True)))
2243+
assert client.ft().create_index(TextField("t", withsuffixtrie=True))
22462244
waitForIndex(client, getattr(client.ft(), "index_name", "idx"))
22472245
info = client.ft().info()
22482246
assert "WITHSUFFIXTRIE" in info["attributes"][0]["flags"]
22492247
assert client.ft().dropindex("idx")
22502248

22512249
# create withsuffixtrie index (tag field)
2252-
assert client.ft().create_index((TagField("t", withsuffixtrie=True)))
2250+
assert client.ft().create_index(TagField("t", withsuffixtrie=True))
22532251
waitForIndex(client, getattr(client.ft(), "index_name", "idx"))
22542252
info = client.ft().info()
22552253
assert "WITHSUFFIXTRIE" in info["attributes"][0]["flags"]
@@ -2268,7 +2266,7 @@ def test_query_timeout(r: valkey.Valkey):
22682266

22692267
@pytest.mark.valkeymod
22702268
def test_geoshape(client: valkey.Valkey):
2271-
client.ft().create_index((GeoShapeField("geom", GeoShapeField.FLAT)))
2269+
client.ft().create_index(GeoShapeField("geom", GeoShapeField.FLAT))
22722270
waitForIndex(client, getattr(client.ft(), "index_name", "idx"))
22732271
client.hset("small", "geom", "POLYGON((1 1, 1 100, 100 100, 100 1, 1 1))")
22742272
client.hset("large", "geom", "POLYGON((1 1, 1 200, 200 200, 200 1, 1 1))")

‎valkey/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import sys
1+
from importlib import metadata
22

33
from valkey import asyncio # noqa
44
from valkey.backoff import default_backoff
@@ -36,11 +36,6 @@
3636
)
3737
from valkey.utils import from_url
3838

39-
if sys.version_info >= (3, 8):
40-
from importlib import metadata
41-
else:
42-
import importlib_metadata as metadata
43-
4439

4540
def int_or_str(value):
4641
try:

‎valkey/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ def clean_health_check_responses(self) -> None:
829829
else:
830830
raise PubSubError(
831831
"A non health check response was cleaned by "
832-
"execute_command: {0}".format(response)
832+
"execute_command: {}".format(response)
833833
)
834834
ttl -= 1
835835

‎valkey/cluster.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1848,8 +1848,7 @@ def _sharded_message_generator(self):
18481848

18491849
def _pubsubs_generator(self):
18501850
while True:
1851-
for pubsub in self.node_pubsub_mapping.values():
1852-
yield pubsub
1851+
yield from self.node_pubsub_mapping.values()
18531852

18541853
def get_sharded_message(
18551854
self, ignore_subscribe_messages=False, timeout=0.0, target_node=None

‎valkey/commands/bf/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from .info import BFInfo, CFInfo, CMSInfo, TDigestInfo, TopKInfo
66

77

8-
class AbstractBloom(object):
8+
class AbstractBloom:
99
"""
1010
The client allows to interact with RedisBloom and use all of
1111
it's functionality.

‎valkey/commands/bf/info.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from ..helpers import nativestr
22

33

4-
class BFInfo(object):
4+
class BFInfo:
55
capacity = None
66
size = None
77
filterNum = None
@@ -26,7 +26,7 @@ def __getitem__(self, item):
2626
return getattr(self, item)
2727

2828

29-
class CFInfo(object):
29+
class CFInfo:
3030
size = None
3131
bucketNum = None
3232
filterNum = None
@@ -57,7 +57,7 @@ def __getitem__(self, item):
5757
return getattr(self, item)
5858

5959

60-
class CMSInfo(object):
60+
class CMSInfo:
6161
width = None
6262
depth = None
6363
count = None
@@ -72,7 +72,7 @@ def __getitem__(self, item):
7272
return getattr(self, item)
7373

7474

75-
class TopKInfo(object):
75+
class TopKInfo:
7676
k = None
7777
width = None
7878
depth = None
@@ -89,7 +89,7 @@ def __getitem__(self, item):
8989
return getattr(self, item)
9090

9191

92-
class TDigestInfo(object):
92+
class TDigestInfo:
9393
compression = None
9494
capacity = None
9595
merged_nodes = None

‎valkey/commands/graph/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ async def call_procedure(self, procedure, *args, read_only=False, **kwagrs):
252252
return await self.query(q, read_only=read_only)
253253

254254
async def labels(self):
255-
return ((await self.call_procedure(DB_LABELS, read_only=True))).result_set
255+
return (await self.call_procedure(DB_LABELS, read_only=True)).result_set
256256

257257
async def property_keys(self):
258258
return (await self.call_procedure(DB_PROPERTYKEYS, read_only=True)).result_set

‎valkey/commands/json/commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ def set_file(
314314
315315
"""
316316

317-
with open(file_name, "r") as fp:
317+
with open(file_name) as fp:
318318
file_content = loads(fp.read())
319319

320320
return self.set(name, path, file_content, nx=nx, xx=xx, decode_keys=decode_keys)

‎valkey/utils.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import logging
2-
import sys
32
from contextlib import contextmanager
43
from functools import wraps
54
from typing import Any, Dict, Mapping, Union
@@ -28,10 +27,7 @@
2827
except ImportError:
2928
CRYPTOGRAPHY_AVAILABLE = False
3029

31-
if sys.version_info >= (3, 8):
32-
from importlib import metadata
33-
else:
34-
import importlib_metadata as metadata
30+
from importlib import metadata
3531

3632

3733
def from_url(url, **kwargs):

0 commit comments

Comments
 (0)