tremove six - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 5665b4299972e923c8d148c72b6033fa86e65eac
DIR parent 93b6abe7012f8cd4c2880bf5dfe9d7c22eae2d9d
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 24 Oct 2017 14:04:16 +0200
remove six
Diffstat:
M electrum | 4 +---
D lib/tests/test_account.py | 15 ---------------
M lib/tests/test_bitcoin.py | 6 ------
M lib/tests/test_interface.py | 6 ------
M lib/tests/test_mnemonic.py | 6 ------
M lib/tests/test_simple_config.py | 8 +-------
M lib/tests/test_transaction.py | 6 ------
M lib/tests/test_util.py | 6 ------
M lib/tests/test_wallet.py | 8 +-------
9 files changed, 3 insertions(+), 62 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -25,7 +25,6 @@
# SOFTWARE.
import os
import sys
-import six
# from https://gist.github.com/tito/09c42fb4767721dc323d
import threading
t@@ -63,7 +62,6 @@ def check_imports():
import pyaes
import ecdsa
import requests
- import six
import qrcode
import pbkdf2
import google.protobuf
t@@ -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'))
DIR diff --git a/lib/tests/test_account.py b/lib/tests/test_account.py
t@@ -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)
DIR diff --git a/lib/tests/test_bitcoin.py b/lib/tests/test_bitcoin.py
t@@ -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
DIR diff --git a/lib/tests/test_interface.py b/lib/tests/test_interface.py
t@@ -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
DIR diff --git a/lib/tests/test_mnemonic.py b/lib/tests/test_mnemonic.py
t@@ -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
DIR diff --git a/lib/tests/test_simple_config.py b/lib/tests/test_simple_config.py
t@@ -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
t@@ -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)
DIR diff --git a/lib/tests/test_transaction.py b/lib/tests/test_transaction.py
t@@ -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
DIR diff --git a/lib/tests/test_util.py b/lib/tests/test_util.py
t@@ -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
DIR diff --git a/lib/tests/test_wallet.py b/lib/tests/test_wallet.py
t@@ -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
t@@ -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