From: parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 17 Dec 2018 13:08:34 +0000 (+0100)
Subject: exchanges with the OS in python3 require more careful choice of bytes and str
X-Git-Tag: pyplnet-7.0-0~5
X-Git-Url: http://git.onelab.eu/?p=pyplnet.git;a=commitdiff_plain;h=fe5cb2992dfb9a57d301167cf9d31b977d40662e

exchanges with the OS in python3 require more careful choice of bytes and str
---

diff --git a/sioc.py b/sioc.py
index f887245..cf85a11 100644
--- a/sioc.py
+++ b/sioc.py
@@ -20,6 +20,9 @@ def _format_ip(nip):
                             (ip & 0x000000ff))
 
 def gifaddr(interface):
+    # for python3
+    if isinstance(interface, str):
+        interface = str.encode()
     s = None
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0)
@@ -34,20 +37,24 @@ def gifaddr(interface):
 
 def gifconf():
     ret = {}
-    ip = subprocess.Popen(["/sbin/ip", "-4", "addr", "ls"],
+    ip = subprocess.Popen(["/sbin/ip", "-4", "addr", "show"],
                           stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-                          stderr=subprocess.PIPE, close_fds=True)
+                          stderr=subprocess.PIPE, close_fds=True,
+                          universal_newlines=True)
     (stdout, stderr) = ip.communicate()
     # no wait is needed when using communicate
     for line in stdout.split("\n"):
         fields = [ field.strip() for field in line.split() ]
         if fields and fields[0] == "inet":
             # fields[-1] is the last column in fields, which has the interface name
-            # fields[1] has the IP address / netmask width 
+            # fields[1] has the IP address / netmask width
             ret[fields[-1]] = fields[1].split("/")[0]
     return ret
 
 def gifhwaddr(interface):
+    # for python3
+    if isinstance(interface, str):
+        interface = str.encode()
     s = None
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0)