Merge #7778: [qa] Bug fixes and refactor

4444806 [qa] mininode: Combine struct.pack format strings (MarcoFalke)
faaa3c9 [qa] mininode: Catch exceptions in got_data (MarcoFalke)
fa2cea1 [qa] rpc-tests: Properly use integers, floats (MarcoFalke)
fa524d9 [qa] Use python2/3 syntax (MarcoFalke)

1 files changed, 3 insertions, 3 deletions

diff --git a/qa/rpc-tests/wallet.py b/qa/rpc-tests/wallet.py
index e6ce397119..cb876aae5c 100755
--- a/qa/rpc-tests/wallet.py
+++ b/qa/rpc-tests/wallet.py
@@ -249,7 +249,7 @@ class WalletTest (BitcoinTestFramework):
         errorString = ""
         try:
             txId  = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), "1f-4")
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             errorString = e.error['message']
 
         assert("Invalid amount" in errorString)
@@ -257,7 +257,7 @@ class WalletTest (BitcoinTestFramework):
         errorString = ""
         try:
             self.nodes[0].generate("2") #use a string to as block amount parameter must fail because it's not interpreted as amount
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             errorString = e.error['message']
 
         assert("not an integer" in errorString)
@@ -271,7 +271,7 @@ class WalletTest (BitcoinTestFramework):
         # Check that the txid and balance is found by node1
         try:
             self.nodes[1].gettransaction(cbTxId)
-        except JSONRPCException,e:
+        except JSONRPCException as e:
             assert("Invalid or non-wallet transaction id" not in e.error['message'])
 
         #check if wallet or blochchain maintenance changes the balance