misc python3 updates:

- use jsonrpclib-pelix
 - update the kivy gui
 - update plugins

lib/daemon.py

@@ -34,8 +34,8 @@ import sys
 import time
 
 # from jsonrpc import JSONRPCResponseManager
-# import jsonrpclib
-# from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer, SimpleJSONRPCRequestHandler
+import jsonrpclib
+from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer, SimpleJSONRPCRequestHandler
 
 from .version import ELECTRUM_VERSION
 from .network import Network
@@ -96,17 +96,17 @@ def get_server(config):
         time.sleep(1.0)
 
 
-# class RequestHandler(SimpleJSONRPCRequestHandler):
-#
-#     def do_OPTIONS(self):
-#         self.send_response(200)
-#         self.end_headers()
-#
-#     def end_headers(self):
-#         self.send_header("Access-Control-Allow-Headers",
-#                          "Origin, X-Requested-With, Content-Type, Accept")
-#         self.send_header("Access-Control-Allow-Origin", "*")
-#         SimpleJSONRPCRequestHandler.end_headers(self)
+class RequestHandler(SimpleJSONRPCRequestHandler):
+
+     def do_OPTIONS(self):
+         self.send_response(200)
+         self.end_headers()
+
+     def end_headers(self):
+         self.send_header("Access-Control-Allow-Headers",
+                          "Origin, X-Requested-With, Content-Type, Accept")
+         self.send_header("Access-Control-Allow-Origin", "*")
+         SimpleJSONRPCRequestHandler.end_headers(self)
 
 
 class Daemon(DaemonThread):
@@ -132,24 +132,23 @@ class Daemon(DaemonThread):
     def init_server(self, config, fd):
         host = config.get('rpchost', '127.0.0.1')
         port = config.get('rpcport', 0)
-        # try:
-        #     server = SimpleJSONRPCServer((host, port), logRequests=False, requestHandler=RequestHandler)
-        # except Exception as e:
-        #     self.print_error('Warning: cannot initialize RPC server on host', host, e)
-        #     self.server = None
-        #     os.close(fd)
-        #     return
-        # os.write(fd, bytes(repr((server.socket.getsockname(), time.time())), 'utf8'))
-        # os.close(fd)
-        # server.timeout = 0.1
-        # for cmdname in known_commands:
-        #     server.register_function(getattr(self.cmd_runner, cmdname), cmdname)
-        # server.register_function(self.run_cmdline, 'run_cmdline')
-        # server.register_function(self.ping, 'ping')
-        # server.register_function(self.run_daemon, 'daemon')
-        # server.register_function(self.run_gui, 'gui')
-        # self.server = server
-        self.server = None
+        try:
+            server = SimpleJSONRPCServer((host, port), logRequests=False, requestHandler=RequestHandler)
+        except Exception as e:
+            self.print_error('Warning: cannot initialize RPC server on host', host, e)
+            self.server = None
+            os.close(fd)
+            return
+        os.write(fd, bytes(repr((server.socket.getsockname(), time.time())), 'utf8'))
+        os.close(fd)
+        server.timeout = 0.1
+        for cmdname in known_commands:
+            server.register_function(getattr(self.cmd_runner, cmdname), cmdname)
+        server.register_function(self.run_cmdline, 'run_cmdline')
+        server.register_function(self.ping, 'ping')
+        server.register_function(self.run_daemon, 'daemon')
+        server.register_function(self.run_gui, 'gui')
+        self.server = server
 
     def ping(self):
         return True

lib/network.py

@@ -122,7 +122,7 @@ def parse_servers(result):
                     pruning_level = v[1:]
                 if pruning_level == '': pruning_level = '0'
         try:
-            is_recent = cmp(util.normalize_version(version), util.normalize_version(PROTOCOL_VERSION)) >= 0
+            is_recent = util.normalize_version(version) >= util.normalize_version(PROTOCOL_VERSION)
         except Exception as e:
             print_error(e)
             is_recent = False

lib/util.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
 # Electrum - lightweight Bitcoin client
 # Copyright (C) 2011 Thomas Voegtlin
 #

lib/wallet.py

@@ -42,7 +42,7 @@ from functools import partial
 from collections import namedtuple, defaultdict
 
 from .i18n import _
-from .util import NotEnoughFunds, PrintError, UserCancelled, profiler
+from .util import NotEnoughFunds, PrintError, UserCancelled, profiler, format_satoshis
 
 from .bitcoin import *
 from .version import *
@@ -59,6 +59,7 @@ from .verifier import SPV
 from .mnemonic import Mnemonic
 
 from . import paymentrequest
+from .paymentrequest import PR_PAID, PR_UNPAID, PR_UNKNOWN, PR_EXPIRED
 
 from .storage import WalletStorage
 
@@ -1183,12 +1184,11 @@ class Abstract_Wallet(PrintError):
         return False, None
 
     def get_payment_request(self, addr, config):
-        import util
         r = self.receive_requests.get(addr)
         if not r:
             return
         out = copy.copy(r)
-        out['URI'] = 'bitcoin:' + addr + '?amount=' + util.format_satoshis(out.get('amount'))
+        out['URI'] = 'bitcoin:' + addr + '?amount=' + format_satoshis(out.get('amount'))
         status, conf = self.get_request_status(addr)
         out['status'] = status
         if conf is not None:
@@ -1219,7 +1219,6 @@ class Abstract_Wallet(PrintError):
         return out
 
     def get_request_status(self, key):
-        from paymentrequest import PR_PAID, PR_UNPAID, PR_UNKNOWN, PR_EXPIRED
         r = self.receive_requests.get(key)
         if r is None:
             return PR_UNKNOWN