Skip to content

Patch out the ast.Str reference in Kivy, for Python 3.14 compatibility #3241

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

Merged
merged 2 commits into from
Oct 22, 2025
Merged

Patch out the ast.Str reference in Kivy, for Python 3.14 compatibility #3241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6559b2a
`python`: update to `3.14.0`
T-Dynamos Oct 15, 2025
b7acb1a
Patch out the reference to `ast.Str` in `kivy.lang.parser`
clayote Oct 19, 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
6 changes: 5 additions & 1 deletion pythonforandroid/recipes/kivy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ class KivyRecipe(PyProjectRecipe):
# sdl-gl-swapwindow-nogil.patch is needed to avoid a deadlock.
# See: https://github.com/kivy/kivy/pull/8025
# WARNING: Remove this patch when a new Kivy version is released.
patches = [("sdl-gl-swapwindow-nogil.patch", is_kivy_affected_by_deadlock_issue), "use_cython.patch"]
patches = [
("sdl-gl-swapwindow-nogil.patch", is_kivy_affected_by_deadlock_issue),
"use_cython.patch",
"no-ast-str.patch"
]

@property
def need_stl_shared(self):
Expand Down
16 changes: 16 additions & 0 deletions pythonforandroid/recipes/kivy/no-ast-str.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff -ur kivy-2.3.1b/kivy/lang/parser.py kivy-2.3.1/kivy/lang/parser.py
--- kivy-2.3.1b/kivy/lang/parser.py 2025-10-19 13:04:51.542798827 +1300
+++ kivy-2.3.1/kivy/lang/parser.py 2025-10-19 13:05:16.007104601 +1300
@@ -230,11 +230,7 @@

if isinstance(node, (ast.JoinedStr, ast.BoolOp)):
for n in node.values:
- if isinstance(n, ast.Str):
- # NOTE: required for python3.6
- yield from cls.get_names_from_expression(n.s)
- else:
- yield from cls.get_names_from_expression(n.value)
+ yield from cls.get_names_from_expression(n.value)

if isinstance(node, ast.BinOp):
yield from cls.get_names_from_expression(node.right)