scripts: Remove Python 2 import workarounds #14947

pull practicalswift wants to merge 1 commits into bitcoin:master from practicalswift:remove-python-2-workarounds changing 4 files +4 −18

practicalswift commented at 1:54 PM on December 13, 2018: contributor

Remove Python 2 import workarounds.

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

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.
fanquake added the label Tests on Dec 13, 2018
fanquake added the label Scripts and tools on Dec 13, 2018
practicalswift renamed this:
~~Remove Python 2 import workarounds~~
scripts: Remove Python 2 import workarounds
on Dec 13, 2018
fanquake commented at 2:25 PM on December 13, 2018: member

utACK 9c5ca39
fanquake requested review from jnewbery on Dec 13, 2018
laanwj commented at 2:54 PM on December 13, 2018: member

Apparently I merged #14903 too soon, sorry.
jnewbery commented at 3:08 PM on December 13, 2018: member

Apparently I merged #14903 too soon, sorry.

Nah. Better is better! Plus, I only noticed it and commented because mergebot told me about it!
in contrib/linearize/linearize-hashes.py:11 in 9c5ca399c5 outdated
```
   7 | @@ -8,10 +8,7 @@
   8 |  #
   9 |  
  10 |  from __future__ import print_function
  11 | -try: # Python 3
  12 | -    import http.client as httplib
  13 | -except ImportError: # Python 2
  14 | -    import httplib
  15 | +import http.client as httplib
```
jnewbery commented at 3:11 PM on December 13, 2018:

Keeping this alias seems strange. I think better to just import the one symbol that is being used:

from http.client import HttpConnection

(and then change httplib.HTTPConnection to HTTPConnection lower down)
jnewbery commented at 3:16 PM on December 13, 2018: member

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).
practicalswift force-pushed on Dec 13, 2018
practicalswift commented at 3:42 PM on December 13, 2018: contributor

@jnewbery Good points! Feedback addressed. Please re-review :-)
Remove Python 2 import workarounds 4de11a3682
practicalswift force-pushed on Dec 13, 2018
jnewbery commented at 4:25 PM on December 13, 2018: member

utACK 4de11a3682cc46fa2f81af8961eef360bedfa3a6
MarcoFalke merged this on Dec 13, 2018
MarcoFalke closed this on Dec 13, 2018
MarcoFalke referenced this in commit 9a43344430 on Dec 13, 2018
practicalswift deleted the branch on Apr 10, 2021
pravblockc referenced this in commit 9dd702cd5a on Aug 2, 2021
pravblockc referenced this in commit a41ca898dc on Aug 3, 2021
pravblockc referenced this in commit a309982e82 on Aug 3, 2021
DrahtBot locked this on Aug 18, 2022

Contributors

Labels

Tests Scripts and tools

Linked (view graph)

#14903 tests: Handle ImportError explicitly, improve comparisons against None