From 288380227e66a40bd391e478f1925dfb7f11c0fd Mon Sep 17 00:00:00 2001
From: "Srivats P." <pstavirs@gmail.com>
Date: Sat, 14 Jun 2014 15:31:02 +0530
Subject: [PATCH] Minor changes to ease porting to Python 3 in the future

---
 binding/example.py | 16 ++++++++--------
 binding/rpc.py     | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/binding/example.py b/binding/example.py
index b2f83b9..b1f5f14 100644
--- a/binding/example.py
+++ b/binding/example.py
@@ -28,10 +28,10 @@ if len(sys.argv) > 1:
     if sys.argv[1] in ('-d', '--use-defaults'):
         use_defaults = True
     if sys.argv[1] in ('-h', '--help'):
-        print '%s [OPTION]...' % (sys.argv[0])
-        print 'Options:'
-        print ' -d --use-defaults   run using default values'
-        print ' -h --help           show this help'
+        print('%s [OPTION]...' % (sys.argv[0]))
+        print('Options:')
+        print(' -d --use-defaults   run using default values')
+        print(' -h --help           show this help')
         sys.exit(0)
 
 if not use_defaults:
@@ -55,10 +55,10 @@ try:
     port_config_list = drone.getPortConfig(port_id_list)
 
     # print port list and get tx/rx port id 
-    print 'Port List'
-    print '---------'
+    print('Port List')
+    print('---------')
     for port in port_config_list.port:
-        print '%d.%s (%s)' % (port.port_id.id, port.name, port.description) 
+        print('%d.%s (%s)' % (port.port_id.id, port.name, port.description))
         # use a loopback port as default tx/rx port 
         if ('lo' in port.name or 'loopback' in port.description.lower()):
             tx_port_number = port.port_id.id
@@ -161,6 +161,6 @@ try:
     # bye for now
     drone.disconnect()
 
-except Exception, ex:
+except Exception as ex:
     log.exception(ex)
     sys.exit(1)
diff --git a/binding/rpc.py b/binding/rpc.py
index 7bc121a..41ff5c8 100644
--- a/binding/rpc.py
+++ b/binding/rpc.py
@@ -59,10 +59,10 @@ class OstinatoRpcChannel(RpcChannel):
         self.log.debug('connecting to %s', self.peer)
         try:
             self.sock.connect((host, port))
-        except socket.error, e:
+        except socket.error as e:
             error = 'ERROR: Unable to connect to Drone %s (%s)' % (
                     self.peer, str(e))
-            print error
+            print(error)
             raise
 
     def disconnect(self):
@@ -123,42 +123,42 @@ class OstinatoRpcChannel(RpcChannel):
 
             controller.response = response
 
-        except socket.error, e:
+        except socket.error as e:
             error = 'ERROR: RPC %s() to Drone %s failed (%s)' % (
                     method.name, self.peer, e)
             self.log.exception(error+e)
             raise
-        except PeerClosedConnError, e:
+        except PeerClosedConnError as e:
             error = 'ERROR: Drone %s closed connection receiving reply ' \
                   'for RPC %s() (%s)' % (
                     self.peer, method.name, e)
             self.log.exception(error)
             raise
-        except EncodeError, e:
+        except EncodeError as e:
             error = 'ERROR: Failed to serialize %s arg for RPC %s() ' \
                   'to Drone %s (%s)' % (
                     type(request).__name__, method.name, self.peer, e)
             self.log.exception(error)
             raise
-        except DecodeError, e:
+        except DecodeError as e:
             error = 'ERROR: Failed to parse %s response for RPC %s() ' \
                   'from Drone %s (%s)' % (
                     type(response).__name__, method.name, self.peer, e)
             self.log.exception(error)
             raise
-        except RpcMismatchError, e:
+        except RpcMismatchError as e:
             error = 'ERROR: Rpc Mismatch for RPC %s() (%s)' % (
                     method.name, e)
             self.log.exception(error)
             raise
-        except RpcError, e:
+        except RpcError as e:
             error = 'ERROR: Unknown reply received for RPC %s() (%s) ' % (
                     method.name, e)
             self.log.exception(error)
             raise
         finally:
             if error:
-                print error
+                print(error)