Fix for mypy check

build.py, main.pyの修正はこれで本当によいかは後で考える。

Author: kjnh10

onlinejudge_bundle/main.py

@@ -27,7 +27,7 @@ def main(args: Optional[List[str]] = None) -> None:
 
     language = onlinejudge_verify.languages.list.get(parsed.path)
     assert language is not None
-    sys.stdout.buffer.write(language.bundle(parsed.path, options={'include_paths': parsed.iquote}))
+    sys.stdout.buffer.write(language.bundle(parsed.path, basedir=parsed.iquote[0], options={'include_paths': parsed.iquote}))
 
 
 if __name__ == "__main__":

onlinejudge_verify/documentation/build.py

@@ -68,7 +68,7 @@ def _render_source_code_stat(stat: SourceCodeStat, *, basedir: pathlib.Path) ->
     try:
         language = onlinejudge_verify.languages.list.get(stat.path)
         assert language is not None
-        bundled_code = language.bundle(stat.path, basedir=basedir).decode()
+        bundled_code = language.bundle(stat.path, basedir=basedir, options={'include_paths': [basedir]}).decode()
     except Exception:
         logger.warning("failed to bundle: %s", str(stat.path))
         bundled_code = traceback.format_exc()

onlinejudge_verify/languages/csharpscript.py

@@ -109,7 +109,7 @@ def list_attributes(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Dict[
     def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> List[pathlib.Path]:
         return list(_get_csx_dependencies(path.resolve()))
 
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path, options: Dict[str, Any]) -> bytes:
         raise NotImplementedError
 
     def list_environments(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Sequence[CSharpScriptLanguageEnvironment]:

onlinejudge_verify/languages/nim.py

@@ -82,7 +82,7 @@ def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Lis
                 stk.append(child)
         return list(set(dependencies))
 
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path, options: Dict[str, Any]) -> bytes:
         raise NotImplementedError
 
     def is_verification_file(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bool:

onlinejudge_verify/languages/python.py

@@ -4,7 +4,7 @@
 import sys
 import textwrap
 from logging import getLogger
-from typing import List, Sequence, Tuple
+from typing import List, Sequence, Tuple, Dict, Any
 
 import importlab.environment
 import importlab.fs
@@ -78,7 +78,7 @@ class PythonLanguage(Language):
     def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> List[pathlib.Path]:
         return _python_list_depending_files(path.resolve(), basedir)
 
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path, options: Dict[str, Any]) -> bytes:
         """
         :throws NotImplementedError:
         """

onlinejudge_verify/languages/user_defined.py

@@ -63,7 +63,7 @@ def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Lis
             dependencies.append(pathlib.Path(line.decode()))
         return dependencies
 
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path, options: Dict[str, Any] = None) -> bytes:
         assert 'bundle' in self.config
         command = self.config['bundle'].format(path=str(path), basedir=str(basedir))
         logger.info('$ %s', command)