commit 7578ce23315d6b34f40aa398af8ec045c2af9a51
parent 6e0e5a8d57fa8811d64c8cb0b8a57ffda89b2496
Author: ThomasV <thomasv@electrum.org>
Date: Mon, 23 Oct 2017 13:54:09 +0200
cleanup py2 compatibility imports
Diffstat:
19 files changed, 2 insertions(+), 105 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
