tClean up imports; use self.print_error - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 695aebaa803d720453478687116941ddc0fc0c17
DIR parent 91049c8af8255fedea9e151490fa13b4a023b743
HTML Author: Neil Booth <kyuupichan@gmail.com>
Date: Thu, 27 Aug 2015 15:12:54 +0900
Clean up imports; use self.print_error
Diffstat:
M lib/network_proxy.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
---
DIR diff --git a/lib/network_proxy.py b/lib/network_proxy.py
t@@ -22,11 +22,8 @@ import threading
import Queue
import util
-from network import Network
-from util import print_error
+from network import Network, serialize_proxy, serialize_server
from simple_config import SimpleConfig
-from network import serialize_proxy, serialize_server
-
class NetworkProxy(util.DaemonThread):
t@@ -87,7 +84,7 @@ class NetworkProxy(util.DaemonThread):
def process(self, response):
if self.debug:
- print_error("<--", response)
+ self.print_error("<--", response)
if response.get('method') == 'network.status':
key, value = response.get('params')
t@@ -124,11 +121,12 @@ class NetworkProxy(util.DaemonThread):
callback = k
break
else:
- print_error( "received unexpected notification", method, params)
+ self.print_error("received unexpected notification",
+ method, params)
return
-
- r = {'method':method, 'params':params, 'result':result, 'id':msg_id, 'error':error}
+ r = {'method':method, 'params':params, 'result':result,
+ 'id':msg_id, 'error':error}
callback(r)
t@@ -159,7 +157,7 @@ class NetworkProxy(util.DaemonThread):
ids.append(self.message_id)
requests.append(request)
if self.debug:
- print_error("-->", request)
+ self.print_error("-->", request)
self.message_id += 1
self.pipe.send_all(requests)