diff --git a/basicswap/interface/dcr/rpc.py b/basicswap/interface/dcr/rpc.py index ac357e4..e4bfd8a 100644 --- a/basicswap/interface/dcr/rpc.py +++ b/basicswap/interface/dcr/rpc.py @@ -42,7 +42,6 @@ def make_rpc_func(port, auth, host="127.0.0.1"): host = host def rpc_func(method, params=None): - nonlocal port, auth, host return callrpc(port, auth, method, params, host) return rpc_func diff --git a/basicswap/rpc.py b/basicswap/rpc.py index 45e9708..43b4b46 100644 --- a/basicswap/rpc.py +++ b/basicswap/rpc.py @@ -159,7 +159,6 @@ def make_rpc_func(port, auth, wallet=None, host="127.0.0.1"): host = host def rpc_func(method, params=None, wallet_override=None): - nonlocal port, auth, wallet, host return callrpc( port, auth, diff --git a/basicswap/rpc_xmr.py b/basicswap/rpc_xmr.py index c79f234..3309afb 100644 --- a/basicswap/rpc_xmr.py +++ b/basicswap/rpc_xmr.py @@ -309,7 +309,6 @@ def make_xmr_rpc2_func( transport.set_proxy(proxy_host, proxy_port) def rpc_func(method, params=None, wallet=None, timeout=default_timeout): - nonlocal port, auth, host, transport, tag return callrpc_xmr2( port, method, @@ -345,7 +344,6 @@ def make_xmr_rpc_func( transport.set_proxy(proxy_host, proxy_port) def rpc_func(method, params=None, wallet=None, timeout=default_timeout): - nonlocal port, auth, host, transport, tag return callrpc_xmr( port, method, diff --git a/basicswap/util/network.py b/basicswap/util/network.py index a029d73..f8b0fc5 100644 --- a/basicswap/util/network.py +++ b/basicswap/util/network.py @@ -38,8 +38,7 @@ def make_reporthook(read_start: int, logger): logger.info(f"Attempting to resume from byte {read_start}") def reporthook(blocknum, blocksize, totalsize): - nonlocal read, last_percent_str, time_last, read_last, display_last, read_start - nonlocal average_buffer, abo, logger + nonlocal read, last_percent_str, time_last, read_last, display_last, abo read += blocksize # totalsize excludes read_start diff --git a/scripts/createoffers.py b/scripts/createoffers.py index 1062a7e..46d00e3 100755 --- a/scripts/createoffers.py +++ b/scripts/createoffers.py @@ -101,7 +101,6 @@ def make_json_api_func(host: str, port: int): port = port def api_func(path=None, json_data=None, timeout=300): - nonlocal host, port url = f"http://{host}:{port}/json" if path is not None: url += "/" + path @@ -765,7 +764,7 @@ def prune_script_state(now, args, config, script_state): def main(): - global read_json_api, read_json_api_wallet, coins_map + global read_json_api, read_json_api_wallet parser = argparse.ArgumentParser(description=__doc__) parser.add_argument( "-v", diff --git a/tests/basicswap/common.py b/tests/basicswap/common.py index f8d1a33..1fe2483 100644 --- a/tests/basicswap/common.py +++ b/tests/basicswap/common.py @@ -357,7 +357,6 @@ def make_rpc_func(node_id, base_rpc_port=BASE_RPC_PORT): auth = "test{0}:test_pass{0}".format(node_id) def rpc_func(method, params=None, wallet=None): - nonlocal node_id, auth return callrpc(base_rpc_port + node_id, auth, method, params, wallet) return rpc_func diff --git a/tests/basicswap/extended/test_dash.py b/tests/basicswap/extended/test_dash.py index d77079f..9db754b 100644 --- a/tests/basicswap/extended/test_dash.py +++ b/tests/basicswap/extended/test_dash.py @@ -277,7 +277,6 @@ def make_part_cli_rpc_func(node_id): node_id = node_id def rpc_func(method, params=None, wallet=None): - nonlocal node_id cmd = method if params: for p in params: diff --git a/tests/basicswap/extended/test_dcr.py b/tests/basicswap/extended/test_dcr.py index 907338f..d063160 100644 --- a/tests/basicswap/extended/test_dcr.py +++ b/tests/basicswap/extended/test_dcr.py @@ -70,7 +70,6 @@ def make_rpc_func(node_id, base_rpc_port): auth = "test{0}:test_pass{0}".format(node_id) def rpc_func(method, params=None): - nonlocal node_id, auth return callrpc(base_rpc_port + node_id, auth, method, params) return rpc_func diff --git a/tests/basicswap/extended/test_nmc.py b/tests/basicswap/extended/test_nmc.py index ba3e544..80c29bf 100644 --- a/tests/basicswap/extended/test_nmc.py +++ b/tests/basicswap/extended/test_nmc.py @@ -257,7 +257,6 @@ def make_part_cli_rpc_func(node_id): node_id = node_id def rpc_func(method, params=None, wallet=None): - nonlocal node_id cmd = method if params: for p in params: diff --git a/tests/basicswap/extended/test_pivx.py b/tests/basicswap/extended/test_pivx.py index d2968ad..d71e454 100644 --- a/tests/basicswap/extended/test_pivx.py +++ b/tests/basicswap/extended/test_pivx.py @@ -282,7 +282,6 @@ def make_part_cli_rpc_func(node_id): node_id = node_id def rpc_func(method, params=None, wallet=None): - nonlocal node_id cmd = method if params: for p in params: diff --git a/tests/basicswap/test_partblind_xmr.py b/tests/basicswap/test_partblind_xmr.py index 52a63ce..70183d5 100644 --- a/tests/basicswap/test_partblind_xmr.py +++ b/tests/basicswap/test_partblind_xmr.py @@ -113,7 +113,6 @@ class Test(BaseTest): pi = swap_clients[0].pi(SwapTypes.XMR_SWAP) def wait_for_unspents(delay_event, iterations=20, delay_time=0.5): - nonlocal ci i = 0 while not delay_event.is_set(): unspents = ci.rpc_wallet("listunspentblind") diff --git a/tests/basicswap/test_reload.py b/tests/basicswap/test_reload.py index 2807530..899cfa1 100644 --- a/tests/basicswap/test_reload.py +++ b/tests/basicswap/test_reload.py @@ -111,7 +111,6 @@ class Test(unittest.TestCase): ) def test_reload(self): - global stop_test processes = [] for i in range(3):