diff options
| author | practicalswift <practicalswift@users.noreply.github.com> | 2018-12-13 14:53:30 +0100 |
|---|---|---|
| committer | practicalswift <practicalswift@users.noreply.github.com> | 2018-12-13 16:46:31 +0100 |
| commit | 4de11a3682cc46fa2f81af8961eef360bedfa3a6 (patch) | |
| tree | 07c4e4ee9312ad92b854567422c7cc8638670dbb /contrib/linearize | |
| parent | 20c54eef6e41216a99b16bab2b5a7c0fb701f46e (diff) | |
| download | bitcoin-4de11a3682cc46fa2f81af8961eef360bedfa3a6.tar.xz | |
Remove Python 2 import workarounds
Diffstat (limited to 'contrib/linearize')
| -rwxr-xr-x | contrib/linearize/linearize-data.py | 1 | ||||
| -rwxr-xr-x | contrib/linearize/linearize-hashes.py | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py index b6ead4a166..56c1fbfc92 100755 --- a/contrib/linearize/linearize-data.py +++ b/contrib/linearize/linearize-data.py @@ -7,7 +7,6 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. # -from __future__ import print_function, division import struct import re import os diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index 911c3c959d..e10b46d831 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -7,11 +7,7 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. # -from __future__ import print_function -try: # Python 3 - import http.client as httplib -except ImportError: # Python 2 - import httplib +from http.client import HttpConnection import json import re import base64 @@ -31,7 +27,7 @@ class BitcoinRPC: authpair = "%s:%s" % (username, password) authpair = authpair.encode('utf-8') self.authhdr = b"Basic " + base64.b64encode(authpair) - self.conn = httplib.HTTPConnection(host, port=port, timeout=30) + self.conn = HttpConnection(host, port=port, timeout=30) def execute(self, obj): try: |