Skip to content

gh-136073: Fix expandvars() in Tools/freeze/checkextensions.py #136093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
serhiy-storchaka wants to merge 3 commits into
base: main
Choose a base branch
from
Open

gh-136073: Fix expandvars() in Tools/freeze/checkextensions.py #136093

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82fcefa
gh-136073: Fix expandvars() in Tools/freeze/checkextensions.py
serhiy-storchaka Jun 28, 2025
ba9e483
Merge branch 'main' into tool-freeze-checkextensions-expandvars
serhiy-storchaka Dec 22, 2025
da10fd4
Optimize
serhiy-storchaka Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions Tools/freeze/checkextensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import os
import parsesetup
import re

def checkextensions(unknown, extensions):
files = []
Expand Down Expand Up @@ -70,21 +71,25 @@ def treatword(w):
return w

def expandvars(str, vars):
i = 0
while i < len(str):
i = k = str.find('$', i)
if i < 0:
break
i = i+1
var = str[i:i+1]
i = i+1
if var == '(':
j = str.find(')', i)
if j < 0:
break
var = str[i:j]
i = j+1
if var in vars:
str = str[:k] + vars[var] + str[i:]
i = k
return str
def repl(m):
name = m[1]
if name[0] == '(':
if name[-1] != ')':
return m[0]
name = name[1:-1]

if name in resolved:
result = resolved[name]
if result is not None:
return result
elif name in vars:
resolved[name] = None
result = resolved[name] = expandvars(vars[name])
return result
return m[0]

def expandvars(str):
return re.sub(r'(?m)\$(\([^)]*\)?|.)', repl, str)

resolved = {}
return expandvars(str)
Loading