tsmall import clean-up - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 1ef804c652991337dedfa3d8749eff2820549c52
DIR parent cd5453e4779c773a6b295a6483db6bdc3ab6a777
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Thu, 11 Oct 2018 16:30:30 +0200
small import clean-up
Diffstat:
M electrum/base_crash_reporter.py | 4 ++--
M electrum/contacts.py | 4 +---
M electrum/jsonrpc.py | 3 ++-
M electrum/mnemonic.py | 1 -
M electrum/websockets.py | 4 ++--
M electrum/x509.py | 10 +++++++---
6 files changed, 14 insertions(+), 12 deletions(-)
---
DIR diff --git a/electrum/base_crash_reporter.py b/electrum/base_crash_reporter.py
t@@ -28,11 +28,11 @@ import sys
import os
from .version import ELECTRUM_VERSION
-from .import constants
+from . import constants
from .i18n import _
-
from .util import make_aiohttp_session
+
class BaseCrashReporter:
report_server = "https://crashhub.electrum.org"
config_key = "show_crash_reporter"
DIR diff --git a/electrum/contacts.py b/electrum/contacts.py
t@@ -21,11 +21,9 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
import re
+
import dns
from dns.exception import DNSException
-import json
-import traceback
-import sys
from . import bitcoin
from . import dnssec
DIR diff --git a/electrum/jsonrpc.py b/electrum/jsonrpc.py
t@@ -23,10 +23,11 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer, SimpleJSONRPCRequestHandler
from base64 import b64decode
import time
+from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer, SimpleJSONRPCRequestHandler
+
from . import util
DIR diff --git a/electrum/mnemonic.py b/electrum/mnemonic.py
t@@ -23,7 +23,6 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
import os
-import hmac
import math
import hashlib
import unicodedata
DIR diff --git a/electrum/websockets.py b/electrum/websockets.py
t@@ -27,7 +27,7 @@ import os
import json
from collections import defaultdict
import asyncio
-from typing import Dict, List
+from typing import Dict, List, Tuple
import traceback
import sys
t@@ -64,7 +64,7 @@ class BalanceMonitor(SynchronizerBase):
def __init__(self, config, network):
SynchronizerBase.__init__(self, network)
self.config = config
- self.expected_payments = defaultdict(list) # type: Dict[str, List[WebSocket, int]]
+ self.expected_payments = defaultdict(list) # type: Dict[str, List[Tuple[WebSocket, int]]]
def make_request(self, request_id):
# read json file
DIR diff --git a/electrum/x509.py b/electrum/x509.py
t@@ -22,12 +22,16 @@
# 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 . import util
-from .util import profiler, bh2u
-import ecdsa
+
import hashlib
import time
+import ecdsa
+
+from . import util
+from .util import profiler, bh2u
+
+
# algo OIDs
ALGO_RSA_SHA1 = '1.2.840.113549.1.1.5'
ALGO_RSA_SHA256 = '1.2.840.113549.1.1.11'