Merge #10317: Remove unused Python imports

laanwj · laanwj · commit eb8263bdc9d3 · 2017-05-11T19:27:18.000+02:00
0c60c63 Remove unused Python imports (practicalswift) Tree-SHA512: c7ae6a8ae2c751b771804960498bf270ab022c80fa9e1b39118d5986d890c8cdfc27a3cc24bf28c080d8088ddc11facd1f2881ba2c209cdd819675fda4689d83
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
@@ -15,7 +15,7 @@
 # In case of a clean merge that is accepted by the user, the local branch with
 # name $BRANCH is overwritten with the merged result, and optionally pushed.
 from __future__ import division,print_function,unicode_literals
-import os,sys
+import os
 from sys import stdin,stdout,stderr
 import argparse
 import hashlib
diff --git a/test/functional/blockchain.py b/test/functional/blockchain.py
@@ -23,8 +23,6 @@
     assert_raises_jsonrpc,
     assert_is_hex_string,
     assert_is_hash_string,
-    start_nodes,
-    connect_nodes_bi,
 )
 
 
diff --git a/test/functional/net.py b/test/functional/net.py
@@ -15,7 +15,6 @@
     assert_raises_jsonrpc,
     connect_nodes_bi,
     p2p_port,
-    start_nodes,
 )
 
 
diff --git a/test/functional/rpcnamedargs.py b/test/functional/rpcnamedargs.py
@@ -8,7 +8,6 @@
 from test_framework.util import (
     assert_equal,
     assert_raises_jsonrpc,
-    start_nodes,
 )
 
 
diff --git a/test/functional/signmessages.py b/test/functional/signmessages.py
@@ -5,7 +5,6 @@
 """Test RPC commands for signing and verifying messages."""
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.util import *
 
 class SignMessagesTest(BitcoinTestFramework):
 
diff --git a/test/functional/wallet-accounts.py b/test/functional/wallet-accounts.py
@@ -15,7 +15,6 @@
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
-    start_nodes,
     assert_equal,
 )
 
diff --git a/test/functional/wallet-hd.py b/test/functional/wallet-hd.py
@@ -6,7 +6,6 @@
 
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
-    start_nodes,
     start_node,
     assert_equal,
     connect_nodes_bi,

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`	`assert_raises_jsonrpc,`
`24`	`24`	`assert_is_hex_string,`
`25`	`25`	`assert_is_hash_string,`
`26`		`- start_nodes,`
`27`		`- connect_nodes_bi,`
`28`	`26`	`)`
`29`	`27`
`30`	`28`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`assert_raises_jsonrpc,`
`16`	`16`	`connect_nodes_bi,`
`17`	`17`	`p2p_port,`
`18`		`- start_nodes,`
`19`	`18`	`)`
`20`	`19`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`from test_framework.util import (`
`9`	`9`	`assert_equal,`
`10`	`10`	`assert_raises_jsonrpc,`
`11`		`- start_nodes,`
`12`	`11`	`)`
`13`	`12`
`14`	`13`