From ff686fc89a6b14b1239832281ade320523e723a3 Mon Sep 17 00:00:00 2001 From: Erez Sh Date: Mon, 28 Jun 2021 14:35:21 +0300 Subject: [PATCH] Remove more Python 2 code --- lark/lark.py | 3 --- lark/load_grammar.py | 1 - lark/tools/standalone.py | 9 ++------- lark/utils.py | 1 - 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/lark/lark.py b/lark/lark.py index f7eb85e..a4d223e 100644 --- a/lark/lark.py +++ b/lark/lark.py @@ -1,8 +1,5 @@ -from __future__ import absolute_import - from abc import ABC, abstractmethod import sys, os, pickle, hashlib -from io import open import tempfile from .exceptions import ConfigurationError, assert_config diff --git a/lark/load_grammar.py b/lark/load_grammar.py index e437267..cb8856b 100644 --- a/lark/load_grammar.py +++ b/lark/load_grammar.py @@ -4,7 +4,6 @@ import os.path import sys from collections import namedtuple from copy import copy, deepcopy -from io import open import pkgutil from ast import literal_eval from numbers import Integral diff --git a/lark/tools/standalone.py b/lark/tools/standalone.py index 170800b..1cc8f81 100644 --- a/lark/tools/standalone.py +++ b/lark/tools/standalone.py @@ -1,5 +1,3 @@ -from __future__ import print_function - ###{standalone # # @@ -26,7 +24,6 @@ from __future__ import print_function # # -from io import open from abc import ABC, abstractmethod ###} @@ -36,14 +33,13 @@ import os from os import path from collections import defaultdict from functools import partial -from argparse import ArgumentParser, SUPPRESS +from argparse import ArgumentParser import lark -from lark import Lark from lark.tools import lalr_argparser, build_lalr, make_warnings_comments -from lark.grammar import RuleOptions, Rule +from lark.grammar import Rule from lark.lexer import TerminalDef _dir = path.dirname(__file__) @@ -174,7 +170,6 @@ def main(): make_warnings_comments() parser = ArgumentParser(prog="prog='python -m lark.tools.standalone'", description="Lark Stand-alone Generator Tool", parents=[lalr_argparser], epilog='Look at the Lark documentation for more info on the options') - parser.add_argument("old_start", nargs='?', help=SUPPRESS) parser.add_argument('-c', '--compress', action='store_true', default=0, help="Enable compression") if len(sys.argv)==1: parser.print_help(sys.stderr) diff --git a/lark/utils.py b/lark/utils.py index 06291ac..47fe5ca 100644 --- a/lark/utils.py +++ b/lark/utils.py @@ -6,7 +6,6 @@ from collections import deque ###{standalone import sys, re import logging -from io import open logger = logging.getLogger("lark") logger.addHandler(logging.StreamHandler()) # Set to highest level, since we have some warnings amongst the code