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

scripts: Remove Python 2 import workarounds #14947

Merged

Conversation

@practicalswift
Copy link
Contributor

@practicalswift practicalswift commented Dec 13, 2018

Remove Python 2 import workarounds.

As noted by @jnewbery in #14903 (comment):

This exception handling is a vestige from when github-merge.py supported Python 2 and Python 3. We only support Python 3 now so we should be able to remove it entirely and just import from urllib.request.

@practicalswift practicalswift changed the title Remove Python 2 import workarounds scripts: Remove Python 2 import workarounds Dec 13, 2018
@fanquake
Copy link
Member

@fanquake fanquake commented Dec 13, 2018

utACK 9c5ca39

@fanquake fanquake requested a review from jnewbery Dec 13, 2018
@laanwj
Copy link
Member

@laanwj laanwj commented Dec 13, 2018

Apparently I merged #14903 too soon, sorry.

@jnewbery
Copy link
Member

@jnewbery jnewbery commented Dec 13, 2018

Apparently I merged #14903 too soon, sorry.

Nah. Better is better! Plus, I only noticed it and commented because mergebot told me about it!

Copy link
Member

@jnewbery jnewbery left a comment

Looks good. Perhaps worth removing all of the from __future__ import ... statements in the same PR? I count 4 of them across the project (all in modules that start with a Python3 shebang).

contrib/linearize/linearize-hashes.py Outdated Show resolved Hide resolved
@practicalswift practicalswift force-pushed the remove-python-2-workarounds branch from 9c5ca39 to 95b54aa Dec 13, 2018
@practicalswift
Copy link
Contributor Author

@practicalswift practicalswift commented Dec 13, 2018

@jnewbery Good points! Feedback addressed. Please re-review :-)

@practicalswift practicalswift force-pushed the remove-python-2-workarounds branch from 95b54aa to 4de11a3 Dec 13, 2018
@jnewbery
Copy link
Member

@jnewbery jnewbery commented Dec 13, 2018

utACK 4de11a3

@MarcoFalke MarcoFalke merged commit 4de11a3 into bitcoin:master Dec 13, 2018
2 checks passed
MarcoFalke added a commit that referenced this issue Dec 13, 2018
4de11a3 Remove Python 2 import workarounds (practicalswift)

Pull request description:

  Remove Python 2 import workarounds.

  As noted by @jnewbery in #14903 (comment):

  > This exception handling is a vestige from when github-merge.py supported Python 2 and Python 3. We only support Python 3 now so we should be able to remove it entirely and just import from urllib.request.

Tree-SHA512: e0d21e6299dd62fb669ad95cbd3d19f7c803195fd336621aac72fd10ddc7431d90443831072a2e1eb2fc880d1d88eb7c3e2ead3da59f545f6db07d349af98fb3
@practicalswift practicalswift deleted the remove-python-2-workarounds branch Apr 10, 2021
pravblockc added a commit to pravblockc/dash that referenced this issue Aug 2, 2021
4de11a3 Remove Python 2 import workarounds (practicalswift)

Pull request description:

  Remove Python 2 import workarounds.

  As noted by @jnewbery in bitcoin#14903 (comment):

  > This exception handling is a vestige from when github-merge.py supported Python 2 and Python 3. We only support Python 3 now so we should be able to remove it entirely and just import from urllib.request.

Tree-SHA512: e0d21e6299dd62fb669ad95cbd3d19f7c803195fd336621aac72fd10ddc7431d90443831072a2e1eb2fc880d1d88eb7c3e2ead3da59f545f6db07d349af98fb3
pravblockc added a commit to pravblockc/dash that referenced this issue Aug 3, 2021
4de11a3 Remove Python 2 import workarounds (practicalswift)

Pull request description:

  Remove Python 2 import workarounds.

  As noted by @jnewbery in bitcoin#14903 (comment):

  > This exception handling is a vestige from when github-merge.py supported Python 2 and Python 3. We only support Python 3 now so we should be able to remove it entirely and just import from urllib.request.

Tree-SHA512: e0d21e6299dd62fb669ad95cbd3d19f7c803195fd336621aac72fd10ddc7431d90443831072a2e1eb2fc880d1d88eb7c3e2ead3da59f545f6db07d349af98fb3
pravblockc added a commit to pravblockc/dash that referenced this issue Aug 3, 2021
4de11a3 Remove Python 2 import workarounds (practicalswift)

Pull request description:

  Remove Python 2 import workarounds.

  As noted by @jnewbery in bitcoin#14903 (comment):

  > This exception handling is a vestige from when github-merge.py supported Python 2 and Python 3. We only support Python 3 now so we should be able to remove it entirely and just import from urllib.request.

Tree-SHA512: e0d21e6299dd62fb669ad95cbd3d19f7c803195fd336621aac72fd10ddc7431d90443831072a2e1eb2fc880d1d88eb7c3e2ead3da59f545f6db07d349af98fb3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants