Skip to content

Commit

Permalink
python: Fix octal compatibility.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
russellb committed Jan 20, 2016
1 parent b3ac294 commit 56ec061
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Makefile.am
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion debian/ovs-monitor-ipsec
Expand Up @@ -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)

Expand Down

0 comments on commit 56ec061

Please sign in to comment.