Skip to content

Commit

Permalink
python: Remove unnecessary semicolons and slashes.
Browse files Browse the repository at this point in the history
Resolve the following flake8 errors:

  E703 statement ends with a semicolon
  E502 the backslash is redundant between brackets

Also document the reamining flake8 errors that are still ignored.

Signed-off-by: Russell Bryant <[email protected]>
Acked-by: Ben Pfaff <[email protected]>
  • Loading branch information
russellb committed Jan 5, 2016
1 parent 603e325 commit 080793b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
12 changes: 11 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,18 @@ endif

if HAVE_FLAKE8
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
# E126 continuation line over-indented for hanging indent
# E127 continuation line over-indented for visual indent
# E128 continuation line under-indented for visual indent
# E129 visually indented line with same indent as next logical line
# E131 continuation line unaligned for hanging indent
# E501 line too long (80 > 79 characters)
flake8-check: $(FLAKE8_PYFILES)
$(AM_V_GEN) if flake8 $^ --ignore=E111,E112,E113,E123,E126,E127,E128,E129,E131,E501,E502,E703 ${FLAKE8_FLAGS}; then touch $@; else exit 1; fi
$(AM_V_GEN) if flake8 $^ --ignore=E111,E112,E113,E123,E126,E127,E128,E129,E131,E501 ${FLAKE8_FLAGS}; then touch $@; else exit 1; fi
endif

include $(srcdir)/manpages.mk
Expand Down
8 changes: 4 additions & 4 deletions vtep/ovs-vtep
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class Logical_Switch(object):
def del_lbinding(self, lbinding):
vlog.info("removing %s binding from %s" % (lbinding, self.name))
port_no = self.ports[lbinding]
ovs_ofctl("del-flows %s in_port=%s" % (self.short_name, port_no));
ovs_ofctl("del-flows %s in_port=%s" % (self.short_name, port_no))
del self.ports[lbinding]
self.update_flood()

Expand Down Expand Up @@ -520,9 +520,9 @@ def add_binding(binding, ls):
# Create a logical_bindings_stats record.
if not vlan_:
vlan_ = "0"
vtep_ctl("set physical_port %s vlan_stats:%s=@stats --\
--id=@stats create logical_binding_stats packets_from_local=0"\
% (pp_name, vlan_))
vtep_ctl("set physical_port %s vlan_stats:%s=@stats -- "
"--id=@stats create logical_binding_stats packets_from_local=0"
% (pp_name, vlan_))

ls.add_lbinding(lbinding)
Bindings[binding] = ls.name
Expand Down
2 changes: 1 addition & 1 deletion xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def main():
while True:
unixctl_server.run()
if exiting:
break;
break

idl.run()
if not xapi_down and not flush_cache and seqno == idl.change_seqno:
Expand Down

0 comments on commit 080793b

Please sign in to comment.