1
0

cleanup six (no python2 support)

This commit is contained in:
ThomasV
2017-09-04 14:43:31 +02:00
parent f8c592f743
commit 216e9403be
21 changed files with 33 additions and 100 deletions

View File

@@ -27,7 +27,6 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import six
import hashlib
import os.path
import re
@@ -38,7 +37,7 @@ import traceback
import json
import requests
from six.moves import urllib_parse
import urllib.parse
try:
@@ -78,7 +77,7 @@ PR_PAID = 3 # send and propagated
def get_payment_request(url):
u = urllib_parse.urlparse(url)
u = urllib.parse.urlparse(url)
error = None
if u.scheme in ['http', 'https']:
try:
@@ -277,7 +276,7 @@ class PaymentRequest:
ref_out.script = transaction.Transaction.pay_script(TYPE_ADDRESS, refund_addr)
paymnt.memo = "Paid using Electrum"
pm = paymnt.SerializeToString()
payurl = urllib_parse.urlparse(pay_det.payment_url)
payurl = urllib.parse.urlparse(pay_det.payment_url)
try:
r = requests.post(payurl.geturl(), data=pm, headers=ACK_HEADERS, verify=ca_path)
except requests.exceptions.SSLError: