[3.5] bpo-32563: Get expat to compile under C89 by ncoghlan · Pull Request #5201 · python/cpython (original) (raw)
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.
By clicking “Sign up for GitHub”, you agree to our terms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Conversation13 Commits5 Checks0 Files changed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
[ Show hidden characters]({{ revealButtonHref }})
expat: Add artificial scopes in xmltok.c utf8_toUtf8() to fix c89 compilation.
Cherry-picked from libexpat commit e0b290eb3d8f4c4b45137a7d7f4f8db812145bd2
https://bugs.python.org/issue32563
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
It's not pretty but as long as it works...
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please mention in your commit message that it's a cherry-pick from upstream. Extract of my 3.4 fix:
expat: Add artificial scopes in xmltok.c utf8_toUtf8() to fix c89 compilation.
Cherry-picked from libexpat commit e0b290eb3d8f4c4b45137a7d7f4f8db812145bd2
Hmm, the Travis CI script wasn't happy because pyenv couldn't find a global Python 3.5 install. Any suggestions/ideas, @brettcannon?
expat: Add artificial scopes in xmltok.c utf8_toUtf8() to fix c89 compilation.
Cherry-picked from libexpat commit e0b290eb3d8f4c4b45137a7d7f4f8db812145bd2
@ncoghlan usually that kind of thing is a transient failure.
That doesn't look transient to me:
$ pyenv global system 3.5
pyenv: version `3.5' not installed
The command "pyenv global system 3.5" failed and exited with 1 during .
However, I don't think that or the test_xmlrpc_net failure are introduced by this PR, so I'd suggest @larryhastings go ahead and merge it (it's the 3.5 branch, so it's locked to RM-only merges)
I'm happy to accept this PR for Python 3.5.5, but Github won't let me mash the Squash & Merge button until the builds are happy.
FYI I re-triggered AppVeyor due to the network failure (if it happens again I will turn off AppVeyor being a requirement).
The buildbot service upgrade removed the XML-RPC interface, so this test no longer works (through no fault of the standard library).
It turns out the Buildbot service upgrade removed an XML-RPC interface that test_xmlrpc_net was using - I've added the backport of the related test skip to this PR.
Can you trigger it again? The tests failed with what looks like--with what I hope is--a transient network error. Which means Github still won't let me merge.
The Travis CI build hit the "The command "pyenv global system 3.5" failed and exited with 1 during ." problem again. I still can't merge.
@larryhastings If Travis is fundamentally broken for 3.5 at the moment, you may need to resort to git push from your local system (I'm not sure why we're needing to rely on pyenv in travis anyway, since the CPython repo is supposed to be self-bootstrapping)
I've pushed another commit that just removes the failing build step from the Travis config
Reviewers
