bpo-16806: Fix lineno and col_offset for multi-line string tokens.#10021
bpo-16806: Fix lineno and col_offset for multi-line string tokens.#10021methane merged 3 commits into
lineno and col_offset for multi-line string tokens.#10021Conversation
0957b8b to
9f8316c
Compare
October 21, 2018 03:52
0284c2a to
33f03d9
Compare
October 21, 2018 19:22
|
(I've rebased to regen importlib to resolve the conflict) |
Sorry, something went wrong.
|
(I've rebased to regen importlib to resolve the conflict) |
Sorry, something went wrong.
|
Diff and tests looks good to me. @ericvsmith would you review this? You seems reviewed #1800. |
Sorry, something went wrong.
|
I'll take a look, but it might take me a while to get to it. Unfortunately I have a project that's due at the end of the year that's taking up all of my time. So while I'll try, you might not want to wait for me. I'm working on a fix to bpo-34364 that will completely back out the changes implemented in #1800. I'm not sure if that will interact with this change, though. |
Sorry, something went wrong.
Sorry, something went wrong.
|
(I've rebased to regen importlib to resolve the conflict) Commands for me for next time since I expect this to not be the last: git fetch --all
git checkout [bpo-16806](https://bugs.python.org/issue16806)
git reset --hard asottile/[bpo-16806](https://bugs.python.org/issue16806)
git pull --rebase origin master
git checkout origin/master -- Python/importlib* # when rebase fails
make regen-importlib
git add Python
git rebase --continue
git push asottile HEAD -f |
Sorry, something went wrong.
|
urgh, the bot edited my comment and broke my code block :( |
Sorry, something went wrong.
|
(I've rebased to regen importlib to resolve the conflict) Please take a look, this is tedious -- I'd like to be done with this branch! |
Sorry, something went wrong.
|
(I've rebased to regen importlib to resolve the conflict) Please take a look, this is tedious -- I'd like to be done with this branch! |
Sorry, something went wrong.
|
happy new year! friendly ping :) |
Sorry, something went wrong.
|
changes to the ast generally shouldn't be backported because they break linters / code formatters which make assumptions about how minor versions of python work in this particular case, this was discussed on bpo if you want more information |
Sorry, something went wrong.
I revived the patch listed in the linked bpo issue.
https://bugs.python.org/issue16806