commit 50dcee69d069a18374463ade2ffa85f0d3e83c40
parent 03b4868bf84340ba0d5c847e3eec07b227f123d6
Author: Neil Booth <kyuupichan@gmail.com>
Date: Sat, 5 Dec 2015 21:38:20 +0900
Clean up imports in daemon.py
Diffstat:
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/daemon.py b/lib/daemon.py
@@ -16,16 +16,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import socket, os
import jsonrpclib
from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer, SimpleJSONRPCRequestHandler
-import util
-from util import print_msg, print_error, print_stderr, json_encode, json_decode, set_verbosity, InvalidPassword
+from util import json_decode, DaemonThread
from wallet import WalletStorage, Wallet
from commands import known_commands, Commands
from simple_config import SimpleConfig
-from network import Network
def get_daemon(config):
@@ -54,10 +51,10 @@ class RequestHandler(SimpleJSONRPCRequestHandler):
-class Daemon(util.DaemonThread):
+class Daemon(DaemonThread):
def __init__(self, config, network, gui=None):
- util.DaemonThread.__init__(self)
+ DaemonThread.__init__(self)
self.config = config
self.network = network
self.gui = gui
@@ -154,4 +151,4 @@ class Daemon(util.DaemonThread):
def stop(self):
for k, wallet in self.wallets.items():
wallet.stop_threads()
- util.DaemonThread.stop(self)
+ DaemonThread.stop(self)