OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 12:20:52 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Better fix for f-strings in set_linter for py3.12 (#143725)

Browse Source 
#143628 didn't handle a few cases right for example:
```py
$ python3 tools/linter/adapters/set_linter.py torch/_inductor/scheduler.py
torch/_inductor/scheduler.py:261:24: Builtin `set` is deprecated
  259 |                 multiline=False,
  260 |             )
  261 |         return f"{self}{data_str}"
                               ^
  262 |
  263 |     def log_details(self) -> None:

torch/_inductor/scheduler.py:261:33: Builtin `set` is deprecated
  259 |                 multiline=False,
  260 |             )
  261 |         return f"{self}{data_str}"
                                        ^
  262 |
  263 |     def log_details(self) -> None:
```
also multi-line fstrings
Pull Request resolved: https://github.com/pytorch/pytorch/pull/143725
Approved by: https://github.com/yanboliang
This commit is contained in:
Jason Ansel 2024-12-22 11:26:25 -08:00 committed by PyTorch MergeBot
parent 41cdc7f735
commit eebc93d41e
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/linter/adapters/_linter.py
View File

@ -16,13 +16,8 @@ from typing import Any, Iterator, Sequence
from typing_extensions import Never
FSTRING_TOKENS = dict.fromkeys(
[
getattr(token, "FSTRING_START", -1),
getattr(token, "FSTRING_MIDDLE", -1),
getattr(token, "FSTRING_END", -1),
]
)
FSTRING_START = getattr(token, "FSTRING_START", None) # py3.12+
FSTRING_END = getattr(token, "FSTRING_END", None)
EMPTY_TOKENS = dict.fromkeys(
[
token.COMMENT,
@ -294,10 +289,18 @@ def bracket_pairs(tokens: Sequence[TokenInfo]) -> dict[int, int]:
elif inv := BRACKETS_INV.get(t.string):
ParseError.check(stack, t, "Never opened")
begin = stack.pop()
if not (stack and stack[-1] == FSTRING_START):
braces[begin] = i
b = tokens[begin].string
ParseError.check(b == inv, t, f"Mismatched braces '{b}' at {begin}")
elif FSTRING_START and t.type == FSTRING_START:
stack.append(FSTRING_START)
elif FSTRING_END and t.type == FSTRING_END:
ParseError.check(
stack.pop() == FSTRING_START, t, "Mismatched FSTRING_START/FSTRING_END"
)
if tokens:
ParseError.check(not stack, t, "Left open")

6
tools/linter/adapters/set_linter.py
View File

@ -131,11 +131,7 @@ class TokenLine:
return True
def is_braced_set(self, begin: int, end: int) -> bool:
if (
begin + 1 == end
or self.tokens[begin].string != "{"
or self.tokens[begin - 1].type in _linter.FSTRING_TOKENS
):
if begin + 1 == end or self.tokens[begin].string != "{":
return False
i = begin + 1
empty = True