2020-11-17 02:39:23 +01:00
|
|
|
from typing import Callable, List, Optional
|
2016-08-02 00:14:01 +02:00
|
|
|
|
2020-06-11 00:54:34 +02:00
|
|
|
|
2020-04-18 11:48:00 +02:00
|
|
|
class FormattedException(Exception):
|
|
|
|
pass
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2016-08-31 00:43:08 +02:00
|
|
|
class TemplateParserException(Exception):
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def __init__(self, message: str) -> None:
|
2017-02-21 13:53:52 +01:00
|
|
|
self.message = message
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def __str__(self) -> str:
|
2017-02-21 13:53:52 +01:00
|
|
|
return self.message
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2017-02-21 13:53:52 +01:00
|
|
|
class TokenizationException(Exception):
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def __init__(self, message: str, line_content: Optional[str] = None) -> None:
|
2017-02-21 13:53:52 +01:00
|
|
|
self.message = message
|
|
|
|
self.line_content = line_content
|
2016-08-31 00:43:08 +02:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2017-11-05 11:57:15 +01:00
|
|
|
class TokenizerState:
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def __init__(self) -> None:
|
2016-08-02 00:14:01 +02:00
|
|
|
self.i = 0
|
|
|
|
self.line = 1
|
|
|
|
self.col = 1
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2017-11-05 11:57:15 +01:00
|
|
|
class Token:
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def __init__(self, kind: str, s: str, tag: str, line: int, col: int, line_span: int) -> None:
|
2016-08-02 00:14:01 +02:00
|
|
|
self.kind = kind
|
|
|
|
self.s = s
|
|
|
|
self.tag = tag
|
|
|
|
self.line = line
|
|
|
|
self.col = col
|
2017-02-16 20:25:53 +01:00
|
|
|
self.line_span = line_span
|
2016-08-02 00:14:01 +02:00
|
|
|
|
2021-12-02 02:57:04 +01:00
|
|
|
# These get set during the validation pass.
|
|
|
|
self.start_token: Optional[Token] = None
|
|
|
|
self.end_token: Optional[Token] = None
|
|
|
|
|
2021-12-02 17:10:42 +01:00
|
|
|
# These get set during the pretty-print phase.
|
|
|
|
self.new_s = ""
|
|
|
|
self.indent: Optional[str] = None
|
|
|
|
self.orig_indent: Optional[str] = None
|
|
|
|
self.child_indent: Optional[str] = None
|
|
|
|
self.indent_is_final = False
|
|
|
|
self.parent_token: Optional[Token] = None
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def tokenize(text: str) -> List[Token]:
|
2021-12-03 15:38:06 +01:00
|
|
|
in_code_block = False
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def advance(n: int) -> None:
|
2016-08-02 00:14:01 +02:00
|
|
|
for _ in range(n):
|
|
|
|
state.i += 1
|
2021-02-12 08:20:45 +01:00
|
|
|
if state.i >= 0 and text[state.i - 1] == "\n":
|
2016-08-02 00:14:01 +02:00
|
|
|
state.line += 1
|
|
|
|
state.col = 1
|
|
|
|
else:
|
|
|
|
state.col += 1
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at(s: str) -> bool:
|
2021-02-12 08:19:30 +01:00
|
|
|
return text[state.i : state.i + len(s)] == s
|
2016-08-02 00:14:01 +02:00
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at_htmlcomment() -> bool:
|
2017-02-03 04:26:35 +01:00
|
|
|
return looking_at("<!--")
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at_handlebarcomment() -> bool:
|
2017-02-23 18:12:52 +01:00
|
|
|
return looking_at("{{!")
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at_djangocomment() -> bool:
|
2017-02-23 18:12:52 +01:00
|
|
|
return looking_at("{#")
|
|
|
|
|
2018-04-03 10:09:00 +02:00
|
|
|
def looking_at_handlebarpartial() -> bool:
|
2019-07-11 04:05:28 +02:00
|
|
|
return looking_at("{{>")
|
2018-04-03 10:09:00 +02:00
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at_html_start() -> bool:
|
2016-08-02 00:14:01 +02:00
|
|
|
return looking_at("<") and not looking_at("</")
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at_html_end() -> bool:
|
2016-08-02 00:14:01 +02:00
|
|
|
return looking_at("</")
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at_handlebars_start() -> bool:
|
2021-12-01 18:03:31 +01:00
|
|
|
return looking_at("{{#") or looking_at("{{^") or looking_at("{{~#")
|
2016-08-02 00:14:01 +02:00
|
|
|
|
2021-11-20 13:25:41 +01:00
|
|
|
def looking_at_handlebars_else() -> bool:
|
|
|
|
return looking_at("{{else")
|
|
|
|
|
2021-12-01 18:03:31 +01:00
|
|
|
def looking_at_template_var() -> bool:
|
|
|
|
return looking_at("{")
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at_handlebars_end() -> bool:
|
2021-12-01 18:03:31 +01:00
|
|
|
return looking_at("{{/") or looking_at("{{~/")
|
2016-08-02 00:14:01 +02:00
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at_django_start() -> bool:
|
2021-11-20 13:25:41 +01:00
|
|
|
return looking_at("{% ")
|
|
|
|
|
|
|
|
def looking_at_django_else() -> bool:
|
|
|
|
return looking_at("{% else") or looking_at("{% elif")
|
2016-08-02 00:14:01 +02:00
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at_django_end() -> bool:
|
2016-08-02 00:14:01 +02:00
|
|
|
return looking_at("{% end")
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at_jinja2_end_whitespace_stripped() -> bool:
|
2019-04-16 12:54:01 +02:00
|
|
|
return looking_at("{%- end")
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def looking_at_jinja2_start_whitespace_stripped_type2() -> bool:
|
2019-04-16 12:54:01 +02:00
|
|
|
# This function detects tag like {%- if foo -%}...{% endif %}
|
|
|
|
return looking_at("{%-") and not looking_at("{%- end")
|
|
|
|
|
2021-12-01 18:03:31 +01:00
|
|
|
def looking_at_whitespace() -> bool:
|
|
|
|
return looking_at("\n") or looking_at(" ")
|
|
|
|
|
2016-08-02 00:14:01 +02:00
|
|
|
state = TokenizerState()
|
2021-12-01 18:03:31 +01:00
|
|
|
tokens: List[Token] = []
|
2016-08-02 00:14:01 +02:00
|
|
|
|
|
|
|
while state.i < len(text):
|
2017-02-21 13:53:52 +01:00
|
|
|
try:
|
2021-12-03 15:38:06 +01:00
|
|
|
if in_code_block:
|
|
|
|
in_code_block = False
|
|
|
|
s = get_code(text, state.i)
|
|
|
|
if s == "":
|
|
|
|
continue
|
|
|
|
tag = ""
|
|
|
|
kind = "code"
|
|
|
|
elif looking_at_htmlcomment():
|
2017-02-21 13:53:52 +01:00
|
|
|
s = get_html_comment(text, state.i)
|
|
|
|
tag = s[4:-3]
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "html_comment"
|
2017-02-23 18:12:52 +01:00
|
|
|
elif looking_at_handlebarcomment():
|
|
|
|
s = get_handlebar_comment(text, state.i)
|
|
|
|
tag = s[3:-2]
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "handlebar_comment"
|
2017-02-23 18:12:52 +01:00
|
|
|
elif looking_at_djangocomment():
|
|
|
|
s = get_django_comment(text, state.i)
|
|
|
|
tag = s[2:-2]
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "django_comment"
|
2018-04-03 10:09:00 +02:00
|
|
|
elif looking_at_handlebarpartial():
|
|
|
|
s = get_handlebar_partial(text, state.i)
|
|
|
|
tag = s[9:-2]
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "handlebars_singleton"
|
2017-02-21 13:53:52 +01:00
|
|
|
elif looking_at_html_start():
|
|
|
|
s = get_html_tag(text, state.i)
|
2021-02-12 08:20:45 +01:00
|
|
|
if s.endswith("/>"):
|
2020-04-19 13:08:35 +02:00
|
|
|
end_offset = -2
|
|
|
|
else:
|
|
|
|
end_offset = -1
|
|
|
|
tag_parts = s[1:end_offset].split()
|
2017-02-21 13:53:52 +01:00
|
|
|
|
|
|
|
if not tag_parts:
|
|
|
|
raise TemplateParserException("Tag name missing")
|
|
|
|
|
|
|
|
tag = tag_parts[0]
|
|
|
|
|
2021-04-21 00:46:14 +02:00
|
|
|
if tag == "!DOCTYPE":
|
|
|
|
kind = "html_doctype"
|
|
|
|
elif s.endswith("/>"):
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "html_singleton"
|
2017-02-21 13:53:52 +01:00
|
|
|
else:
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "html_start"
|
2021-12-03 15:38:06 +01:00
|
|
|
if tag in ("code", "pre", "script"):
|
|
|
|
in_code_block = True
|
2017-02-21 13:53:52 +01:00
|
|
|
elif looking_at_html_end():
|
|
|
|
s = get_html_tag(text, state.i)
|
|
|
|
tag = s[2:-1]
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "html_end"
|
2021-11-20 13:25:41 +01:00
|
|
|
elif looking_at_handlebars_else():
|
|
|
|
s = get_handlebars_tag(text, state.i)
|
|
|
|
tag = "else"
|
|
|
|
kind = "handlebars_else"
|
2017-02-21 13:53:52 +01:00
|
|
|
elif looking_at_handlebars_start():
|
|
|
|
s = get_handlebars_tag(text, state.i)
|
2021-12-01 18:03:31 +01:00
|
|
|
tag = s[3:-2].split()[0].strip("#")
|
2021-04-05 22:05:31 +02:00
|
|
|
if tag.startswith("*"):
|
|
|
|
tag = tag[1:]
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "handlebars_start"
|
2017-02-21 13:53:52 +01:00
|
|
|
elif looking_at_handlebars_end():
|
|
|
|
s = get_handlebars_tag(text, state.i)
|
2021-12-01 18:03:31 +01:00
|
|
|
tag = s[3:-2].strip("/#~")
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "handlebars_end"
|
2021-11-20 13:25:41 +01:00
|
|
|
elif looking_at_django_else():
|
|
|
|
s = get_django_tag(text, state.i)
|
|
|
|
tag = "else"
|
|
|
|
kind = "django_else"
|
|
|
|
elif looking_at_django_end():
|
|
|
|
s = get_django_tag(text, state.i)
|
|
|
|
tag = s[6:-3]
|
|
|
|
kind = "django_end"
|
2017-02-21 13:53:52 +01:00
|
|
|
elif looking_at_django_start():
|
2021-11-20 13:25:41 +01:00
|
|
|
# must check this after end/else
|
2017-02-21 13:53:52 +01:00
|
|
|
s = get_django_tag(text, state.i)
|
|
|
|
tag = s[3:-2].split()[0]
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "django_start"
|
2019-04-16 12:54:01 +02:00
|
|
|
|
2021-02-12 08:20:45 +01:00
|
|
|
if s[-3] == "-":
|
|
|
|
kind = "jinja2_whitespace_stripped_start"
|
2019-04-16 12:54:01 +02:00
|
|
|
elif looking_at_jinja2_end_whitespace_stripped():
|
|
|
|
s = get_django_tag(text, state.i)
|
|
|
|
tag = s[7:-3]
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "jinja2_whitespace_stripped_end"
|
2019-04-16 12:54:01 +02:00
|
|
|
elif looking_at_jinja2_start_whitespace_stripped_type2():
|
2020-01-16 21:12:02 +01:00
|
|
|
s = get_django_tag(text, state.i, stripped=True)
|
2019-04-16 12:54:01 +02:00
|
|
|
tag = s[3:-3].split()[0]
|
2021-02-12 08:20:45 +01:00
|
|
|
kind = "jinja2_whitespace_stripped_type2_start"
|
2021-12-01 18:03:31 +01:00
|
|
|
elif looking_at_template_var():
|
|
|
|
# order is important here
|
|
|
|
s = get_template_var(text, state.i)
|
|
|
|
tag = "var"
|
|
|
|
kind = "template_var"
|
|
|
|
elif looking_at("\n"):
|
|
|
|
s = "\n"
|
|
|
|
tag = "newline"
|
|
|
|
kind = "newline"
|
|
|
|
elif looking_at(" "):
|
|
|
|
s = get_spaces(text, state.i)
|
|
|
|
tag = ""
|
|
|
|
if not tokens or tokens[-1].kind == "newline":
|
|
|
|
kind = "indent"
|
|
|
|
else:
|
|
|
|
kind = "whitespace"
|
|
|
|
elif text[state.i] in "{<":
|
|
|
|
snippet = text[state.i :][:15]
|
|
|
|
raise AssertionError(f"tool cannot parse {snippet}")
|
2016-08-07 15:28:17 +02:00
|
|
|
else:
|
2021-12-01 18:03:31 +01:00
|
|
|
s = get_text(text, state.i)
|
|
|
|
if s == "":
|
|
|
|
continue
|
|
|
|
tag = ""
|
|
|
|
kind = "text"
|
2017-02-21 13:53:52 +01:00
|
|
|
except TokenizationException as e:
|
2020-04-18 11:48:00 +02:00
|
|
|
raise FormattedException(
|
2021-05-10 07:02:14 +02:00
|
|
|
f'''{e.message} at line {state.line} col {state.col}:"{e.line_content}"''',
|
2020-04-18 11:48:00 +02:00
|
|
|
)
|
2016-08-02 00:14:01 +02:00
|
|
|
|
2021-12-01 18:03:31 +01:00
|
|
|
line_span = len(s.strip("\n").split("\n"))
|
2016-08-02 00:14:01 +02:00
|
|
|
token = Token(
|
|
|
|
kind=kind,
|
|
|
|
s=s,
|
2020-01-16 21:12:02 +01:00
|
|
|
tag=tag.strip(),
|
2016-08-02 00:14:01 +02:00
|
|
|
line=state.line,
|
|
|
|
col=state.col,
|
python: Use trailing commas consistently.
Automatically generated by the following script, based on the output
of lint with flake8-comma:
import re
import sys
last_filename = None
last_row = None
lines = []
for msg in sys.stdin:
m = re.match(
r"\x1b\[35mflake8 \|\x1b\[0m \x1b\[1;31m(.+):(\d+):(\d+): (\w+)", msg
)
if m:
filename, row_str, col_str, err = m.groups()
row, col = int(row_str), int(col_str)
if filename == last_filename:
assert last_row != row
else:
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
with open(filename) as f:
lines = f.readlines()
last_filename = filename
last_row = row
line = lines[row - 1]
if err in ["C812", "C815"]:
lines[row - 1] = line[: col - 1] + "," + line[col - 1 :]
elif err in ["C819"]:
assert line[col - 2] == ","
lines[row - 1] = line[: col - 2] + line[col - 1 :].lstrip(" ")
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-10 05:23:40 +02:00
|
|
|
line_span=line_span,
|
2016-08-02 00:14:01 +02:00
|
|
|
)
|
|
|
|
tokens.append(token)
|
|
|
|
advance(len(s))
|
2018-04-03 10:09:00 +02:00
|
|
|
|
2016-08-02 00:14:01 +02:00
|
|
|
return tokens
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2021-04-21 00:46:14 +02:00
|
|
|
HTML_VOID_TAGS = {
|
|
|
|
"area",
|
|
|
|
"base",
|
|
|
|
"br",
|
|
|
|
"col",
|
|
|
|
"command",
|
|
|
|
"embed",
|
|
|
|
"hr",
|
|
|
|
"img",
|
|
|
|
"input",
|
|
|
|
"keygen",
|
|
|
|
"link",
|
|
|
|
"meta",
|
|
|
|
"param",
|
|
|
|
"source",
|
|
|
|
"track",
|
|
|
|
"wbr",
|
|
|
|
}
|
|
|
|
|
2021-12-01 14:09:49 +01:00
|
|
|
# The following excludes some obscure tags that are never used
|
|
|
|
# in Zulip code.
|
|
|
|
HTML_INLINE_TAGS = {
|
|
|
|
"a",
|
|
|
|
"b",
|
|
|
|
"br",
|
|
|
|
"button",
|
|
|
|
"cite",
|
|
|
|
"code",
|
|
|
|
"em",
|
|
|
|
"i",
|
|
|
|
"img",
|
|
|
|
"input",
|
|
|
|
"kbd",
|
|
|
|
"label",
|
|
|
|
"object",
|
|
|
|
"script",
|
|
|
|
"select",
|
|
|
|
"small",
|
|
|
|
"span",
|
|
|
|
"strong",
|
|
|
|
"textarea",
|
|
|
|
}
|
2021-11-23 18:56:11 +01:00
|
|
|
|
|
|
|
|
2021-12-02 02:22:01 +01:00
|
|
|
def tag_flavor(token: Token) -> Optional[str]:
|
|
|
|
kind = token.kind
|
|
|
|
tag = token.tag
|
|
|
|
if kind in (
|
2021-12-03 15:38:06 +01:00
|
|
|
"code",
|
2021-12-02 02:22:01 +01:00
|
|
|
"django_comment",
|
|
|
|
"handlebar_comment",
|
|
|
|
"handlebars_singleton",
|
|
|
|
"html_comment",
|
|
|
|
"html_doctype",
|
|
|
|
"html_singleton",
|
|
|
|
"indent",
|
|
|
|
"newline",
|
|
|
|
"template_var",
|
|
|
|
"text",
|
|
|
|
"whitespace",
|
|
|
|
):
|
|
|
|
return None
|
|
|
|
|
|
|
|
if kind in ("handlebars_start", "html_start"):
|
|
|
|
return "start"
|
|
|
|
elif kind in (
|
|
|
|
"django_else",
|
|
|
|
"django_end",
|
|
|
|
"handlebars_else",
|
|
|
|
"handlebars_end",
|
|
|
|
"html_end",
|
|
|
|
"jinja2_whitespace_stripped_end",
|
|
|
|
):
|
|
|
|
return "end"
|
|
|
|
elif kind in {
|
|
|
|
"django_start",
|
|
|
|
"django_else",
|
|
|
|
"jinja2_whitespace_stripped_start",
|
|
|
|
"jinja2_whitespace_stripped_type2_start",
|
|
|
|
}:
|
|
|
|
if is_django_block_tag(tag):
|
|
|
|
return "start"
|
|
|
|
else:
|
|
|
|
return None
|
|
|
|
else:
|
|
|
|
raise AssertionError(f"tools programmer neglected to handle {kind} tokens")
|
|
|
|
|
|
|
|
|
2021-12-02 13:19:19 +01:00
|
|
|
def validate(fn: Optional[str] = None, text: Optional[str] = None) -> List[Token]:
|
2016-08-04 01:44:15 +02:00
|
|
|
assert fn or text
|
|
|
|
|
|
|
|
if fn is None:
|
2021-02-12 08:20:45 +01:00
|
|
|
fn = "<in memory file>"
|
2016-08-04 01:44:15 +02:00
|
|
|
|
|
|
|
if text is None:
|
2020-04-09 21:51:58 +02:00
|
|
|
with open(fn) as f:
|
2019-07-14 21:37:08 +02:00
|
|
|
text = f.read()
|
2016-08-04 01:44:15 +02:00
|
|
|
|
2021-11-23 18:56:11 +01:00
|
|
|
lines = text.split("\n")
|
|
|
|
|
2020-04-18 11:48:00 +02:00
|
|
|
try:
|
|
|
|
tokens = tokenize(text)
|
|
|
|
except FormattedException as e:
|
2021-02-12 08:19:30 +01:00
|
|
|
raise TemplateParserException(
|
2021-02-12 08:20:45 +01:00
|
|
|
f"""
|
2020-06-13 08:57:35 +02:00
|
|
|
fn: {fn}
|
2021-02-12 08:20:45 +01:00
|
|
|
{e}"""
|
2021-02-12 08:19:30 +01:00
|
|
|
)
|
2016-08-02 00:14:01 +02:00
|
|
|
|
2021-12-02 00:51:16 +01:00
|
|
|
prevent_whitespace_violations(fn, tokens)
|
2021-11-21 16:17:01 +01:00
|
|
|
|
2017-11-05 11:57:15 +01:00
|
|
|
class State:
|
2021-12-04 12:26:43 +01:00
|
|
|
def __init__(self, func: Callable[[Optional[Token]], None]) -> None:
|
2016-08-02 00:14:01 +02:00
|
|
|
self.depth = 0
|
2021-04-21 00:46:14 +02:00
|
|
|
self.foreign = False
|
2016-08-02 00:14:01 +02:00
|
|
|
self.matcher = func
|
|
|
|
|
2021-12-04 12:26:43 +01:00
|
|
|
def no_start_tag(token: Optional[Token]) -> None:
|
|
|
|
assert token
|
2021-02-12 08:19:30 +01:00
|
|
|
raise TemplateParserException(
|
2021-02-12 08:20:45 +01:00
|
|
|
f"""
|
2016-08-02 00:14:01 +02:00
|
|
|
No start tag
|
2020-06-13 08:59:37 +02:00
|
|
|
fn: {fn}
|
2016-08-02 00:14:01 +02:00
|
|
|
end tag:
|
2020-06-13 08:59:37 +02:00
|
|
|
{token.tag}
|
|
|
|
line {token.line}, col {token.col}
|
2021-02-12 08:20:45 +01:00
|
|
|
"""
|
2021-02-12 08:19:30 +01:00
|
|
|
)
|
2016-08-02 00:14:01 +02:00
|
|
|
|
|
|
|
state = State(no_start_tag)
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def start_tag_matcher(start_token: Token) -> None:
|
2016-08-02 00:14:01 +02:00
|
|
|
state.depth += 1
|
2021-02-12 08:20:45 +01:00
|
|
|
start_tag = start_token.tag.strip("~")
|
2016-08-02 00:14:01 +02:00
|
|
|
start_line = start_token.line
|
|
|
|
start_col = start_token.col
|
|
|
|
|
|
|
|
old_matcher = state.matcher
|
2021-04-21 00:46:14 +02:00
|
|
|
old_foreign = state.foreign
|
|
|
|
|
|
|
|
if start_tag in ["math", "svg"]:
|
|
|
|
state.foreign = True
|
2016-11-29 07:22:02 +01:00
|
|
|
|
2021-12-04 12:26:43 +01:00
|
|
|
def f(end_token: Optional[Token]) -> None:
|
|
|
|
if end_token is None:
|
|
|
|
raise TemplateParserException(
|
|
|
|
f"""
|
|
|
|
|
|
|
|
Problem with {fn}
|
|
|
|
Missing end tag for the token at row {start_line} {start_col}!
|
|
|
|
|
|
|
|
{start_token.s}
|
|
|
|
|
|
|
|
It's possible you have a typo in a token that you think is
|
|
|
|
matching this tag.
|
|
|
|
"""
|
|
|
|
)
|
|
|
|
|
2021-11-20 13:25:41 +01:00
|
|
|
is_else_tag = end_token.tag == "else"
|
2016-08-02 00:14:01 +02:00
|
|
|
|
2021-02-12 08:20:45 +01:00
|
|
|
end_tag = end_token.tag.strip("~")
|
2016-08-02 00:14:01 +02:00
|
|
|
end_line = end_token.line
|
|
|
|
end_col = end_token.col
|
|
|
|
|
2021-12-01 13:06:16 +01:00
|
|
|
def report_problem() -> Optional[str]:
|
|
|
|
if (start_tag == "code") and (end_line == start_line + 1):
|
|
|
|
return "Code tag is split across two lines."
|
|
|
|
|
|
|
|
if is_else_tag:
|
|
|
|
# We are not completely rigorous about having a sensible
|
|
|
|
# order of if/elif/elif/else, but we catch obviously
|
|
|
|
# mismatching else tags.
|
|
|
|
if start_tag not in ("if", "else", "unless"):
|
|
|
|
return f"Unexpected else/elif tag encountered after {start_tag} tag."
|
|
|
|
elif start_tag != end_tag:
|
|
|
|
return f"Mismatched tags: ({start_tag} != {end_tag})"
|
|
|
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
problem = report_problem()
|
2016-08-02 00:14:01 +02:00
|
|
|
if problem:
|
2021-02-12 08:19:30 +01:00
|
|
|
raise TemplateParserException(
|
2021-02-12 08:20:45 +01:00
|
|
|
f"""
|
2020-06-13 08:59:37 +02:00
|
|
|
fn: {fn}
|
2021-11-20 13:25:41 +01:00
|
|
|
{problem}
|
2016-08-02 00:14:01 +02:00
|
|
|
start:
|
2020-06-13 08:59:37 +02:00
|
|
|
{start_token.s}
|
|
|
|
line {start_line}, col {start_col}
|
2016-08-02 00:14:01 +02:00
|
|
|
end tag:
|
2020-06-13 08:59:37 +02:00
|
|
|
{end_tag}
|
|
|
|
line {end_line}, col {end_col}
|
2021-02-12 08:20:45 +01:00
|
|
|
"""
|
2021-02-12 08:19:30 +01:00
|
|
|
)
|
2021-11-20 13:25:41 +01:00
|
|
|
|
|
|
|
if not is_else_tag:
|
|
|
|
state.matcher = old_matcher
|
|
|
|
state.foreign = old_foreign
|
|
|
|
state.depth -= 1
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2021-12-02 02:57:04 +01:00
|
|
|
# TODO: refine this for the else/elif use cases
|
|
|
|
end_token.start_token = start_token
|
|
|
|
start_token.end_token = end_token
|
|
|
|
|
2016-08-02 00:14:01 +02:00
|
|
|
state.matcher = f
|
|
|
|
|
|
|
|
for token in tokens:
|
|
|
|
kind = token.kind
|
|
|
|
tag = token.tag
|
|
|
|
|
2021-12-02 02:10:25 +01:00
|
|
|
if not state.foreign:
|
|
|
|
if kind == "html_start":
|
|
|
|
if tag in HTML_VOID_TAGS:
|
|
|
|
raise TemplateParserException(
|
|
|
|
f"Tag must be self-closing: {tag} at {fn} line {token.line}, col {token.col}"
|
|
|
|
)
|
|
|
|
elif kind == "html_singleton":
|
2022-06-01 00:09:19 +02:00
|
|
|
if tag not in HTML_VOID_TAGS:
|
2021-12-02 02:10:25 +01:00
|
|
|
raise TemplateParserException(
|
|
|
|
f"Tag must not be self-closing: {tag} at {fn} line {token.line}, col {token.col}"
|
|
|
|
)
|
|
|
|
|
2021-12-02 02:22:01 +01:00
|
|
|
flavor = tag_flavor(token)
|
|
|
|
if flavor == "start":
|
2016-08-02 00:14:01 +02:00
|
|
|
start_tag_matcher(token)
|
2021-12-02 02:22:01 +01:00
|
|
|
elif flavor == "end":
|
2016-08-02 00:14:01 +02:00
|
|
|
state.matcher(token)
|
|
|
|
|
|
|
|
if state.depth != 0:
|
2021-12-04 12:26:43 +01:00
|
|
|
state.matcher(None)
|
2016-08-02 00:14:01 +02:00
|
|
|
|
2021-12-02 02:57:04 +01:00
|
|
|
ensure_matching_indentation(fn, tokens, lines)
|
|
|
|
|
2021-12-02 13:19:19 +01:00
|
|
|
return tokens
|
|
|
|
|
2021-12-02 02:57:04 +01:00
|
|
|
|
|
|
|
def ensure_matching_indentation(fn: str, tokens: List[Token], lines: List[str]) -> None:
|
|
|
|
for token in tokens:
|
|
|
|
if token.start_token is None:
|
|
|
|
continue
|
|
|
|
|
|
|
|
end_token = token
|
|
|
|
|
|
|
|
start_token = token.start_token
|
|
|
|
start_line = start_token.line
|
|
|
|
start_col = start_token.col
|
|
|
|
start_tag = start_token.tag
|
|
|
|
end_tag = end_token.tag.strip("~")
|
|
|
|
end_line = end_token.line
|
|
|
|
end_col = end_token.col
|
|
|
|
|
|
|
|
def has_bad_indentation() -> bool:
|
|
|
|
is_inline_tag = start_tag in HTML_INLINE_TAGS and start_token.kind == "html_start"
|
|
|
|
|
|
|
|
if end_line > start_line + 1:
|
|
|
|
if is_inline_tag:
|
|
|
|
end_row_text = lines[end_line - 1]
|
|
|
|
if end_row_text.lstrip().startswith(end_token.s):
|
|
|
|
if end_col != start_col:
|
|
|
|
return True
|
|
|
|
else:
|
|
|
|
if end_col != start_col:
|
|
|
|
return True
|
|
|
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
if has_bad_indentation():
|
|
|
|
raise TemplateParserException(
|
|
|
|
f"""
|
|
|
|
fn: {fn}
|
|
|
|
Indentation for start/end tags does not match.
|
|
|
|
start tag: {start_token.s}
|
|
|
|
|
|
|
|
start:
|
|
|
|
line {start_line}, col {start_col}
|
|
|
|
end:
|
|
|
|
{end_tag}
|
|
|
|
line {end_line}, col {end_col}
|
|
|
|
"""
|
|
|
|
)
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2021-12-02 12:20:43 +01:00
|
|
|
def prevent_extra_newlines(fn: str, tokens: List[Token]) -> None:
|
|
|
|
count = 0
|
|
|
|
|
|
|
|
for token in tokens:
|
|
|
|
if token.kind != "newline":
|
|
|
|
count = 0
|
|
|
|
continue
|
|
|
|
|
|
|
|
count += 1
|
|
|
|
if count >= 4:
|
|
|
|
raise TemplateParserException(
|
|
|
|
f"""Please avoid so many blank lines near row {token.line} in {fn}."""
|
|
|
|
)
|
|
|
|
|
|
|
|
|
2021-12-02 00:51:16 +01:00
|
|
|
def prevent_whitespace_violations(fn: str, tokens: List[Token]) -> None:
|
|
|
|
if tokens[0].kind in ("indent", "whitespace"):
|
|
|
|
raise TemplateParserException(f" Please remove the whitespace at the beginning of {fn}.")
|
|
|
|
|
2021-12-02 12:20:43 +01:00
|
|
|
prevent_extra_newlines(fn, tokens)
|
|
|
|
|
2021-12-02 00:51:16 +01:00
|
|
|
for i in range(1, len(tokens) - 1):
|
|
|
|
token = tokens[i]
|
|
|
|
next_token = tokens[i + 1]
|
|
|
|
|
|
|
|
if token.kind == "indent":
|
|
|
|
if next_token.kind in ("indent", "whitespace"):
|
|
|
|
raise AssertionError("programming error parsing indents")
|
|
|
|
|
|
|
|
if next_token.kind == "newline":
|
|
|
|
raise TemplateParserException(
|
|
|
|
f"""Please just make row {token.line} in {fn} a truly blank line (no spaces)."""
|
|
|
|
)
|
|
|
|
|
2021-12-02 01:01:50 +01:00
|
|
|
if len(token.s) % 4 != 0:
|
|
|
|
raise TemplateParserException(
|
|
|
|
f"""
|
|
|
|
Please use 4-space indents for template files. Most of our
|
|
|
|
codebase (including Python and JavaScript) uses 4-space indents,
|
|
|
|
so it's worth investing in configuring your editor to use
|
|
|
|
4-space indents for files like
|
|
|
|
{fn}
|
|
|
|
|
|
|
|
The line at row {token.line} is indented with {len(token.s)} spaces.
|
|
|
|
"""
|
|
|
|
)
|
|
|
|
|
2021-12-02 00:51:16 +01:00
|
|
|
if token.kind == "whitespace":
|
|
|
|
if len(token.s) > 1:
|
|
|
|
raise TemplateParserException(
|
|
|
|
f"""
|
|
|
|
We did not expect this much whitespace at row {token.line} column {token.col} in {fn}.
|
|
|
|
"""
|
|
|
|
)
|
|
|
|
if next_token.kind == "newline":
|
|
|
|
raise TemplateParserException(
|
|
|
|
f"""
|
|
|
|
Unexpected trailing whitespace at row {token.line} column {token.col} in {fn}.
|
|
|
|
"""
|
|
|
|
)
|
|
|
|
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def is_django_block_tag(tag: str) -> bool:
|
2016-08-02 00:14:01 +02:00
|
|
|
return tag in [
|
2021-02-12 08:20:45 +01:00
|
|
|
"autoescape",
|
|
|
|
"block",
|
|
|
|
"comment",
|
|
|
|
"for",
|
|
|
|
"if",
|
|
|
|
"ifequal",
|
|
|
|
"macro",
|
|
|
|
"verbatim",
|
|
|
|
"blocktrans",
|
|
|
|
"trans",
|
|
|
|
"raw",
|
|
|
|
"with",
|
2016-08-02 00:14:01 +02:00
|
|
|
]
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def get_handlebars_tag(text: str, i: int) -> str:
|
2016-08-02 00:14:01 +02:00
|
|
|
end = i + 2
|
2021-02-12 08:20:45 +01:00
|
|
|
while end < len(text) - 1 and text[end] != "}":
|
2016-08-02 00:14:01 +02:00
|
|
|
end += 1
|
2021-02-12 08:20:45 +01:00
|
|
|
if text[end] != "}" or text[end + 1] != "}":
|
2021-02-12 08:19:30 +01:00
|
|
|
raise TokenizationException('Tag missing "}}"', text[i : end + 2])
|
|
|
|
s = text[i : end + 2]
|
2016-08-02 00:14:01 +02:00
|
|
|
return s
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2021-12-01 18:03:31 +01:00
|
|
|
def get_spaces(text: str, i: int) -> str:
|
|
|
|
s = ""
|
|
|
|
while i < len(text) and text[i] in " ":
|
|
|
|
s += text[i]
|
|
|
|
i += 1
|
|
|
|
return s
|
|
|
|
|
|
|
|
|
2021-12-03 15:38:06 +01:00
|
|
|
def get_code(text: str, i: int) -> str:
|
|
|
|
s = ""
|
|
|
|
while i < len(text) and text[i] not in "<":
|
|
|
|
s += text[i]
|
|
|
|
i += 1
|
|
|
|
return s
|
|
|
|
|
|
|
|
|
2021-12-01 18:03:31 +01:00
|
|
|
def get_text(text: str, i: int) -> str:
|
|
|
|
s = ""
|
|
|
|
while i < len(text) and text[i] not in "{<":
|
|
|
|
s += text[i]
|
|
|
|
i += 1
|
|
|
|
return s.strip()
|
|
|
|
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def get_django_tag(text: str, i: int, stripped: bool = False) -> str:
|
2016-08-02 00:14:01 +02:00
|
|
|
end = i + 2
|
2020-01-16 21:12:02 +01:00
|
|
|
if stripped:
|
|
|
|
end += 1
|
2021-02-12 08:20:45 +01:00
|
|
|
while end < len(text) - 1 and text[end] != "%":
|
2016-08-02 00:14:01 +02:00
|
|
|
end += 1
|
2021-02-12 08:20:45 +01:00
|
|
|
if text[end] != "%" or text[end + 1] != "}":
|
2021-02-12 08:19:30 +01:00
|
|
|
raise TokenizationException('Tag missing "%}"', text[i : end + 2])
|
|
|
|
s = text[i : end + 2]
|
2016-08-02 00:14:01 +02:00
|
|
|
return s
|
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def get_html_tag(text: str, i: int) -> str:
|
2016-08-02 00:14:01 +02:00
|
|
|
quote_count = 0
|
|
|
|
end = i + 1
|
2017-02-21 13:53:52 +01:00
|
|
|
unclosed_end = 0
|
2021-02-12 08:20:45 +01:00
|
|
|
while end < len(text) and (text[end] != ">" or quote_count % 2 != 0 and text[end] != "<"):
|
2016-08-02 00:14:01 +02:00
|
|
|
if text[end] == '"':
|
|
|
|
quote_count += 1
|
2021-02-12 08:20:45 +01:00
|
|
|
if not unclosed_end and text[end] == "<":
|
2017-02-21 13:53:52 +01:00
|
|
|
unclosed_end = end
|
2016-08-02 00:14:01 +02:00
|
|
|
end += 1
|
2017-02-21 13:53:52 +01:00
|
|
|
if quote_count % 2 != 0:
|
|
|
|
if unclosed_end:
|
2021-05-10 07:02:14 +02:00
|
|
|
raise TokenizationException("Unbalanced quotes", text[i:unclosed_end])
|
2017-02-21 13:53:52 +01:00
|
|
|
else:
|
2021-05-10 07:02:14 +02:00
|
|
|
raise TokenizationException("Unbalanced quotes", text[i : end + 1])
|
2021-02-12 08:20:45 +01:00
|
|
|
if end == len(text) or text[end] != ">":
|
2021-02-12 08:19:30 +01:00
|
|
|
raise TokenizationException('Tag missing ">"', text[i : end + 1])
|
|
|
|
s = text[i : end + 1]
|
2016-08-02 00:14:01 +02:00
|
|
|
return s
|
2017-02-03 04:26:35 +01:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def get_html_comment(text: str, i: int) -> str:
|
2017-02-03 04:26:35 +01:00
|
|
|
end = i + 7
|
2017-02-21 13:53:52 +01:00
|
|
|
unclosed_end = 0
|
2017-02-03 04:26:35 +01:00
|
|
|
while end <= len(text):
|
2021-02-12 08:20:45 +01:00
|
|
|
if text[end - 3 : end] == "-->":
|
2017-02-03 04:26:35 +01:00
|
|
|
return text[i:end]
|
2021-02-12 08:20:45 +01:00
|
|
|
if not unclosed_end and text[end] == "<":
|
2017-02-21 13:53:52 +01:00
|
|
|
unclosed_end = end
|
2017-02-03 04:26:35 +01:00
|
|
|
end += 1
|
2021-02-12 08:20:45 +01:00
|
|
|
raise TokenizationException("Unclosed comment", text[i:unclosed_end])
|
2017-02-23 18:12:52 +01:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def get_handlebar_comment(text: str, i: int) -> str:
|
2017-02-23 18:12:52 +01:00
|
|
|
end = i + 5
|
|
|
|
unclosed_end = 0
|
|
|
|
while end <= len(text):
|
2021-02-12 08:20:45 +01:00
|
|
|
if text[end - 2 : end] == "}}":
|
2017-02-23 18:12:52 +01:00
|
|
|
return text[i:end]
|
2021-02-12 08:20:45 +01:00
|
|
|
if not unclosed_end and text[end] == "<":
|
2017-02-23 18:12:52 +01:00
|
|
|
unclosed_end = end
|
|
|
|
end += 1
|
2021-02-12 08:20:45 +01:00
|
|
|
raise TokenizationException("Unclosed comment", text[i:unclosed_end])
|
2017-02-23 18:12:52 +01:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
2021-12-01 18:03:31 +01:00
|
|
|
def get_template_var(text: str, i: int) -> str:
|
|
|
|
end = i + 3
|
|
|
|
unclosed_end = 0
|
|
|
|
while end <= len(text):
|
|
|
|
if text[end - 1] == "}":
|
|
|
|
if end < len(text) and text[end] == "}":
|
|
|
|
end += 1
|
|
|
|
return text[i:end]
|
|
|
|
if not unclosed_end and text[end] == "<":
|
|
|
|
unclosed_end = end
|
|
|
|
end += 1
|
|
|
|
raise TokenizationException("Unclosed var", text[i:unclosed_end])
|
|
|
|
|
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def get_django_comment(text: str, i: int) -> str:
|
2017-02-23 18:12:52 +01:00
|
|
|
end = i + 4
|
|
|
|
unclosed_end = 0
|
|
|
|
while end <= len(text):
|
2021-02-12 08:20:45 +01:00
|
|
|
if text[end - 2 : end] == "#}":
|
2017-02-23 18:12:52 +01:00
|
|
|
return text[i:end]
|
2021-02-12 08:20:45 +01:00
|
|
|
if not unclosed_end and text[end] == "<":
|
2017-02-23 18:12:52 +01:00
|
|
|
unclosed_end = end
|
|
|
|
end += 1
|
2021-02-12 08:20:45 +01:00
|
|
|
raise TokenizationException("Unclosed comment", text[i:unclosed_end])
|
2018-04-03 10:09:00 +02:00
|
|
|
|
2021-02-12 08:19:30 +01:00
|
|
|
|
python: Convert function type annotations to Python 3 style.
Generated by com2ann (slightly patched to avoid also converting
assignment type annotations, which require Python 3.6), followed by
some manual whitespace adjustment, and six fixes for runtime issues:
- def __init__(self, token: Token, parent: Optional[Node]) -> None:
+ def __init__(self, token: Token, parent: "Optional[Node]") -> None:
-def main(options: argparse.Namespace) -> NoReturn:
+def main(options: argparse.Namespace) -> "NoReturn":
-def fetch_request(url: str, callback: Any, **kwargs: Any) -> Generator[Callable[..., Any], Any, None]:
+def fetch_request(url: str, callback: Any, **kwargs: Any) -> "Generator[Callable[..., Any], Any, None]":
-def assert_server_running(server: subprocess.Popen[bytes], log_file: Optional[str]) -> None:
+def assert_server_running(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> None:
-def server_is_up(server: subprocess.Popen[bytes], log_file: Optional[str]) -> bool:
+def server_is_up(server: "subprocess.Popen[bytes]", log_file: Optional[str]) -> bool:
- method_kwarg_pairs: List[FuncKwargPair],
+ method_kwarg_pairs: "List[FuncKwargPair]",
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-04-19 03:48:37 +02:00
|
|
|
def get_handlebar_partial(text: str, i: int) -> str:
|
2018-04-03 10:09:00 +02:00
|
|
|
end = i + 10
|
|
|
|
unclosed_end = 0
|
|
|
|
while end <= len(text):
|
2021-02-12 08:20:45 +01:00
|
|
|
if text[end - 2 : end] == "}}":
|
2018-04-03 10:09:00 +02:00
|
|
|
return text[i:end]
|
2021-02-12 08:20:45 +01:00
|
|
|
if not unclosed_end and text[end] == "<":
|
2018-04-03 10:09:00 +02:00
|
|
|
unclosed_end = end
|
|
|
|
end += 1
|
2021-02-12 08:20:45 +01:00
|
|
|
raise TokenizationException("Unclosed partial", text[i:unclosed_end])
|