Skip to content

Commit 449f56c

Browse files
committed
pylint: Enable and fix consider-using-sys-exit warnings
1 parent b65e093 commit 449f56c

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

scripts/error_codes.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def main(argv):
277277

278278
if [check, fix, examine_coverage, next_id].count(True) != 1:
279279
print("usage: python error_codes.py --check | --fix [--no-confirm] | --examine-coverage | --next")
280-
exit(1)
280+
sys.exit(1)
281281

282282
cwd = os.getcwd()
283283

@@ -303,9 +303,9 @@ def main(argv):
303303
if examine_coverage:
304304
if not ok:
305305
print("Incorrect IDs have to be fixed before applying --examine-coverage")
306-
exit(1)
306+
sys.exit(1)
307307
res = 0 if examine_id_coverage(cwd, source_id_to_file_names) else 1
308-
exit(res)
308+
sys.exit(res)
309309

310310
ok &= examine_id_coverage(cwd, source_id_to_file_names, new_ids_only=True)
311311

@@ -314,18 +314,18 @@ def main(argv):
314314
if next_id:
315315
if not ok:
316316
print("Incorrect IDs have to be fixed before applying --next")
317-
exit(1)
317+
sys.exit(1)
318318
available_ids = {str(id) for id in range(1000, 10000)} - source_id_to_file_names.keys()
319319
next_id = get_next_id(available_ids)
320320
print(f"Next ID: {next_id}")
321-
exit(0)
321+
sys.exit(0)
322322

323323
if ok:
324324
print("No incorrect IDs found")
325-
exit(0)
325+
sys.exit(0)
326326

327327
if check:
328-
exit(1)
328+
sys.exit(1)
329329

330330
assert fix, "Unexpected state, should not come here without --fix"
331331

@@ -338,14 +338,14 @@ def main(argv):
338338
while len(answer) == 0 or answer not in "YNyn":
339339
answer = input("[Y/N]? ")
340340
if answer not in "yY":
341-
exit(1)
341+
sys.exit(1)
342342

343343
# number of appearances for every id
344344
source_id_to_count = { id: len(file_names) for id, file_names in source_id_to_file_names.items() }
345345

346346
fix_ids_in_source_files(source_file_names, source_id_to_count)
347347
print("Fixing completed")
348-
exit(2)
348+
sys.exit(2)
349349

350350

351351
if __name__ == "__main__":

scripts/pylint_all.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
from argparse import ArgumentParser
88
from os import path, walk
9-
from sys import exit
109
from textwrap import dedent
1110
import subprocess
11+
import sys
1212

1313
PROJECT_ROOT = path.dirname(path.dirname(path.realpath(__file__)))
1414
PYLINT_RCFILE = f"{PROJECT_ROOT}/scripts/pylintrc"
@@ -89,7 +89,7 @@ def main():
8989
success = pylint_all_filenames(options.dev_mode, rootdirs)
9090

9191
if not success:
92-
exit(1)
92+
sys.exit(1)
9393
else:
9494
print("No problems found.")
9595

@@ -98,4 +98,4 @@ def main():
9898
try:
9999
main()
100100
except KeyboardInterrupt:
101-
exit("Interrupted by user. Exiting.")
101+
sys.exit("Interrupted by user. Exiting.")

scripts/pylintrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ disable=
2020
bad-continuation,
2121
bad-indentation,
2222
bad-whitespace,
23-
consider-using-sys-exit,
2423
duplicate-code,
2524
invalid-name,
2625
missing-docstring,

test/lsp.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import json
66
import os
77
import subprocess
8+
import sys
89
import traceback
910

1011
from typing import Any, List, Optional, Tuple, Union
@@ -871,4 +872,4 @@ def test_textDocument_didChange_multi_line(self, solc: JsonRpcProcess) -> None:
871872
if __name__ == "__main__":
872873
suite = SolidityLSPTestSuite()
873874
exit_code = suite.main()
874-
exit(exit_code)
875+
sys.exit(exit_code)

0 commit comments

Comments
 (0)