diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-12-13 12:35:00 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-12-13 12:35:22 -0500 |
| commit | 9a4334443085970a42792db3528695585fe7053b (patch) | |
| tree | 21e0eb54b24b2722b41a1710d38ff867a715b07f /test | |
| parent | d88d1f8c2f77d6806f3a25680c3a117594f8282f (diff) | |
| parent | 4de11a3682cc46fa2f81af8961eef360bedfa3a6 (diff) | |
| download | bitcoin-9a4334443085970a42792db3528695585fe7053b.tar.xz | |
Merge #14947: scripts: Remove Python 2 import workarounds
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
Diffstat (limited to 'test')
| -rwxr-xr-x | test/util/bitcoin-util-test.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test/util/bitcoin-util-test.py b/test/util/bitcoin-util-test.py index 92fef30e13..7b1cc2b031 100755 --- a/test/util/bitcoin-util-test.py +++ b/test/util/bitcoin-util-test.py @@ -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 |