From 7538c9308009f9b33f4ea203f58f12013b90b253 Mon Sep 17 00:00:00 2001 From: Erez Sh Date: Tue, 17 Mar 2020 11:35:50 +0200 Subject: [PATCH] Fixed for mypy (including issue #532) --- .github/workflows/mypy.yml | 2 +- lark/tools/standalone.py | 1 - {lark-stubs => lark_stubs}/__init__.pyi | 0 {lark-stubs => lark_stubs}/exceptions.pyi | 6 ++++-- {lark-stubs => lark_stubs}/indenter.pyi | 0 {lark-stubs => lark_stubs}/lark.pyi | 0 {lark-stubs => lark_stubs}/lexer.pyi | 0 {lark-stubs => lark_stubs}/reconstruct.pyi | 0 {lark-stubs => lark_stubs}/tree.pyi | 0 {lark-stubs => lark_stubs}/visitors.pyi | 0 setup.py | 4 ++-- 11 files changed, 7 insertions(+), 6 deletions(-) rename {lark-stubs => lark_stubs}/__init__.pyi (100%) rename {lark-stubs => lark_stubs}/exceptions.pyi (83%) rename {lark-stubs => lark_stubs}/indenter.pyi (100%) rename {lark-stubs => lark_stubs}/lark.pyi (100%) rename {lark-stubs => lark_stubs}/lexer.pyi (100%) rename {lark-stubs => lark_stubs}/reconstruct.pyi (100%) rename {lark-stubs => lark_stubs}/tree.pyi (100%) rename {lark-stubs => lark_stubs}/visitors.pyi (100%) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index f1deb42..814ae45 100644 --- 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 index c597e9f..f345a1d 100644 --- a/lark/tools/standalone.py +++ b/lark/tools/standalone.py @@ -28,7 +28,6 @@ import os from io import open ###} -import pprint import codecs import sys import os diff --git a/lark-stubs/__init__.pyi b/lark_stubs/__init__.pyi similarity index 100% rename from lark-stubs/__init__.pyi rename to lark_stubs/__init__.pyi diff --git a/lark-stubs/exceptions.pyi b/lark_stubs/exceptions.pyi similarity index 83% rename from lark-stubs/exceptions.pyi rename to lark_stubs/exceptions.pyi index 9bdb85d..f09bfbd 100644 --- a/lark-stubs/exceptions.pyi +++ b/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 b/lark_stubs/indenter.pyi similarity index 100% rename from lark-stubs/indenter.pyi rename to lark_stubs/indenter.pyi diff --git a/lark-stubs/lark.pyi b/lark_stubs/lark.pyi similarity index 100% rename from lark-stubs/lark.pyi rename to lark_stubs/lark.pyi diff --git a/lark-stubs/lexer.pyi b/lark_stubs/lexer.pyi similarity index 100% rename from lark-stubs/lexer.pyi rename to lark_stubs/lexer.pyi diff --git a/lark-stubs/reconstruct.pyi b/lark_stubs/reconstruct.pyi similarity index 100% rename from lark-stubs/reconstruct.pyi rename to lark_stubs/reconstruct.pyi diff --git a/lark-stubs/tree.pyi b/lark_stubs/tree.pyi similarity index 100% rename from lark-stubs/tree.pyi rename to lark_stubs/tree.pyi diff --git a/lark-stubs/visitors.pyi b/lark_stubs/visitors.pyi similarity index 100% rename from lark-stubs/visitors.pyi rename to lark_stubs/visitors.pyi diff --git a/setup.py b/setup.py index b7cc052..2a15ab1 100644 --- a/setup.py +++ b/setup.py @@ -6,12 +6,12 @@ __version__ ,= re.findall('__version__ = "(.*)"', open('lark/__init__.py').read( 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__',