From eccb3258aef8131b8cfc27740c80a8da5ce131df Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Wed, 7 Mar 2007 19:29:00 -0700
Subject: [PATCH] iputil: use the subprocess module instead of os.popen
---
src/allmydata/util/iputil.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/allmydata/util/iputil.py b/src/allmydata/util/iputil.py
index f849b000..f41b3dcd 100644
--- a/src/allmydata/util/iputil.py
+++ b/src/allmydata/util/iputil.py
@@ -1,10 +1,10 @@
# adapted from nattraverso.ipdiscover
-import os
-from cStringIO import StringIO
+import subprocess
import re
import socket
+from cStringIO import StringIO
from twisted.internet import reactor
from twisted.internet.protocol import DatagramProtocol
from twisted.internet.utils import getProcessOutput
@@ -18,7 +18,10 @@ def get_local_addresses():
# lines.
cmd = "/sbin/ifconfig"
- p = os.popen(cmd)
+ #p = os.popen(cmd)
+ c = subprocess.Popen(["ifconfig"], stdout=subprocess.PIPE)
+ output = c.communicate()[0]
+ p = StringIO(output)
addresses = []
for line in p.readlines():
# linux shows: " inet addr:1.2.3.4 Bcast:1.2.3.255..."
--
2.45.2