From 47373a2438c0fdeedd229b921c9d7e8dc1fc956a Mon Sep 17 00:00:00 2001
From: Daniel Mensinger <daniel@mensinger-ka.de>
Date: Tue, 1 Sep 2020 19:36:21 +0200
Subject: typing: get rid of most T.cast

---
 mesonbuild/scripts/regen_checker.py | 14 ++++++++------
 mesonbuild/scripts/tags.py          |  4 +++-
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'mesonbuild/scripts')

diff --git a/mesonbuild/scripts/regen_checker.py b/mesonbuild/scripts/regen_checker.py
index 84f7d77..fa98f59 100644
--- a/mesonbuild/scripts/regen_checker.py
+++ b/mesonbuild/scripts/regen_checker.py
@@ -15,13 +15,12 @@
 import sys, os
 import pickle, subprocess
 import typing as T
-
-if T.TYPE_CHECKING:
-    from ..backend.vs2010backend import RegenInfo
+from ..coredata import CoreData
+from ..backend.vs2010backend import RegenInfo
 
 # This could also be used for XCode.
 
-def need_regen(regeninfo: 'RegenInfo', regen_timestamp: float) -> bool:
+def need_regen(regeninfo: RegenInfo, regen_timestamp: float) -> bool:
     for i in regeninfo.depfiles:
         curfile = os.path.join(regeninfo.build_dir, i)
         curtime = os.stat(curfile).st_mtime
@@ -35,7 +34,7 @@ def need_regen(regeninfo: 'RegenInfo', regen_timestamp: float) -> bool:
     Vs2010Backend.touch_regen_timestamp(regeninfo.build_dir)
     return False
 
-def regen(regeninfo: 'RegenInfo', meson_command: T.List[str], backend: str) -> None:
+def regen(regeninfo: RegenInfo, meson_command: T.List[str], backend: str) -> None:
     cmd = meson_command + ['--internal',
                            'regenerate',
                            regeninfo.build_dir,
@@ -48,10 +47,13 @@ def run(args: T.List[str]) -> int:
     dumpfile = os.path.join(private_dir, 'regeninfo.dump')
     coredata_file = os.path.join(private_dir, 'coredata.dat')
     with open(dumpfile, 'rb') as f:
-        regeninfo = T.cast('RegenInfo', pickle.load(f))
+        regeninfo = pickle.load(f)
+        assert isinstance(regeninfo, RegenInfo)
     with open(coredata_file, 'rb') as f:
         coredata = pickle.load(f)
+        assert isinstance(coredata, CoreData)
     backend = coredata.get_builtin_option('backend')
+    assert isinstance(backend, str)
     regen_timestamp = os.stat(dumpfile).st_mtime
     if need_regen(regeninfo, regen_timestamp):
         regen(regeninfo, coredata.meson_command, backend)
diff --git a/mesonbuild/scripts/tags.py b/mesonbuild/scripts/tags.py
index bb85831..9098efb 100644
--- a/mesonbuild/scripts/tags.py
+++ b/mesonbuild/scripts/tags.py
@@ -48,4 +48,6 @@ def run(args: T.List[str]) -> int:
     srcdir_name = args[1]
     os.chdir(srcdir_name)
     assert tool_name in ['cscope', 'ctags', 'etags']
-    return T.cast(int, globals()[tool_name]())
+    res = globals()[tool_name]()
+    assert isinstance(res, int)
+    return res
-- 
cgit v1.1