From 4de11a3682cc46fa2f81af8961eef360bedfa3a6 Mon Sep 17 00:00:00 2001
From: practicalswift <practicalswift@users.noreply.github.com>
Date: Thu, 13 Dec 2018 14:53:30 +0100
Subject: Remove Python 2 import workarounds

---
 contrib/devtools/github-merge.py      | 6 +-----
 contrib/linearize/linearize-data.py   | 1 -
 contrib/linearize/linearize-hashes.py | 8 ++------
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'contrib')

diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
index c7a64bd6f9..4f827401fb 100755
--- a/contrib/devtools/github-merge.py
+++ b/contrib/devtools/github-merge.py
@@ -14,7 +14,6 @@
 
 # In case of a clean merge that is accepted by the user, the local branch with
 # name $BRANCH is overwritten with the merged result, and optionally pushed.
-from __future__ import division,print_function,unicode_literals
 import os
 from sys import stdin,stdout,stderr
 import argparse
@@ -23,10 +22,7 @@ import subprocess
 import sys
 import json
 import codecs
-try:
-    from urllib.request import Request,urlopen
-except ImportError:
-    from urllib2 import Request,urlopen
+from urllib.request import Request, urlopen
 
 # External tools (can be overridden using environment)
 GIT = os.getenv('GIT','git')
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:
-- 
cgit v1.2.3