python: Remove old style classes.

Python 3 removed support for "old-style classes".  Classes should always
inherit from object to get consistent behavior between Python 2 and 3.

Enable a flake8 warning to help prevent regressions in the future.

Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>

diff --git a/Makefile.am b/Makefile.am
index 92c1ed3..0b2aa12 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -363,8 +363,9 @@ ALL_LOCAL += flake8-check
 #   H231 Python 3.x incompatible 'except x,y:' construct
 #   H232 Python 3.x incompatible octal 077 should be written as 0o77
 #   H233 Python 3.x incompatible use of print operator
+#   H238 old style class declaration, use new style (inherit from `object`)
 flake8-check: $(FLAKE8_PYFILES)
-       $(AM_V_GEN) if flake8 $^ --select=H231,H232,H233 --ignore=E121,E123,E125,E126,E127,E128,E129,E131,W503,F811,D,H ${FLAKE8_FLAGS}; then touch $@; else exit 1; fi
+       $(AM_V_GEN) if flake8 $^ --select=H231,H232,H233,H238 --ignore=E121,E123,E125,E126,E127,E128,E129,E131,W503,F811,D,H ${FLAKE8_FLAGS}; then touch $@; else exit 1; fi
 endif
 
 include $(srcdir)/manpages.mk

diff --git a/debian/ovs-monitor-ipsec b/debian/ovs-monitor-ipsec
index 1502294..091896d 100755 (executable)
--- a/debian/ovs-monitor-ipsec
+++ b/debian/ovs-monitor-ipsec
@@ -55,7 +55,7 @@ def unixctl_exit(conn, unused_argv, unused_aux):
 
 
 # Class to configure the racoon daemon, which handles IKE negotiation
-class Racoon:
+class Racoon(object):
     # Default locations for files
     conf_file = "/etc/racoon/racoon.conf"
     cert_dir = "/etc/racoon/certs"
@@ -259,7 +259,7 @@ path certificate "%s";
 # Class to configure IPsec on a system using racoon for IKE and setkey
 # for maintaining the Security Association Database (SAD) and Security
 # Policy Database (SPD).  Only policies for GRE are supported.
-class IPsec:
+class IPsec(object):
     def __init__(self):
         self.sad_flush()
         self.spd_flush()