Skip to content

Commit c56e94a

Browse files
fixed ruff issues
Signed-off-by: Maksim Korotkov <m.korotkov@postgrespro.ru>
1 parent abc4176 commit c56e94a

28 files changed

+497
-501
lines changed

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
assert testgres.__path__ is not None
2020
assert len(testgres.__path__) == 1
21-
assert type(testgres.__path__[0] == str) # noqa: E721
21+
assert type(testgres.__path__[0]) is str
2222
p = os.path.dirname(testgres.__path__[0])
23-
assert type(p) == str # noqa: E721
23+
assert type(p) is str
2424
sys.path.insert(0, os.path.abspath(p))
2525

2626
# -- Project information -----------------------------------------------------

src/backup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def spawn_primary(self, name=None, destroy=True):
160160
node = NodeClass(name=name, base_dir=base_dir, conn_params=self.original_node.os_ops.conn_params)
161161

162162
assert node is not None
163-
assert type(node) == self.original_node.__class__ # noqa: E721
163+
assert isinstance(node, self.original_node.__class__)
164164

165165
with clean_on_error(node) as node:
166166
# Set a new port

src/cache.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def cached_initdb(data_dir, logfile=None, params=None, os_ops: OsOperations = No
3434

3535
def make_utility_path(name):
3636
assert name is not None
37-
assert type(name) == str # noqa: E721
37+
assert type(name) is str
3838

3939
if bin_path:
4040
return os_ops.build_path(bin_path, name)

src/exceptions.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ def __init__(
1515
self,
1616
message: typing.Optional[str] = None,
1717
):
18-
assert message is None or type(message) == str # noqa: E721
18+
assert message is None or type(message) is str
1919
super().__init__(message)
2020
self._message = message
2121
return
2222

2323
@property
2424
def message(self) -> str:
25-
assert self._message is None or type(self._message) == str # noqa: E721
25+
assert self._message is None or type(self._message) is str
2626
if self._message is None:
2727
return ""
2828
return self._message
@@ -53,8 +53,8 @@ def __init__(
5353
message: typing.Optional[str] = None,
5454
query: typing.Optional[str] = None
5555
):
56-
assert message is None or type(message) == str # noqa: E721
57-
assert query is None or type(query) == str # noqa: E721
56+
assert message is None or type(message) is str
57+
assert query is None or type(query) is str
5858

5959
super().__init__(message)
6060

@@ -64,8 +64,8 @@ def __init__(
6464

6565
@property
6666
def message(self) -> str:
67-
assert self._description is None or type(self._description) == str # noqa: E721
68-
assert self._query is None or type(self._query) == str # noqa: E721
67+
assert self._description is None or type(self._description) is str
68+
assert self._query is None or type(self._query) is str
6969

7070
msg = []
7171

@@ -76,17 +76,17 @@ def message(self) -> str:
7676
msg.append(u'Query: {}'.format(self._query))
7777

7878
r = six.text_type('\n').join(msg)
79-
assert type(r) == str # noqa: E721
79+
assert type(r) is str
8080
return r
8181

8282
@property
8383
def description(self) -> typing.Optional[str]:
84-
assert self._description is None or type(self._description) == str # noqa: E721
84+
assert self._description is None or type(self._description) is str
8585
return self._description
8686

8787
@property
8888
def query(self) -> typing.Optional[str]:
89-
assert self._query is None or type(self._query) == str # noqa: E721
89+
assert self._query is None or type(self._query) is str
9090
return self._query
9191

9292
def __repr__(self) -> str:
@@ -114,8 +114,8 @@ def __init__(
114114
message: typing.Optional[str] = None,
115115
query: typing.Optional[str] = None
116116
):
117-
assert message is None or type(message) == str # noqa: E721
118-
assert query is None or type(query) == str # noqa: E721
117+
assert message is None or type(message) is str
118+
assert query is None or type(query) is str
119119

120120
super().__init__(message, query)
121121
return
@@ -133,14 +133,14 @@ def __init__(
133133
self,
134134
message: typing.Optional[str] = None,
135135
):
136-
assert message is None or type(message) == str # noqa: E721
136+
assert message is None or type(message) is str
137137
super().__init__(message)
138138
self._message = message
139139
return
140140

141141
@property
142142
def message(self) -> str:
143-
assert self._message is None or type(self._message) == str # noqa: E721
143+
assert self._message is None or type(self._message) is str
144144
if self._message is None:
145145
return ""
146146
return self._message
@@ -171,7 +171,7 @@ def __init__(
171171
message: typing.Optional[str] = None,
172172
files: typing.Optional[typing.Iterable] = None
173173
):
174-
assert message is None or type(message) == str # noqa: E721
174+
assert message is None or type(message) is str
175175
assert files is None or isinstance(files, typing.Iterable)
176176

177177
super().__init__(message)
@@ -182,7 +182,7 @@ def __init__(
182182

183183
@property
184184
def message(self) -> str:
185-
assert self._description is None or type(self._description) == str # noqa: E721
185+
assert self._description is None or type(self._description) is str
186186
assert self._files is None or isinstance(self._files, typing.Iterable)
187187

188188
msg = []
@@ -191,15 +191,15 @@ def message(self) -> str:
191191
msg.append(self._description)
192192

193193
for f, lines in self._files or []:
194-
assert type(f) == str # noqa: E721
194+
assert type(f) is str
195195
assert type(lines) in [str, bytes] # noqa: E721
196196
msg.append(u'{}\n----\n{}\n'.format(f, lines))
197197

198198
return six.text_type('\n').join(msg)
199199

200200
@property
201201
def description(self) -> typing.Optional[str]:
202-
assert self._description is None or type(self._description) == str # noqa: E721
202+
assert self._description is None or type(self._description) is str
203203
return self._description
204204

205205
@property
@@ -233,14 +233,14 @@ def __init__(
233233
self,
234234
message: typing.Optional[str] = None,
235235
):
236-
assert message is None or type(message) == str # noqa: E721
236+
assert message is None or type(message) is str
237237
super().__init__(message)
238238
self._message = message
239239
return
240240

241241
@property
242242
def message(self) -> str:
243-
assert self._message is None or type(self._message) == str # noqa: E721
243+
assert self._message is None or type(self._message) is str
244244
if self._message is None:
245245
return ""
246246
return self._message
@@ -268,14 +268,14 @@ def __init__(
268268
self,
269269
message: typing.Optional[str] = None,
270270
):
271-
assert message is None or type(message) == str # noqa: E721
271+
assert message is None or type(message) is str
272272
super().__init__(message)
273273
self._message = message
274274
return
275275

276276
@property
277277
def message(self) -> str:
278-
assert self._message is None or type(self._message) == str # noqa: E721
278+
assert self._message is None or type(self._message) is str
279279
if self._message is None:
280280
return ""
281281
return self._message

src/impl/internal_utils.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33

44
def send_log(level: int, msg: str) -> None:
5-
assert type(level) == int # noqa: E721
6-
assert type(msg) == str # noqa: E721
5+
assert type(level) is int
6+
assert type(msg) is str
77

88
return logging.log(level, "[testgres] " + msg)
99

1010

1111
def send_log_info(msg: str) -> None:
12-
assert type(msg) == str # noqa: E721
12+
assert type(msg) is str
1313

1414
return send_log(logging.INFO, msg)
1515

1616

1717
def send_log_debug(msg: str) -> None:
18-
assert type(msg) == str # noqa: E721
18+
assert type(msg) is str
1919

2020
return send_log(logging.DEBUG, msg)

src/impl/platforms/internal_platform_utils.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ def __init__(
2323
code: InternalPlatformUtils.FindPostmasterResultCode,
2424
pid: typing.Optional[int]
2525
):
26-
assert type(code) == InternalPlatformUtils.FindPostmasterResultCode # noqa: E721
27-
assert pid is None or type(pid) == int # noqa: E721
26+
assert type(code) is InternalPlatformUtils.FindPostmasterResultCode
27+
assert pid is None or type(pid) is int
2828
self.code = code
2929
self.pid = pid
3030
return
3131

3232
@staticmethod
3333
def create_ok(pid: int) -> InternalPlatformUtils.FindPostmasterResult:
34-
assert type(pid) == int # noqa: E721
34+
assert type(pid) is int
3535
return __class__(InternalPlatformUtils.FindPostmasterResultCode.ok, pid)
3636

3737
@staticmethod
@@ -57,6 +57,6 @@ def FindPostmaster(
5757
data_dir: str
5858
) -> FindPostmasterResult:
5959
assert isinstance(os_ops, OsOperations)
60-
assert type(bin_dir) == str # noqa: E721
61-
assert type(data_dir) == str # noqa: E721
60+
assert type(bin_dir) is str
61+
assert type(data_dir) is str
6262
raise NotImplementedError("InternalPlatformUtils::FindPostmaster is not implemented.")

src/impl/platforms/internal_platform_utils_factory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def create_internal_platform_utils(
99
assert isinstance(os_ops, OsOperations)
1010

1111
platform_name = os_ops.get_platform()
12-
assert type(platform_name) == str # noqa: E721
12+
assert type(platform_name) is str
1313

1414
if platform_name == "linux":
1515
from .linux import internal_platform_utils as x

src/impl/platforms/linux/internal_platform_utils.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ def FindPostmaster(
2626
data_dir: str
2727
) -> InternalPlatformUtils.FindPostmasterResult:
2828
assert isinstance(os_ops, OsOperations)
29-
assert type(bin_dir) == str # noqa: E721
30-
assert type(data_dir) == str # noqa: E721
31-
assert type(__class__.C_BASH_EXE) == str # noqa: E721
32-
assert type(__class__.sm_exec_env) == dict # noqa: E721
29+
assert type(bin_dir) is str
30+
assert type(data_dir) is str
31+
assert type(__class__.C_BASH_EXE) is str
32+
assert type(__class__.sm_exec_env) is dict
3333
assert len(__class__.C_BASH_EXE) > 0
3434
assert len(bin_dir) > 0
3535
assert len(data_dir) > 0
3636

3737
pg_path_e = re.escape(os_ops.build_path(bin_dir, "postgres"))
3838
data_dir_e = re.escape(data_dir)
3939

40-
assert type(pg_path_e) == str # noqa: E721
41-
assert type(data_dir_e) == str # noqa: E721
40+
assert type(pg_path_e) is str
41+
assert type(data_dir_e) is str
4242

4343
regexp = r"^\s*[0-9]+\s+" + pg_path_e + r"(\s+.*)?\s+\-[D]\s+" + data_dir_e + r"(\s+.*)?"
4444

@@ -55,14 +55,14 @@ def FindPostmaster(
5555
exec_env=__class__.sm_exec_env,
5656
)
5757

58-
assert type(output_b) == bytes # noqa: E721
59-
assert type(error_b) == bytes # noqa: E721
58+
assert type(output_b) is bytes
59+
assert type(error_b) is bytes
6060

6161
output = output_b.decode("utf-8")
6262
error = error_b.decode("utf-8")
6363

64-
assert type(output) == str # noqa: E721
65-
assert type(error) == str # noqa: E721
64+
assert type(output) is str
65+
assert type(error) is str
6666

6767
if exit_status == 1:
6868
return __class__.FindPostmasterResult.create_not_found()
@@ -78,7 +78,7 @@ def FindPostmaster(
7878
)
7979

8080
lines = output.splitlines()
81-
assert type(lines) == list # noqa: E721
81+
assert type(lines) is list
8282

8383
if len(lines) == 0:
8484
return __class__.FindPostmasterResult.create_not_found()
@@ -88,15 +88,15 @@ def FindPostmaster(
8888
msgs.append("Many processes like a postmaster are found: {}.".format(len(lines)))
8989

9090
for i in range(len(lines)):
91-
assert type(lines[i]) == str # noqa: E721
91+
assert type(lines[i]) is str
9292
lines.append("[{}] '{}'".format(i, lines[i]))
9393
continue
9494

9595
internal_utils.send_log_debug("\n".join(lines))
9696
return __class__.FindPostmasterResult.create_many_processes()
9797

9898
def is_space_or_tab(ch) -> bool:
99-
assert type(ch) == str # noqa: E721
99+
assert type(ch) is str
100100
return ch == " " or ch == "\t"
101101

102102
line = lines[0]
@@ -115,6 +115,6 @@ def is_space_or_tab(ch) -> bool:
115115
return __class__.FindPostmasterResult.create_has_problems()
116116

117117
pid = int(line[start:pos])
118-
assert type(pid) == int # noqa: E721
118+
assert type(pid) is int
119119

120120
return __class__.FindPostmasterResult.create_ok(pid)

src/impl/platforms/win32/internal_platform_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ def FindPostmaster(
1212
data_dir: str
1313
) -> InternalPlatformUtils.FindPostmasterResult:
1414
assert isinstance(os_ops, OsOperations)
15-
assert type(bin_dir) == str # noqa: E721
16-
assert type(data_dir) == str # noqa: E721
15+
assert type(bin_dir) is str
16+
assert type(data_dir) is str
1717
return __class__.FindPostmasterResult.create_not_implemented()

0 commit comments

Comments
 (0)