[ovs-dev] [PATCH 8/9] python: Fix octal compatibility.
Russell Bryant
russell at ovn.org
Wed Jan 6 20:50:28 UTC 2016
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 at ovn.org>
---
Makefile.am | 3 ++-
debian/ovs-monitor-ipsec | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9228a08..71cd1b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -357,9 +357,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=E123,E126,E127,E128,E129,E131,W503,D,H ${FLAKE8_FLAGS}; then touch $@; else exit 1; fi
+ $(AM_V_GEN) if flake8 $^ --select=H231,H232,H233 --ignore=E123,E126,E127,E128,E129,E131,W503,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 09596b0..2bccfb0 100755
--- a/debian/ovs-monitor-ipsec
+++ b/debian/ovs-monitor-ipsec
@@ -164,7 +164,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)
--
2.5.0
More information about the dev
mailing list