From 5665b4299972e923c8d148c72b6033fa86e65eac Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Tue, 24 Oct 2017 14:04:16 +0200
Subject: [PATCH] remove six

---
 electrum                        |  4 +---
 lib/tests/test_account.py       | 15 ---------------
 lib/tests/test_bitcoin.py       |  6 ------
 lib/tests/test_interface.py     |  6 ------
 lib/tests/test_mnemonic.py      |  6 ------
 lib/tests/test_simple_config.py |  8 +-------
 lib/tests/test_transaction.py   |  6 ------
 lib/tests/test_util.py          |  6 ------
 lib/tests/test_wallet.py        |  8 +-------
 9 files changed, 3 insertions(+), 62 deletions(-)
 delete mode 100644 lib/tests/test_account.py

diff --git a/electrum b/electrum
index f2ba3a581..0ddde7616 100755
--- a/electrum
+++ b/electrum
@@ -25,7 +25,6 @@
 # SOFTWARE.
 import os
 import sys
-import six
 
 # from https://gist.github.com/tito/09c42fb4767721dc323d
 import threading
@@ -63,7 +62,6 @@ def check_imports():
         import pyaes
         import ecdsa
         import requests
-        import six
         import qrcode
         import pbkdf2
         import google.protobuf
@@ -429,7 +427,7 @@ if __name__ == '__main__':
                 result = run_offline_command(config, config_options)
 
                 # print result
-    if isinstance(result, six.text_type):
+    if isinstance(result, str):
         print_msg(result)
     elif type(result) is dict and result.get('error'):
         print_stderr(result.get('error'))
diff --git a/lib/tests/test_account.py b/lib/tests/test_account.py
deleted file mode 100644
index 7f9907d6e..000000000
--- a/lib/tests/test_account.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import six
-import unittest
-
-class Test_Account(unittest.TestCase):
-
-    def test_bip32_account(self):
-        self.assertTrue(True)
-
-    def test_old_account(self):
-        self.assertTrue(True)
diff --git a/lib/tests/test_bitcoin.py b/lib/tests/test_bitcoin.py
index afa97edcb..4ce96ffd0 100644
--- a/lib/tests/test_bitcoin.py
+++ b/lib/tests/test_bitcoin.py
@@ -1,10 +1,4 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import base64
-import six
 import unittest
 import sys
 from ecdsa.util import number_to_string
diff --git a/lib/tests/test_interface.py b/lib/tests/test_interface.py
index 0b04b2310..9b663e6b8 100644
--- a/lib/tests/test_interface.py
+++ b/lib/tests/test_interface.py
@@ -1,9 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import six
 import unittest
 
 from lib import interface
diff --git a/lib/tests/test_mnemonic.py b/lib/tests/test_mnemonic.py
index 51ff82d2a..65d6c3376 100644
--- a/lib/tests/test_mnemonic.py
+++ b/lib/tests/test_mnemonic.py
@@ -1,9 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import six
 import unittest
 from lib import keystore
 from lib import mnemonic
diff --git a/lib/tests/test_simple_config.py b/lib/tests/test_simple_config.py
index 07d875d02..9c33df934 100644
--- a/lib/tests/test_simple_config.py
+++ b/lib/tests/test_simple_config.py
@@ -1,9 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import six
 import ast
 import sys
 import os
@@ -12,7 +6,7 @@ import tempfile
 import shutil
 import json
 
-from six.moves import StringIO
+from io import StringIO
 from lib.simple_config import (SimpleConfig, read_system_config,
                                read_user_config)
 
diff --git a/lib/tests/test_transaction.py b/lib/tests/test_transaction.py
index f264d0a61..a58027d39 100644
--- a/lib/tests/test_transaction.py
+++ b/lib/tests/test_transaction.py
@@ -1,9 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import six
 import unittest
 from lib import transaction
 from lib.bitcoin import TYPE_ADDRESS
diff --git a/lib/tests/test_util.py b/lib/tests/test_util.py
index e7a7b92e5..ea4476ab0 100644
--- a/lib/tests/test_util.py
+++ b/lib/tests/test_util.py
@@ -1,9 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import six
 import unittest
 from lib.util import format_satoshis, parse_URI
 
diff --git a/lib/tests/test_wallet.py b/lib/tests/test_wallet.py
index 23693aebb..7aa9130a6 100644
--- a/lib/tests/test_wallet.py
+++ b/lib/tests/test_wallet.py
@@ -1,9 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import six
 import shutil
 import tempfile
 import sys
@@ -11,7 +5,7 @@ import unittest
 import os
 import json
 
-from six.moves import StringIO
+from io import StringIO
 from lib.storage import WalletStorage, FINAL_SEED_VERSION