Francesco Romani has uploaded a new change for review. Change subject: pep8: lib cleanups for pep-1.5.x ......................................................................
pep8: lib cleanups for pep-1.5.x lib/* is now pep8 1.5.x clean. Change-Id: I145fb9520219678d24d17698af618b44071ecbf4 Signed-off-by: Francesco Romani <[email protected]> --- M lib/vdsm/ipwrapper.py M lib/vdsm/netinfo.py M lib/vdsm/tool/upgrade_300_networks.py 3 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/26425/1 diff --git a/lib/vdsm/ipwrapper.py b/lib/vdsm/ipwrapper.py index 3e43166..f51166c 100644 --- a/lib/vdsm/ipwrapper.py +++ b/lib/vdsm/ipwrapper.py @@ -668,7 +668,7 @@ # since that's how iproute2 reports it and there is currently no # disambiguation (iproute bug https://bugzilla.redhat.com/1042799 data['name'] = data['name'].split('@', 1)[0] - state = state if state or not 'state' in data else data['state'] + state = state if state or 'state' not in data else data['state'] return MonitorEvent(data['index'], data['name'], data['flags'], state) @classmethod diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index 29b2bd2..bfc316c 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -510,8 +510,9 @@ def _bridgeinfo(link, gateways, ipv6routes, ipaddrs): info = _devinfo(link, ipaddrs) info.update({'gateway': getgateway(gateways, link.name), - 'ipv6gateway': ipv6routes.get(link.name, '::'), - 'ports': ports(link.name), 'stp': bridge_stp_state(link.name)}) + 'ipv6gateway': ipv6routes.get(link.name, '::'), + 'ports': ports(link.name), + 'stp': bridge_stp_state(link.name)}) return info diff --git a/lib/vdsm/tool/upgrade_300_networks.py b/lib/vdsm/tool/upgrade_300_networks.py index 7a9ac91..9b29663 100644 --- a/lib/vdsm/tool/upgrade_300_networks.py +++ b/lib/vdsm/tool/upgrade_300_networks.py @@ -48,7 +48,7 @@ # Create a network for every bridge that doesn't have one for bridge in bridges: - if not bridge in networks: + if bridge not in networks: logging.debug('Creating network %s', bridge) configWriter.createLibvirtNetwork(network=bridge, bridged=True, -- To view, visit http://gerrit.ovirt.org/26425 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I145fb9520219678d24d17698af618b44071ecbf4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
