From 4de11a3682cc46fa2f81af8961eef360bedfa3a6 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Thu, 13 Dec 2018 14:53:30 +0100 Subject: Remove Python 2 import workarounds --- contrib/linearize/linearize-hashes.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'contrib/linearize/linearize-hashes.py') 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: -- cgit v1.2.3