matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes to ease porting to Python 3 in the future

Browse Source
This commit is contained in:
Srivats P. 2014-06-14 15:31:02 +05:30
parent 3406d68697
commit 288380227e
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
binding/example.py
View File

@ -28,10 +28,10 @@ if len(sys.argv) > 1:
if sys.argv[1] in ('-d', '--use-defaults'): if sys.argv[1] in ('-d', '--use-defaults'):
use_defaults = True use_defaults = True
if sys.argv[1] in ('-h', '--help'): if sys.argv[1] in ('-h', '--help'):
print '%s [OPTION]...' % (sys.argv[0]) print('%s [OPTION]...' % (sys.argv[0]))
print 'Options:' print('Options:')
print ' -d --use-defaults run using default values' print(' -d --use-defaults run using default values')
print ' -h --help show this help' print(' -h --help show this help')
sys.exit(0) sys.exit(0)
if not use_defaults: if not use_defaults:
@ -55,10 +55,10 @@ try:
port_config_list = drone.getPortConfig(port_id_list) port_config_list = drone.getPortConfig(port_id_list)
# print port list and get tx/rx port id # print port list and get tx/rx port id
print 'Port List' print('Port List')
print '---------' print('---------')
for port in port_config_list.port: 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 # use a loopback port as default tx/rx port
if ('lo' in port.name or 'loopback' in port.description.lower()): if ('lo' in port.name or 'loopback' in port.description.lower()):
tx_port_number = port.port_id.id tx_port_number = port.port_id.id
@ -161,6 +161,6 @@ try:
# bye for now # bye for now
drone.disconnect() drone.disconnect()
except Exception, ex: except Exception as ex:
log.exception(ex) log.exception(ex)
sys.exit(1) sys.exit(1)

18
binding/rpc.py
View File

@ -59,10 +59,10 @@ class OstinatoRpcChannel(RpcChannel):
self.log.debug('connecting to %s', self.peer) self.log.debug('connecting to %s', self.peer)
try: try:
self.sock.connect((host, port)) self.sock.connect((host, port))
except socket.error, e: except socket.error as e:
error = 'ERROR: Unable to connect to Drone %s (%s)' % ( error = 'ERROR: Unable to connect to Drone %s (%s)' % (
self.peer, str(e)) self.peer, str(e))
print error print(error)
raise raise
def disconnect(self): def disconnect(self):
@ -123,42 +123,42 @@ class OstinatoRpcChannel(RpcChannel):
controller.response = response controller.response = response
except socket.error, e: except socket.error as e:
error = 'ERROR: RPC %s() to Drone %s failed (%s)' % ( error = 'ERROR: RPC %s() to Drone %s failed (%s)' % (
method.name, self.peer, e) method.name, self.peer, e)
self.log.exception(error+e) self.log.exception(error+e)
raise raise
except PeerClosedConnError, e: except PeerClosedConnError as e:
error = 'ERROR: Drone %s closed connection receiving reply ' \ error = 'ERROR: Drone %s closed connection receiving reply ' \
'for RPC %s() (%s)' % ( 'for RPC %s() (%s)' % (
self.peer, method.name, e) self.peer, method.name, e)
self.log.exception(error) self.log.exception(error)
raise raise
except EncodeError, e: except EncodeError as e:
error = 'ERROR: Failed to serialize %s arg for RPC %s() ' \ error = 'ERROR: Failed to serialize %s arg for RPC %s() ' \
'to Drone %s (%s)' % ( 'to Drone %s (%s)' % (
type(request).__name__, method.name, self.peer, e) type(request).__name__, method.name, self.peer, e)
self.log.exception(error) self.log.exception(error)
raise raise
except DecodeError, e: except DecodeError as e:
error = 'ERROR: Failed to parse %s response for RPC %s() ' \ error = 'ERROR: Failed to parse %s response for RPC %s() ' \
'from Drone %s (%s)' % ( 'from Drone %s (%s)' % (
type(response).__name__, method.name, self.peer, e) type(response).__name__, method.name, self.peer, e)
self.log.exception(error) self.log.exception(error)
raise raise
except RpcMismatchError, e: except RpcMismatchError as e:
error = 'ERROR: Rpc Mismatch for RPC %s() (%s)' % ( error = 'ERROR: Rpc Mismatch for RPC %s() (%s)' % (
method.name, e) method.name, e)
self.log.exception(error) self.log.exception(error)
raise raise
except RpcError, e: except RpcError as e:
error = 'ERROR: Unknown reply received for RPC %s() (%s) ' % ( error = 'ERROR: Unknown reply received for RPC %s() (%s) ' % (
method.name, e) method.name, e)
self.log.exception(error) self.log.exception(error)
raise raise
finally: finally:
if error: if error:
print error print(error)