From 292371f7d20f41c1ded0d60fe5f79378058537f9 Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Sun, 29 Sep 2019 11:01:23 +0200
Subject: [PATCH] Old style exceptions --> new stye for Python 3
---
ur_driver/src/ur_driver/driver.py | 6 +++---
ur_driver/src/ur_driver/io_interface.py | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ur_driver/src/ur_driver/driver.py b/ur_driver/src/ur_driver/driver.py
index 0245191..aa5c440 100755
--- a/ur_driver/src/ur_driver/driver.py
+++ b/ur_driver/src/ur_driver/driver.py
@@ -459,7 +459,7 @@ class CommanderTCPHandler(SocketServer.BaseRequestHandler):
if not buf:
buf = buf + self.recv_more()
- except EOF, ex:
+ except EOF as ex:
print("Connection closed (command):", ex)
setConnectedRobot(None)
@@ -964,7 +964,7 @@ def main():
prevent_programming = rospy.get_param("~prevent_programming")
update = {'prevent_programming': prevent_programming}
reconfigure_srv.update_configuration(update)
- except KeyError, ex:
+ except KeyError as ex:
print("Parameter 'prevent_programming' not set. Value: " + str(prevent_programming))
pass
if prevent_programming:
@@ -985,7 +985,7 @@ def main():
prevent_programming = rospy.get_param("~prevent_programming")
update = {'prevent_programming': prevent_programming}
reconfigure_srv.update_configuration(update)
- except KeyError, ex:
+ except KeyError as ex:
print("Parameter 'prevent_programming' not set. Value: " + str(prevent_programming))
pass
connection.send_program()
diff --git a/ur_driver/src/ur_driver/io_interface.py b/ur_driver/src/ur_driver/io_interface.py
index e78c0b4..882a7ce 100644
--- a/ur_driver/src/ur_driver/io_interface.py
+++ b/ur_driver/src/ur_driver/io_interface.py
@@ -21,25 +21,25 @@ ANALOG_TOLERANCE_VALUE = 0.01
def set_io_val(fun, pin, val):
try:
set_io(fun, pin, val)
- except rospy.ServiceException, e:
+ except rospy.ServiceException as e:
print "Service call failed: %s"%e
def set_tool_voltage(volts):
try:
set_io(FUN_SET_TOOL_VOLTAGE, volts, 0)
- except rospy.ServiceException, e:
+ except rospy.ServiceException as e:
print "Service call failed: %s"%e
def set_digital_out(pin, val):
try:
set_io(FUN_SET_DIGITAL_OUT, pin, val)
- except rospy.ServiceException, e:
+ except rospy.ServiceException as e:
print "Service call failed: %s"%e
def set_analog_out(pin, val):
try:
set_io(FUN_SET_ANALOG_OUT, pin, val)
- except rospy.ServiceException, e:
+ except rospy.ServiceException as e:
print "Service call failed: %s"%e
def set_flag(pin, val):
--
GitLab