Skip to content
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 and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-37053: handle strings like u"bar" correctly in Tools/parser/unparse.py #13583

Merged
merged 3 commits into from
May 26, 2019
Merged

Conversation

yan12125
Copy link
Contributor

@yan12125 yan12125 commented May 26, 2019

Constant.kind is added in https://bugs.python.org/issue36280.
Current possible values for Constant.kind are "u" or None.

For r'bar' and b'bar', Constant.kind value is None, so there's no need
for special handling.

https://bugs.python.org/issue37053

…se.py

Constant.kind is added in https://bugs.python.org/issue36280.
Current possible values for Constant.kind are "u" or None.

For r'bar' and b'bar', Constant.kind value is None, so there's no need
for special handling.
Copy link
Member

@pablogsal pablogsal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Confirmed that this fixes the broken buildbots:

./python -m test test_tools -vvvv -uall -m test_files
== CPython 3.8.0a4+ (heads/master:91f4380ced, May 26 2019, 17:30:21) [GCC 8.3.0]
== Linux-5.0.15-1-MANJARO-x86_64-with-glibc2.29 little-endian
== cwd: /home/pablogsal/github/cpython/build/test_python_25649
== CPU count: 12
== encodings: locale=UTF-8, FS=utf-8
Run tests sequentially
0:00:00 load avg: 0.50 [1/1] test_tools
test_files (test.test_tools.test_unparse.DirectoryTestCase) ... Testing /home/pablogsal/github/cpython/Lib/typing.py
Testing /home/pablogsal/github/cpython/Lib/test/test_typing.py
ok


Ran 1 test in 0.586s

OK

== Tests result: SUCCESS ==

1 test OK.

Total duration: 671 ms
Tests result: SUCCESS

The manual check is needed because the CI in GitHub does not run test_tools over all files so it does not take forever.

Copy link
Member

@pablogsal pablogsal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Comment deleted as it was tested on a buildbot with a corrupted checkout]

@pablogsal pablogsal self-assigned this May 26, 2019
@miss-islington
Copy link
Contributor

@yan12125: Status check is done, and it's a success ✅ .

@miss-islington miss-islington merged commit aaf47ca into python:master May 26, 2019
@yan12125 yan12125 deleted the bpo-37053 branch May 26, 2019 17:08
@yan12125
Copy link
Contributor Author

Thanks for reviewing!

@pablogsal
Copy link
Member

@yan12125 Thanks for the PR and the report! :)

yan12125 added a commit to archlinuxcn/repo that referenced this pull request May 26, 2019
This reverts commit 85177d2.

In the last minute, my patch is merged upstream :)

python/cpython#13583
DinoV pushed a commit to DinoV/cpython that referenced this pull request Jan 14, 2020
…se.py (pythonGH-13583)

Constant.kind is added in https://bugs.python.org/issue36280.
Current possible values for Constant.kind are "u" or None.

For r'bar' and b'bar', Constant.kind value is None, so there's no need
for special handling.


https://bugs.python.org/issue37053
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants