From e9832e44080502abd7fb2b3896da6b860b7dc0c0 Mon Sep 17 00:00:00 2001 From: Sergi Delgado Segura Date: Thu, 3 Oct 2019 11:47:07 +0100 Subject: [PATCH] More clean up --- pisa/__init__.py | 4 +++- pisa/api.py | 6 ++++-- pisa/appointment.py | 2 -- pisa/encrypted_blob.py | 2 +- pisa/inspector.py | 3 ++- pisa/pisad.py | 1 + pisa/tools.py | 3 ++- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pisa/__init__.py b/pisa/__init__.py index 70e02c2..a279a5c 100644 --- a/pisa/__init__.py +++ b/pisa/__init__.py @@ -1,6 +1,8 @@ +import logging + from pisa.utils.auth_proxy import AuthServiceProxy import pisa.conf as conf -import logging + HOST = 'localhost' PORT = 9814 diff --git a/pisa/api.py b/pisa/api.py index 8f26037..660e5f0 100644 --- a/pisa/api.py +++ b/pisa/api.py @@ -1,9 +1,11 @@ +import json +from flask import Flask, request, Response, abort, jsonify + from pisa import HOST, PORT, logging, bitcoin_cli from pisa.watcher import Watcher from pisa.inspector import Inspector from pisa.appointment import Appointment -from flask import Flask, request, Response, abort, jsonify -import json + # ToDo: #5-add-async-to-api app = Flask(__name__) diff --git a/pisa/appointment.py b/pisa/appointment.py index f58538b..a4d5718 100644 --- a/pisa/appointment.py +++ b/pisa/appointment.py @@ -21,5 +21,3 @@ class Appointment: # ToDO: #3-improve-appointment-structure - - diff --git a/pisa/encrypted_blob.py b/pisa/encrypted_blob.py index 49fd4af..5c1b78f 100644 --- a/pisa/encrypted_blob.py +++ b/pisa/encrypted_blob.py @@ -1,5 +1,5 @@ -from binascii import unhexlify, hexlify from hashlib import sha256 +from binascii import unhexlify, hexlify from cryptography.hazmat.primitives.ciphers.aead import AESGCM diff --git a/pisa/inspector.py b/pisa/inspector.py index 5b23cb3..25bb344 100644 --- a/pisa/inspector.py +++ b/pisa/inspector.py @@ -1,6 +1,7 @@ import re -import pisa.conf as conf + from pisa import errors +import pisa.conf as conf from pisa import logging, bitcoin_cli from pisa.appointment import Appointment from pisa.utils.auth_proxy import JSONRPCException diff --git a/pisa/pisad.py b/pisa/pisad.py index bd1cc82..8fbce83 100644 --- a/pisa/pisad.py +++ b/pisa/pisad.py @@ -1,5 +1,6 @@ from sys import argv from getopt import getopt + from pisa import logging from pisa.api import start_api from pisa.tools import can_connect_to_bitcoind, in_correct_network diff --git a/pisa/tools.py b/pisa/tools.py index 3162ee2..909c64c 100644 --- a/pisa/tools.py +++ b/pisa/tools.py @@ -1,9 +1,10 @@ import re +from http.client import HTTPException + import pisa.conf as conf from pisa import logging, bitcoin_cli from pisa.utils.auth_proxy import JSONRPCException from pisa.rpc_errors import RPC_INVALID_ADDRESS_OR_KEY -from http.client import HTTPException def check_tx_in_chain(tx_id, parent='', tx_label='transaction'):