highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-03 09:43:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #14947: scripts: Remove Python 2 import workarounds

Browse Source 
4de11a3682 Remove Python 2 import workarounds (practicalswift)

Pull request description:

  Remove Python 2 import workarounds.

  As noted by @jnewbery in https://github.com/bitcoin/bitcoin/pull/14903#discussion_r241396925:

  > 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
This commit is contained in:
MarcoFalke
2018-12-13 12:35:00 -05:00
parent d88d1f8c2f 4de11a3682
commit 9a43344430
4 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/util/bitcoin-util-test.py
View File

@@ -9,14 +9,9 @@ Runs automatically during `make check`.
Can also be run manually."""
from __future__ import division,print_function,unicode_literals
import argparse
import binascii
try:
import configparser
except ImportError:
import ConfigParser as configparser
import configparser
import difflib
import json
import logging