Skip to content

Commit

Permalink
Merge bitcoin#468: Replace deprecated tostring with tobytes
Browse files Browse the repository at this point in the history
00315c8 Replace deprecated tostring with tobytes (Carl Dong)

Pull request description:

  Upstream: bitcoin#13963

Tree-SHA512: 667cb8799941e7c3a567e8c9b77b77fdf1b838d170b5de2c51618e6d1284216039cb39e44f9650b6a7de325036a0d2c80aeb9cf5387da7e183f33461a31c9727
  • Loading branch information
instagibbs committed Nov 27, 2018
2 parents cc4b98f + 00315c8 commit 609323f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def all_interfaces():
max_possible *= 2
else:
break
namestr = names.tostring()
namestr = names.tobytes()
return [(namestr[i:i+16].split(b'\0', 1)[0],
socket.inet_ntoa(namestr[i+20:i+24]))
for i in range(0, outbytes, struct_size)]
Expand Down
2 changes: 1 addition & 1 deletion test/functional/test_framework/netutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def all_interfaces():
max_possible *= 2
else:
break
namestr = names.tostring()
namestr = names.tobytes()
return [(namestr[i:i+16].split(b'\0', 1)[0],
socket.inet_ntoa(namestr[i+20:i+24]))
for i in range(0, outbytes, struct_size)]
Expand Down

0 comments on commit 609323f

Please sign in to comment.