Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-12 00:50:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1656412 - moznetwork isn't compatible with Python 3. r=ahal

Browse Source 
After landing bug 1638963, geckoview-junit is Python 3 compatible. But
moznetwork isn't still compatible with Python 3 although bug 1428711 is fixed.

According to https://docs.python.org/3/library/array.html,

- `names = array.array('B', '\0' * bytes)` isn't compatible with Python 3.
- `names.tostring()` returns byte array on Python 3 and this is deprecated.

Differential Revision: https://phabricator.services.mozilla.com/D85526
This commit is contained in:
Makoto Kato 2020-08-05 14:54:09 +00:00
parent eea7750416
commit 598f77baca
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testing/mozbase/moznetwork/moznetwork/moznetwork.py
View File

@ -7,6 +7,7 @@ from __future__ import absolute_import
import argparse
import array
import re
import six
import socket
import struct
import subprocess
@ -42,14 +43,17 @@ def _get_interface_list():
try:
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
names = array.array('B', '\0' * bytes)
names = array.array('B', b'\0' * bytes)
outbytes = struct.unpack('iL', fcntl.ioctl(
s.fileno(),
0x8912, # SIOCGIFCONF
struct.pack('iL', bytes, names.buffer_info()[0])
))[0]
namestr = names.tostring()
return [(namestr[i:i + 32].split('\0', 1)[0],
if six.PY3:
namestr = names.tobytes()
else:
namestr = names.tostring()
return [(namestr[i:i + 32].split(b'\0', 1)[0],
socket.inet_ntoa(namestr[i + 20:i + 24]))
for i in range(0, outbytes, struct_size)]