diff options
author | Russell Bryant <russell@ovn.org> | 2016-01-06 15:23:08 -0500 |
---|---|---|
committer | Russell Bryant <russell@ovn.org> | 2016-01-22 08:25:27 -0500 |
commit | 03756304cf67a4f241ea124696ab0dbf40d9d679 (patch) | |
tree | 35b923fa07f8761061b1a2cc5d155702d1639f16 | |
parent | cb96c1b27e502c591eeeb831f04d92b400d757f4 (diff) | |
download | openvswitch-03756304cf67a4f241ea124696ab0dbf40d9d679.tar.gz |
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>
-rw-r--r-- | Makefile.am | 3 | ||||
-rwxr-xr-x | debian/ovs-monitor-ipsec | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 92c1ed3e3..0b2aa1230 100644 --- 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 15022947c..091896dc4 100755 --- 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() |