diff options
| author | practicalswift <[email protected]> | 2018-12-13 14:53:30 +0100 |
|---|---|---|
| committer | practicalswift <[email protected]> | 2018-12-13 16:46:31 +0100 |
| commit | 4de11a3682cc46fa2f81af8961eef360bedfa3a6 (patch) | |
| tree | 07c4e4ee9312ad92b854567422c7cc8638670dbb /contrib/linearize/linearize-hashes.py | |
| parent | Merge #14834: validation: assert that pindexPrev is non-null when required (diff) | |
| download | discoin-4de11a3682cc46fa2f81af8961eef360bedfa3a6.tar.xz discoin-4de11a3682cc46fa2f81af8961eef360bedfa3a6.zip | |
Remove Python 2 import workarounds
Diffstat (limited to 'contrib/linearize/linearize-hashes.py')
| -rwxr-xr-x | contrib/linearize/linearize-hashes.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index 911c3c959..e10b46d83 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: |