python: Fix octal compatibility.

Octal constants must be written as 0o077 instead of 0077 to be
compatible with both Python 2 and 3.

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

diff --git a/Makefile.am b/Makefile.am
index 9ee2229..92c1ed3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -361,9 +361,10 @@ ALL_LOCAL += flake8-check
 # D*** -- warnings from flake8-docstrings plugin
 # H*** -- warnings from flake8 hacking plugin (custom style checks beyond PEP8)
 #   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
 flake8-check: $(FLAKE8_PYFILES)
-       $(AM_V_GEN) if flake8 $^ --select=H231,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 --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 22883fc..0f39191 100755 (executable)
--- a/debian/ovs-monitor-ipsec
+++ b/debian/ovs-monitor-ipsec
@@ -163,7 +163,7 @@ path certificate "%s";
         conf_file.close()
 
         # Rewrite the pre-shared keys file; it must only be readable by root.
-        orig_umask = os.umask(0077)
+        orig_umask = os.umask(0o077)
         psk_file = open(root_prefix + Racoon.psk_file, 'w')
         os.umask(orig_umask)