Remove Python 2 import workarounds
This commit is contained in:
parent
20c54eef6e
commit
4de11a3682
4 changed files with 4 additions and 18 deletions
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
# In case of a clean merge that is accepted by the user, the local branch with
|
# 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.
|
# name $BRANCH is overwritten with the merged result, and optionally pushed.
|
||||||
from __future__ import division,print_function,unicode_literals
|
|
||||||
import os
|
import os
|
||||||
from sys import stdin,stdout,stderr
|
from sys import stdin,stdout,stderr
|
||||||
import argparse
|
import argparse
|
||||||
|
@ -23,10 +22,7 @@ import subprocess
|
||||||
import sys
|
import sys
|
||||||
import json
|
import json
|
||||||
import codecs
|
import codecs
|
||||||
try:
|
|
||||||
from urllib.request import Request, urlopen
|
from urllib.request import Request, urlopen
|
||||||
except ImportError:
|
|
||||||
from urllib2 import Request,urlopen
|
|
||||||
|
|
||||||
# External tools (can be overridden using environment)
|
# External tools (can be overridden using environment)
|
||||||
GIT = os.getenv('GIT','git')
|
GIT = os.getenv('GIT','git')
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
#
|
#
|
||||||
|
|
||||||
from __future__ import print_function, division
|
|
||||||
import struct
|
import struct
|
||||||
import re
|
import re
|
||||||
import os
|
import os
|
||||||
|
|
|
@ -7,11 +7,7 @@
|
||||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
#
|
#
|
||||||
|
|
||||||
from __future__ import print_function
|
from http.client import HttpConnection
|
||||||
try: # Python 3
|
|
||||||
import http.client as httplib
|
|
||||||
except ImportError: # Python 2
|
|
||||||
import httplib
|
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
import base64
|
import base64
|
||||||
|
@ -31,7 +27,7 @@ class BitcoinRPC:
|
||||||
authpair = "%s:%s" % (username, password)
|
authpair = "%s:%s" % (username, password)
|
||||||
authpair = authpair.encode('utf-8')
|
authpair = authpair.encode('utf-8')
|
||||||
self.authhdr = b"Basic " + base64.b64encode(authpair)
|
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):
|
def execute(self, obj):
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -9,14 +9,9 @@ Runs automatically during `make check`.
|
||||||
|
|
||||||
Can also be run manually."""
|
Can also be run manually."""
|
||||||
|
|
||||||
from __future__ import division,print_function,unicode_literals
|
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import binascii
|
import binascii
|
||||||
try:
|
|
||||||
import configparser
|
import configparser
|
||||||
except ImportError:
|
|
||||||
import ConfigParser as configparser
|
|
||||||
import difflib
|
import difflib
|
||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
|
|
Loading…
Reference in a new issue