mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 07:15:17 +00:00
Code Issues Releases Wiki Activity

python: Resolve some indentation warnings.

Browse Source 
This patch resolves the following warnings from flake8:

 E111 indentation is not a multiple of four
 E112 expected an indented block
 E113 unexpected indentation

It's critical to have correct indentation in Python code, so it seemed
worth enabling these warnings.

Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Russell Bryant
2016-01-05 14:50:40 -05:00
parent f7f7fcced5
commit eda26d40ae
5 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@@ -342,9 +342,6 @@ endif
if HAVE_FLAKE8 if HAVE_FLAKE8
ALL_LOCAL += flake8-check ALL_LOCAL += flake8-check
# E111 indentation is not a multiple of four
# E112 expected an indented block
# E113 unexpected indentation
# E123 closing bracket does not match indentation of opening bracket's line # E123 closing bracket does not match indentation of opening bracket's line
# E126 continuation line over-indented for hanging indent # E126 continuation line over-indented for hanging indent
# E127 continuation line over-indented for visual indent # E127 continuation line over-indented for visual indent
@@ -353,7 +350,7 @@ ALL_LOCAL += flake8-check
# E131 continuation line unaligned for hanging indent # E131 continuation line unaligned for hanging indent
# E501 line too long (80 > 79 characters) # E501 line too long (80 > 79 characters)
flake8-check: $(FLAKE8_PYFILES) flake8-check: $(FLAKE8_PYFILES)
$(AM_V_GEN) if flake8 $^ --ignore=E111,E112,E113,E123,E126,E127,E128,E129,E131,E501 ${FLAKE8_FLAGS}; then touch $@; else exit 1; fi $(AM_V_GEN) if flake8 $^ --ignore=E123,E126,E127,E128,E129,E131,E501 ${FLAKE8_FLAGS}; then touch $@; else exit 1; fi
endif endif
include $(srcdir)/manpages.mk include $(srcdir)/manpages.mk

41
ofproto/ipfix-gen-entities
View File

@@ -111,32 +111,27 @@ The following options are also available:
sys.exit(0) sys.exit(0)
if __name__ == '__main__': if __name__ == '__main__':
# try: try:
try: options, args = getopt.gnu_getopt(sys.argv[1:], 'hV',
options, args = getopt.gnu_getopt(sys.argv[1:], 'hV', ['help', 'version'])
['help', 'version']) except getopt.GetoptError, geo:
except getopt.GetoptError, geo: sys.stderr.write('%s: %s\n' % (sys.argv[0], geo.msg))
sys.stderr.write('%s: %s\n' % (sys.argv[0], geo.msg)) sys.exit(1)
sys.exit(1)
for key, value in options: for key, value in options:
if key in ['-h', '--help']: if key in ['-h', '--help']:
usage() usage()
elif key in ['-V', '--version']: elif key in ['-V', '--version']:
print 'ipfix-gen-entities (Open vSwitch)' print 'ipfix-gen-entities (Open vSwitch)'
else: else:
sys.exit(0) sys.exit(0)
if len(args) != 1: if len(args) != 1:
sys.stderr.write('%s: exactly 1 non-option arguments required ' sys.stderr.write('%s: exactly 1 non-option arguments required '
'(use --help for help)\n' % sys.argv[0]) '(use --help for help)\n' % sys.argv[0])
sys.exit(1) sys.exit(1)
print_ipfix_entity_macros(args[0]) print_ipfix_entity_macros(args[0])
# except Exception, e:
# sys.stderr.write('%s: %s\n' % (sys.argv[0], e))
# sys.exit(1)
# Local variables: # Local variables:
# mode: python # mode: python

2
python/ovs/daemon.py
View File

@@ -325,7 +325,7 @@ def _monitor_daemon(daemon_pid):
vlog.info("%s, exiting" % status_msg) vlog.info("%s, exiting" % status_msg)
sys.exit(0) sys.exit(0)
# Running in new daemon process. # Running in new daemon process.
def _close_standard_fds(): def _close_standard_fds():

31
python/ovs/db/idl.py
View File

@@ -749,17 +749,26 @@ class Transaction(object):
of Idl.change_seqno. (Transaction.commit_block() calls Idl.run().)""" of Idl.change_seqno. (Transaction.commit_block() calls Idl.run().)"""
# Status values that Transaction.commit() can return. # Status values that Transaction.commit() can return.
UNCOMMITTED = "uncommitted" # Not yet committed or aborted.
UNCHANGED = "unchanged" # Transaction didn't include any changes. # Not yet committed or aborted.
INCOMPLETE = "incomplete" # Commit in progress, please wait. UNCOMMITTED = "uncommitted"
ABORTED = "aborted" # ovsdb_idl_txn_abort() called. # Transaction didn't include any changes.
SUCCESS = "success" # Commit successful. UNCHANGED = "unchanged"
TRY_AGAIN = "try again" # Commit failed because a "verify" operation # Commit in progress, please wait.
# reported an inconsistency, due to a network INCOMPLETE = "incomplete"
# problem, or other transient failure. Wait # ovsdb_idl_txn_abort() called.
# for a change, then try again. ABORTED = "aborted"
NOT_LOCKED = "not locked" # Server hasn't given us the lock yet. # Commit successful.
ERROR = "error" # Commit failed due to a hard error. SUCCESS = "success"
# Commit failed because a "verify" operation
# reported an inconsistency, due to a network
# problem, or other transient failure. Wait
# for a change, then try again.
TRY_AGAIN = "try again"
# Server hasn't given us the lock yet.
NOT_LOCKED = "not locked"
# Commit failed due to a hard error.
ERROR = "error"
@staticmethod @staticmethod
def status_to_string(status): def status_to_string(status):

6
python/ovstest/rpcserver.py
View File

@@ -359,9 +359,9 @@ def start_rpc_server(port):
try: try:
print "Starting RPC server\n" print "Starting RPC server\n"
sys.stdout.flush() sys.stdout.flush()
# If this server was started from ovs-test client then we must flush # If this server was started from ovs-test client then we must flush
# STDOUT so that client would know that server is ready to accept # STDOUT so that client would know that server is ready to accept
# XML RPC connections. # XML RPC connections.
reactor.run() reactor.run()
finally: finally:
rpc_server.cleanup() rpc_server.cleanup()