aboutsummaryrefslogtreecommitdiff
path: root/tools/dircondenser.py
diff options
context:
space:
mode:
authorMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-11-06 17:21:25 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2019-11-07 22:18:21 +0200
commit6e708208ddc870fefde92b22c031575c33bb243b (patch)
tree0eeac1c226d66cb8ce0315362cdcb5ae682d03f8 /tools/dircondenser.py
parentd08091756191981f1bd3c7741b412b95f965fe0a (diff)
downloadmeson-6e708208ddc870fefde92b22c031575c33bb243b.zip
meson-6e708208ddc870fefde92b22c031575c33bb243b.tar.gz
meson-6e708208ddc870fefde92b22c031575c33bb243b.tar.bz2
CI: add initial type annotation checking
Diffstat (limited to 'tools/dircondenser.py')
-rwxr-xr-xtools/dircondenser.py21
1 files changed, 12 insertions, 9 deletions
diff --git a/tools/dircondenser.py b/tools/dircondenser.py
index 58c44a2..a3cdfdc 100755
--- a/tools/dircondenser.py
+++ b/tools/dircondenser.py
@@ -32,25 +32,28 @@ to this:
This directory must be run from source root as it touches run_unittests.py.
'''
-import os, sys, subprocess
+import typing
+import os
+import sys
+import subprocess
from glob import glob
-def get_entries():
+def get_entries() -> typing.List[typing.Tuple[int, str]]:
entries = []
for e in glob('*'):
if not os.path.isdir(e):
- sys.exit('Current directory must not contain any files.')
+ raise SystemExit('Current directory must not contain any files.')
(number, rest) = e.split(' ', 1)
try:
- number = int(number)
+ numstr = int(number)
except ValueError:
- sys.exit('Dir name %d does not start with a number.' % e)
- entries.append((number, rest))
+ raise SystemExit('Dir name {} does not start with a number.'.format(e))
+ entries.append((numstr, rest))
entries.sort()
return entries
-def replace_source(sourcefile, replacements):
+def replace_source(sourcefile: str, replacements: typing.List[typing.Tuple[str, str]]):
with open(sourcefile, 'r') as f:
contents = f.read()
for old_name, new_name in replacements:
@@ -58,7 +61,7 @@ def replace_source(sourcefile, replacements):
with open(sourcefile, 'w') as f:
f.write(contents)
-def condense(dirname):
+def condense(dirname: str):
curdir = os.getcwd()
os.chdir(dirname)
entries = get_entries()
@@ -77,6 +80,6 @@ def condense(dirname):
if __name__ == '__main__':
if len(sys.argv) != 1:
- sys.exit('This script takes no arguments.')
+ raise SystemExit('This script takes no arguments.')
for d in glob('test cases/*'):
condense(d)