Fixed for mypy (including issue lark-parser#532)

chanicpanic · Mar 17, 2020 · 7538c93 · 7538c93
1 parent 7aad07d
commit 7538c93
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml
@@ -16,4 +16,4 @@ jobs:
           python -m pip install --upgrade pip
           pip install mypy
       - name: Lint with mypy
-        run: mypy -m lark-stubs || true
+        run: mypy -m lark_stubs || true
diff --git a/lark/tools/standalone.py b/lark/tools/standalone.py
@@ -28,7 +28,6 @@
 from io import open
 ###}
 
-import pprint
 import codecs
 import sys
 import os

diff --git a/lark-stubs/__init__.pyi → lark_stubs/__init__.pyi b/lark-stubs/__init__.pyi → lark_stubs/__init__.pyi
diff --git a/lark-stubs/exceptions.pyi → lark_stubs/exceptions.pyi b/lark-stubs/exceptions.pyi → lark_stubs/exceptions.pyi
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from typing import Dict, Iterable, Callable
+from typing import Dict, Iterable, Callable, Union
 from .tree import Tree
+from .lexer import Token
 
 
 class LarkError(Exception):
@@ -44,4 +45,5 @@ class UnexpectedCharacters(LexError, UnexpectedInput):
 
 
 class VisitError(LarkError):
-    pass
+    obj: Union[Tree, Token]
+    orig_exc: Exception
diff --git a/lark-stubs/indenter.pyi → lark_stubs/indenter.pyi b/lark-stubs/indenter.pyi → lark_stubs/indenter.pyi
diff --git a/lark-stubs/lark.pyi → lark_stubs/lark.pyi b/lark-stubs/lark.pyi → lark_stubs/lark.pyi
diff --git a/lark-stubs/lexer.pyi → lark_stubs/lexer.pyi b/lark-stubs/lexer.pyi → lark_stubs/lexer.pyi
diff --git a/lark-stubs/reconstruct.pyi → lark_stubs/reconstruct.pyi b/lark-stubs/reconstruct.pyi → lark_stubs/reconstruct.pyi
diff --git a/lark-stubs/tree.pyi → lark_stubs/tree.pyi b/lark-stubs/tree.pyi → lark_stubs/tree.pyi
diff --git a/lark-stubs/visitors.pyi → lark_stubs/visitors.pyi b/lark-stubs/visitors.pyi → lark_stubs/visitors.pyi
diff --git a/setup.py b/setup.py
@@ -6,12 +6,12 @@
 setup(
     name = "lark-parser",
     version = __version__,
-    packages = ['lark', 'lark.parsers', 'lark.tools', 'lark.grammars', 'lark-stubs'],
+    packages = ['lark', 'lark.parsers', 'lark.tools', 'lark.grammars', 'lark_stubs'],
 
     requires = [],
     install_requires = [],
 
-    package_data = {'': ['*.md', '*.lark'], 'lark-stubs': ['*.pyi']},
+    package_data = {'': ['*.md', '*.lark'], 'lark_stubs': ['*.pyi']},
 
     test_suite = 'tests.__main__',