From 9d3590f27fd3abc59d24e56c42cf473f07a8cf3d Mon Sep 17 00:00:00 2001 From: Robert Klep Date: Fri, 15 Feb 2013 09:38:01 +0100 Subject: [PATCH] Removed dependency on networksetup to get list of network interfaces --- ToggleProxy.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ToggleProxy.py b/ToggleProxy.py index 5465fbe..9f0236f 100644 --- a/ToggleProxy.py +++ b/ToggleProxy.py @@ -65,8 +65,9 @@ class ToggleProxy(NSObject): def loadNetworkServices(self): """ load list of network services """ self.services = {} - output = commands.getoutput("/usr/sbin/networksetup listnetworkserviceorder") - for servicename, service, device in re.findall(r'\(\d\)\s*(.*?)(?:\n|\r\n?)\(Hardware Port:\s*(.*?), Device:\s*(.*?)\)', output, re.MULTILINE): + for interface in SCNetworkInterfaceCopyAll(): + device = SCNetworkInterfaceGetBSDName(interface) + servicename = SCNetworkInterfaceGetLocalizedDisplayName(interface) self.services[device] = servicename def watchForProxyChanges(self):