8000 gh-116472: Fix invalid newlines in XML attr by DanAlbert · Pull Request #116473 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-116472: Fix invalid newlines in XML attr #116473

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 1 commit into from
Mar 7, 2024
Merged

gh-116472: Fix invalid newlines in XML attr #116473

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix invalid newlines in XML attr. 
Compliant XML readers normalize newlines in attributes to spaces
(https://www.w3.org/TR/2006/REC-xml11-20060816/#AVNormalize). MSBuild
apparently doesn't do that, but Python's minidom parser does. Android
modifies this file with minidom (to include additional license texts
from the dependencies we use) so the resulting file is re-written
without the newlines, which breaks the build.
  • Loading branch information
@DanAlbert
DanAlbert committed Mar 7, 2024
commit 8adbc93a194b67b6ce463b592784b3b93c8243c0
4 changes: 1 addition & 3 deletions PCbuild/regen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,7 @@
Condition="($(Platform) == 'Win32' or $(Platform) == 'x64') and
$(Configuration) != 'PGInstrument' and $(Configuration) != 'PGUpdate'">
<Message Text="Regenerate @(_TestFrozenOutputs->'%(Filename)%(Extension)', ' ')" Importance="high" />
<Exec Command='setlocal
set PYTHONPATH=$(PySourcePath)Lib
"$(PythonExe)" Programs\freeze_test_frozenmain.py Programs\test_frozenmain.h'
<Exec Command='setlocal%0D%0Aset PYTHONPATH=$(PySourcePath)Lib%0D%0A"$(PythonExe)" Programs\freeze_test_frozenmain.py Programs\test_frozenmain.h'
WorkingDirectory="$(PySourcePath)" />
</Target>

Expand Down
0