2
0
mirror of https://github.com/openvswitch/ovs synced 2025-09-04 00:05:15 +00:00

python: Resolve some indentation warnings.

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

View File

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

View File

@@ -749,17 +749,26 @@ class Transaction(object):
of Idl.change_seqno. (Transaction.commit_block() calls Idl.run().)"""
# Status values that Transaction.commit() can return.
UNCOMMITTED = "uncommitted" # Not yet committed or aborted.
UNCHANGED = "unchanged" # Transaction didn't include any changes.
INCOMPLETE = "incomplete" # Commit in progress, please wait.
ABORTED = "aborted" # ovsdb_idl_txn_abort() called.
SUCCESS = "success" # Commit successful.
TRY_AGAIN = "try again" # 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.
NOT_LOCKED = "not locked" # Server hasn't given us the lock yet.
ERROR = "error" # Commit failed due to a hard error.
# Not yet committed or aborted.
UNCOMMITTED = "uncommitted"
# Transaction didn't include any changes.
UNCHANGED = "unchanged"
# Commit in progress, please wait.
INCOMPLETE = "incomplete"
# ovsdb_idl_txn_abort() called.
ABORTED = "aborted"
# Commit successful.
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
def status_to_string(status):

View File

@@ -359,9 +359,9 @@ def start_rpc_server(port):
try:
print "Starting RPC server\n"
sys.stdout.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
# XML RPC connections.
# 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
# XML RPC connections.
reactor.run()
finally:
rpc_server.cleanup()