From 7578ce23315d6b34f40aa398af8ec045c2af9a51 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Mon, 23 Oct 2017 13:54:09 +0200 Subject: [PATCH] cleanup py2 compatibility imports --- gui/qt/address_dialog.py | 5 ----- gui/qt/address_list.py | 7 ------- gui/qt/amountedit.py | 5 ----- gui/qt/console.py | 5 ----- gui/qt/contact_list.py | 6 ------ gui/qt/fee_slider.py | 5 ----- gui/qt/history_list.py | 6 ------ gui/qt/installwizard.py | 5 ----- gui/qt/invoice_list.py | 5 ----- gui/qt/network_dialog.py | 8 +------- gui/qt/password_dialog.py | 5 ----- gui/qt/paytoedit.py | 5 ----- gui/qt/qrcodewidget.py | 5 ----- gui/qt/qrtextedit.py | 5 ----- gui/qt/qrwindow.py | 5 ----- gui/qt/request_list.py | 6 ------ gui/qt/seed_dialog.py | 5 ----- gui/qt/transaction_dialog.py | 6 ------ gui/qt/util.py | 8 +------- 19 files changed, 2 insertions(+), 105 deletions(-) diff --git a/gui/qt/address_dialog.py b/gui/qt/address_dialog.py index 0c7d21a87..3dc078bd3 100644 --- a/gui/qt/address_dialog.py +++ b/gui/qt/address_dialog.py @@ -22,12 +22,7 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six from electrum.i18n import _ import PyQt5 diff --git a/gui/qt/address_list.py b/gui/qt/address_list.py index c0364f44f..e07c8617f 100644 --- a/gui/qt/address_list.py +++ b/gui/qt/address_list.py @@ -22,13 +22,6 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -import six - import webbrowser from .util import * diff --git a/gui/qt/amountedit.py b/gui/qt/amountedit.py index 77462bc39..8b8d22b82 100644 --- a/gui/qt/amountedit.py +++ b/gui/qt/amountedit.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six from PyQt5.QtCore import * from PyQt5.QtGui import * from PyQt5.QtWidgets import (QLineEdit, QStyle, QStyleOptionFrame) diff --git a/gui/qt/console.py b/gui/qt/console.py index 4fb7e0150..5016e4514 100644 --- a/gui/qt/console.py +++ b/gui/qt/console.py @@ -1,9 +1,4 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six # source: http://stackoverflow.com/questions/2758159/how-to-embed-a-python-interpreter-in-a-pyqt-widget import sys, os, re diff --git a/gui/qt/contact_list.py b/gui/qt/contact_list.py index f8da4a7ad..acb6b5576 100644 --- a/gui/qt/contact_list.py +++ b/gui/qt/contact_list.py @@ -22,13 +22,7 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import webbrowser -import six from electrum.i18n import _ from electrum.bitcoin import is_address diff --git a/gui/qt/fee_slider.py b/gui/qt/fee_slider.py index 3394674a1..2574adda0 100644 --- a/gui/qt/fee_slider.py +++ b/gui/qt/fee_slider.py @@ -1,9 +1,4 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six from electrum.i18n import _ import PyQt5 diff --git a/gui/qt/history_list.py b/gui/qt/history_list.py index 561b19bc9..52ec7cb43 100644 --- a/gui/qt/history_list.py +++ b/gui/qt/history_list.py @@ -22,12 +22,6 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -import six import webbrowser diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index e5ca910da..603b17734 100644 --- a/gui/qt/installwizard.py +++ b/gui/qt/installwizard.py @@ -1,9 +1,4 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six import sys import os diff --git a/gui/qt/invoice_list.py b/gui/qt/invoice_list.py index 4692e1b56..3c4304743 100644 --- a/gui/qt/invoice_list.py +++ b/gui/qt/invoice_list.py @@ -22,12 +22,7 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six from .util import * from electrum.i18n import _ diff --git a/gui/qt/network_dialog.py b/gui/qt/network_dialog.py index c17aaa2d8..a95485173 100644 --- a/gui/qt/network_dialog.py +++ b/gui/qt/network_dialog.py @@ -23,14 +23,8 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. - -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import socket -import six + from PyQt5.QtGui import * from PyQt5.QtCore import * import PyQt5.QtCore as QtCore diff --git a/gui/qt/password_dialog.py b/gui/qt/password_dialog.py index 6a59daebe..c5f1395bc 100644 --- a/gui/qt/password_dialog.py +++ b/gui/qt/password_dialog.py @@ -22,12 +22,7 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six from PyQt5.QtGui import * from PyQt5.QtCore import * from electrum.i18n import _ diff --git a/gui/qt/paytoedit.py b/gui/qt/paytoedit.py index 224836f3a..0151e0f37 100644 --- a/gui/qt/paytoedit.py +++ b/gui/qt/paytoedit.py @@ -22,12 +22,7 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six from PyQt5.QtCore import * from PyQt5.QtGui import * from PyQt5.QtWidgets import QCompleter, QPlainTextEdit diff --git a/gui/qt/qrcodewidget.py b/gui/qt/qrcodewidget.py index 9fdb68774..387e0828d 100644 --- a/gui/qt/qrcodewidget.py +++ b/gui/qt/qrcodewidget.py @@ -1,9 +1,4 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six from PyQt5.QtGui import * from PyQt5.QtCore import * import PyQt5.QtGui as QtGui diff --git a/gui/qt/qrtextedit.py b/gui/qt/qrtextedit.py index d539f0ae2..42d999c00 100644 --- a/gui/qt/qrtextedit.py +++ b/gui/qt/qrtextedit.py @@ -1,9 +1,4 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six from electrum.i18n import _ from electrum.plugins import run_hook from PyQt5.QtGui import * diff --git a/gui/qt/qrwindow.py b/gui/qt/qrwindow.py index d53c84126..23f09a35b 100644 --- a/gui/qt/qrwindow.py +++ b/gui/qt/qrwindow.py @@ -22,12 +22,7 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six import re import platform from decimal import Decimal diff --git a/gui/qt/request_list.py b/gui/qt/request_list.py index c21030f64..9c9db5265 100644 --- a/gui/qt/request_list.py +++ b/gui/qt/request_list.py @@ -22,12 +22,6 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -import six from electrum.i18n import _ from electrum.util import block_explorer_URL, format_satoshis, format_time, age diff --git a/gui/qt/seed_dialog.py b/gui/qt/seed_dialog.py index 9704147b3..084dd84e8 100644 --- a/gui/qt/seed_dialog.py +++ b/gui/qt/seed_dialog.py @@ -22,12 +22,7 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -import six from PyQt5.QtGui import * from PyQt5.QtCore import * from electrum.i18n import _ diff --git a/gui/qt/transaction_dialog.py b/gui/qt/transaction_dialog.py index 722201873..992472058 100644 --- a/gui/qt/transaction_dialog.py +++ b/gui/qt/transaction_dialog.py @@ -22,12 +22,6 @@ # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -import six import copy import datetime import json diff --git a/gui/qt/util.py b/gui/qt/util.py index 445cefce0..45e7e5f3e 100644 --- a/gui/qt/util.py +++ b/gui/qt/util.py @@ -1,16 +1,10 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -import six import os.path import time import traceback import sys import threading import platform -from six.moves import queue +import queue from collections import namedtuple from functools import partial