Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2026-04-03 07:41:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Python 3.14 compat

Browse Source 
In Python 3.14 they randomnly broke using capturing groups in patterns
to re.Scanner
This commit is contained in:
Kovid Goyal 2025-12-08 22:28:39 +05:30
parent 2e7a4fe16a
commit b80ae9b0e9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/calibre/utils/formatter.py
View File

@ -1693,7 +1693,7 @@ class _Interpreter:
def args_scanner() -> re.Scanner:
return re.Scanner([
(r',', lambda x,t: ''),
(r'.*?((?<!\\),)', lambda x,t: t[:-1]),
(r'.*?(?:(?<!\\),)', lambda x,t: t[:-1]),
(r'.*?\)', lambda x,t: t[:-1]),
])
@ -1701,25 +1701,25 @@ def args_scanner() -> re.Scanner:
@lru_cache(maxsize=2)
def cached_lex_scanner() -> re.Scanner:
return re.Scanner([
(r'(==#|!=#|<=#|<#|>=#|>#)', lambda x,t: (_Parser.LEX_NUMERIC_INFIX, t)),
(r'(==|!=|<=|<|>=|>)', lambda x,t: (_Parser.LEX_STRING_INFIX, t)),
(r'(if|then|else|elif|fi)\b',lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(for|in|rof|separator)\b',lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(separator|limit)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(def|fed|continue)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(return|inlist|break)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(inlist_field)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(with|htiw)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(\|\||&&|!|{|})', lambda x,t: (_Parser.LEX_OP, t)),
(r'[(),=;:\+\-*/&]', lambda x,t: (_Parser.LEX_OP, t)),
(r'-?[\d\.]+', lambda x,t: (_Parser.LEX_CONST, t)),
(r'\$\$?#?\w+', lambda x,t: (_Parser.LEX_ID, t)),
(r'\$', lambda x,t: (_Parser.LEX_ID, t)),
(r'\w+', lambda x,t: (_Parser.LEX_ID, t)),
(r'".*?((?<!\\)")', lambda x,t: (_Parser.LEX_CONST, t[1:-1])),
(r'\'.*?((?<!\\)\')', lambda x,t: (_Parser.LEX_CONST, t[1:-1])),
(r'\n[ \t]*#.*?(?:(?=\n)|$)',lambda x,t: _Parser.LEX_NEWLINE),
(r'\s', lambda x,t: _Parser.LEX_NEWLINE if t == '\n' else None),
(r'(?:==#|!=#|<=#|<#|>=#|>#)', lambda x,t: (_Parser.LEX_NUMERIC_INFIX, t)),
(r'(?:==|!=|<=|<|>=|>)', lambda x,t: (_Parser.LEX_STRING_INFIX, t)),
(r'(?:if|then|else|elif|fi)\b',lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(?:for|in|rof|separator)\b',lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(?:separator|limit)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(?:def|fed|continue)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(?:return|inlist|break)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(?:inlist_field)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(?:with|htiw)\b', lambda x,t: (_Parser.LEX_KEYWORD, t)),
(r'(?:\|\||&&|!|{|})', lambda x,t: (_Parser.LEX_OP, t)),
(r'[(),=;:\+\-*/&]', lambda x,t: (_Parser.LEX_OP, t)),
(r'-?[\d\.]+', lambda x,t: (_Parser.LEX_CONST, t)),
(r'\$\$?#?\w+', lambda x,t: (_Parser.LEX_ID, t)),
(r'\$', lambda x,t: (_Parser.LEX_ID, t)),
(r'\w+', lambda x,t: (_Parser.LEX_ID, t)),
(r'".*?(?:(?<!\\)")', lambda x,t: (_Parser.LEX_CONST, t[1:-1])),
(r'\'.*?(?:(?<!\\)\')', lambda x,t: (_Parser.LEX_CONST, t[1:-1])),
(r'\n[ \t]*#.*?(?:(?=\n)|$)', lambda x,t: _Parser.LEX_NEWLINE),
(r'\s', lambda x,t: _Parser.LEX_NEWLINE if t == '\n' else None),
], flags=re.DOTALL)

10
src/calibre/utils/search_query_parser.py
View File

@ -157,11 +157,11 @@ class Parser:
# Had to translate named constants to numeric values
lex_scanner = re.Scanner([
(r'[()]', lambda x,t: (Parser.OPCODE, t)),
(r'@.+?:[^")\s]+', lambda x,t: (Parser.WORD, str(t))),
(r'[^"()\s]+', lambda x,t: (Parser.WORD, str(t))),
(r'".*?((?<!\\)")', lambda x,t: (Parser.QUOTED_WORD, t[1:-1])),
(r'\s+', None)
(r'[()]', lambda x,t: (Parser.OPCODE, t)),
(r'@.+?:[^")\s]+', lambda x,t: (Parser.WORD, str(t))),
(r'[^"()\s]+', lambda x,t: (Parser.WORD, str(t))),
(r'".*?(?:(?<!\\)")', lambda x,t: (Parser.QUOTED_WORD, t[1:-1])),
(r'\s+', None)
], flags=re.DOTALL)
def token(self, advance=False):