Skip to content

Commit

Permalink
vendor untokenize.py, because pip install breaks on 3.14
Browse files Browse the repository at this point in the history
  • Loading branch information
antocuni committed Feb 13, 2025
1 parent 5603758 commit 0090519
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 3 deletions.
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ dependencies = [
"fixedint==0.2.0",
"mypy==1.3.0",
"typer==0.9.0",
"untokenize==0.1.1",
"ziglang==0.13.0"
]

Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ wasmtime==8.0.1
fixedint==0.2.0
mypy==1.3.0
typer==0.9.0
untokenize==0.1.1
ziglang==0.13.0
2 changes: 1 addition & 1 deletion spy/magic_py_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import ast as py_ast
from tokenize import tokenize, NUMBER, STRING, NAME, OP, TokenInfo
from io import BytesIO
import untokenize
from spy.vendored import untokenize
import spy.ast_dump

@dataclass(frozen=True)
Expand Down
21 changes: 21 additions & 0 deletions spy/vendored/LICENSE.mit
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023 spylang

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
10 changes: 10 additions & 0 deletions spy/vendored/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Vendored files

This directory contains files which has been copied as is (or with minimal
modifications) from other sources.

This is a summary of their provenance, copyright and license:

- `dataclass_typer.py`: MIT license. (C) Ben Thompson. From this [github gist](https://gist.github.com/tbenthompson/9db0452445451767b59f5cb0611ab483).

- `untokenize.py`, MIT license, (C) Steven Myint. From [github.com/myint/untokenize](/~https://github.com/myint/untokenize/tree/2d7bcd60abd61e0b6a5c20bf42031b1bd51c3fcb)
82 changes: 82 additions & 0 deletions spy/vendored/untokenize.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# Copyright (C) 2013-2018 Steven Myint
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

"""Transform tokens into original source code."""

import tokenize


__version__ = '0.1.1'


TOKENIZE_HAS_ENCODING = hasattr(tokenize, 'ENCODING')

WHITESPACE_TOKENS = frozenset([tokenize.INDENT, tokenize.NEWLINE, tokenize.NL])


def untokenize(tokens):
"""Return source code based on tokens.
This is like tokenize.untokenize(), but it preserves spacing between
tokens. So if the original soure code had multiple spaces between
some tokens or if escaped newlines were used, those things will be
reflected by untokenize().
"""
text = ''
previous_line = ''
last_row = 0
last_column = -1
last_non_whitespace_token_type = None

for (token_type, token_string, start, end, line) in tokens:
if TOKENIZE_HAS_ENCODING and token_type == tokenize.ENCODING:
continue

(start_row, start_column) = start
(end_row, end_column) = end

# Preserve escaped newlines.
if (
last_non_whitespace_token_type != tokenize.COMMENT and
start_row > last_row and
previous_line.endswith(('\\\n', '\\\r\n', '\\\r'))
):
text += previous_line[len(previous_line.rstrip(' \t\n\r\\')):]

# Preserve spacing.
if start_row > last_row:
last_column = 0
if start_column > last_column:
text += line[last_column:start_column]

text += token_string

previous_line = line

last_row = end_row
last_column = end_column

if token_type not in WHITESPACE_TOKENS:
last_non_whitespace_token_type = token_type

return text

0 comments on commit 0090519

Please sign in to comment.