From: Preston Hunt <preston.hunt@intel.com>
Date: Tue, 31 Jan 2017 01:25:03 +0000 (+0000)
Subject: Update wpaspy.py to be python3 compatible
X-Git-Tag: hostap_2_7~1682
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=945604a355c4c919587faefaced2b966f350defe;p=thirdparty%2Fhostap.git

Update wpaspy.py to be python3 compatible

Make minor changes to wpaspy module that enables it to run in either
python2 or python3.

Signed-off-by: Preston Hunt <preston.hunt@intel.com>
---

diff --git a/wpaspy/wpaspy.py b/wpaspy/wpaspy.py
index c2aace0f4..5f614c707 100644
--- a/wpaspy/wpaspy.py
+++ b/wpaspy/wpaspy.py
@@ -6,6 +6,8 @@
 # This software may be distributed under the terms of the BSD license.
 # See README for more details.
 
+from __future__ import print_function
+
 import os
 import stat
 import socket
@@ -38,7 +40,7 @@ class Ctrl:
             self.s.bind(self.local)
             try:
                 self.s.connect(self.dest)
-            except Exception, e:
+            except Exception as e:
                 self.s.close()
                 os.unlink(self.local)
                 raise
@@ -57,7 +59,7 @@ class Ctrl:
                 self.cookie = reply
                 self.port = port
             except:
-                print "connect exception ", path, str(port)
+                print("connect exception ", path, str(port))
                 if self.s != None:
                     self.s.close()
                 raise
@@ -70,7 +72,7 @@ class Ctrl:
         if self.attached:
             try:
                 self.detach()
-            except Exception, e:
+            except Exception as e:
                 # Need to ignore this allow the socket to be closed
                 self.attached = False
                 pass
@@ -114,7 +116,7 @@ class Ctrl:
         if self.attached:
             try:
                 self.detach()
-            except Exception, e:
+            except Exception as e:
                 # Need to ignore this to allow the socket to be closed
                 self.attached = False
         self.request("TERMINATE")