From c3aa4da94dfe5458d6e63136bb593c8a85f9a269 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 16 Mar 2013 21:47:10 +0200 Subject: [PATCH] Convert WPS NFC python scripts from using wpactrl to wpaspy Signed-hostap: Jouni Malinen --- hostapd/wps-ap-nfc.py | 7 +++---- wpa_supplicant/examples/wps-nfc.py | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hostapd/wps-ap-nfc.py b/hostapd/wps-ap-nfc.py index 6ad0b4305..61b5519ac 100755 --- a/hostapd/wps-ap-nfc.py +++ b/hostapd/wps-ap-nfc.py @@ -18,7 +18,7 @@ import nfc.handover import logging logging.basicConfig() -import wpactrl +import wpaspy wpas_ctrl = '/var/run/hostapd' @@ -37,10 +37,9 @@ def wpas_connect(): for ctrl in ifaces: try: - wpas = wpactrl.WPACtrl(ctrl) + wpas = wpaspy.Ctrl(ctrl) return wpas - except wpactrl.error, error: - print "Error: ", error + except Exception, e: pass return None diff --git a/wpa_supplicant/examples/wps-nfc.py b/wpa_supplicant/examples/wps-nfc.py index 9a6da5f97..86473cd62 100755 --- a/wpa_supplicant/examples/wps-nfc.py +++ b/wpa_supplicant/examples/wps-nfc.py @@ -20,7 +20,7 @@ import nfc.handover import logging logging.basicConfig() -import wpactrl +import wpaspy wpas_ctrl = '/var/run/wpa_supplicant' @@ -39,10 +39,9 @@ def wpas_connect(): for ctrl in ifaces: try: - wpas = wpactrl.WPACtrl(ctrl) + wpas = wpaspy.Ctrl(ctrl) return wpas - except wpactrl.error, error: - print "Error: ", error + except Exception, e: pass return None