Skip to content

Commit 609323f

Browse files
committed
Merge #468: Replace deprecated tostring with tobytes
00315c8 Replace deprecated tostring with tobytes (Carl Dong) Pull request description: Upstream: bitcoin/bitcoin#13963 Tree-SHA512: 667cb8799941e7c3a567e8c9b77b77fdf1b838d170b5de2c51618e6d1284216039cb39e44f9650b6a7de325036a0d2c80aeb9cf5387da7e183f33461a31c9727
2 parents cc4b98f + 00315c8 commit 609323f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

test/bitcoin_functional/functional/test_framework/netutil.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def all_interfaces():
107107
max_possible *= 2
108108
else:
109109
break
110-
namestr = names.tostring()
110+
namestr = names.tobytes()
111111
return [(namestr[i:i+16].split(b'\0', 1)[0],
112112
socket.inet_ntoa(namestr[i+20:i+24]))
113113
for i in range(0, outbytes, struct_size)]

test/functional/test_framework/netutil.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def all_interfaces():
107107
max_possible *= 2
108108
else:
109109
break
110-
namestr = names.tostring()
110+
namestr = names.tobytes()
111111
return [(namestr[i:i+16].split(b'\0', 1)[0],
112112
socket.inet_ntoa(namestr[i+20:i+24]))
113113
for i in range(0, outbytes, struct_size)]

0 commit comments

Comments
 (0)