Python3 compatibility: exception cleanup

The exception syntax which is compatible with python2 and python3 is
to use the "as" form for "except:".

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

build-aux/extract-ofp-fields

@@ -787,7 +787,7 @@ if __name__ == "__main__":
     try:
         options, args = getopt.gnu_getopt(sys.argv[1:], 'h',
                                           ['help', 'ovs-version='])
-    except getopt.GetoptError, geo:
+    except getopt.GetoptError as geo:
         sys.stderr.write("%s: %s\n" % (argv0, geo.msg))
         sys.exit(1)
 

ovsdb/ovsdb-doc

@@ -278,7 +278,7 @@ if __name__ == "__main__":
             options, args = getopt.gnu_getopt(sys.argv[1:], 'hV',
                                               ['er-diagram=',
                                                'version=', 'help'])
-        except getopt.GetoptError, geo:
+        except getopt.GetoptError as geo:
             sys.stderr.write("%s: %s\n" % (argv0, geo.msg))
             sys.exit(1)
 
@@ -306,7 +306,7 @@ if __name__ == "__main__":
             if len(line):
                 print(line)
 
-    except error.Error, e:
+    except error.Error as e:
         sys.stderr.write("%s: %s\n" % (argv0, e.msg))
         sys.exit(1)
 

ovsdb/ovsdb-idlc.in

@@ -1098,7 +1098,7 @@ if __name__ == "__main__":
                                               ['directory',
                                                'help',
                                                'version'])
-        except getopt.GetoptError, geo:
+        except getopt.GetoptError as geo:
             sys.stderr.write("%s: %s\n" % (argv0, geo.msg))
             sys.exit(1)
 
@@ -1136,7 +1136,7 @@ if __name__ == "__main__":
             sys.exit(1)
 
         func(*args[1:])
-    except ovs.db.error.Error, e:
+    except ovs.db.error.Error as e:
         sys.stderr.write("%s: %s\n" % (argv0, e))
         sys.exit(1)