openstack
/
congress
Code Issues Proposed changes

Enable: E129 

visually indented line with same indent as next logical line Edit

Change-Id: Ica4d4e7d812e14d43375d766c7bebb9d4ce127a4
Closes-Bug: #1398542
This commit is contained in:
Samta Rangare 2014-12-17 23:26:33 -08:00 committed by Aaron Rosen
parent 79d162ca1e
commit 45fb42d3cc
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
congress/datasources/ceilometer_driver.py
View File

@ -124,21 +124,21 @@ class CeilometerDriver(DataSourceDriver):
LOG.debug("Ceilometer grabbing meters")
meters = self.ceilometer_client.meters.list()
if ('meters' not in self.raw_state or meters !=
self.raw_state['meters']):
self.raw_state['meters']):
self.raw_state['meters'] = meters
self._translate_meters(meters)
LOG.debug("Ceilometer grabbing alarms")
alarms = self.ceilometer_client.alarms.list()
if ('alarms' not in self.raw_state or alarms !=
self.raw_state['alarms']):
self.raw_state['alarms']):
self.raw_state['alarms'] = alarms
self._translate_alarms(alarms)
LOG.debug("Ceilometer grabbing events")
events = self.ceilometer_client.events.list()
if ('events' not in self.raw_state or events !=
self.raw_state['events']):
self.raw_state['events']):
self.raw_state['events'] = events
self._translate_events(events)

6
congress/datasources/neutron_driver.py
View File

@ -178,7 +178,7 @@ class NeutronDriver(DataSourceDriver):
LOG.debug("Neutron grabbing networks")
networks = self.neutron.list_networks()
if ('networks' not in self.raw_state or
networks != self.raw_state['networks']):
networks != self.raw_state['networks']):
self.raw_state['networks'] = networks
self._translate_networks(networks)
@ -191,14 +191,14 @@ class NeutronDriver(DataSourceDriver):
LOG.debug("Neutron grabbing routers")
routers = self.neutron.list_routers()
if ('routers' not in self.raw_state or
routers != self.raw_state['routers']):
routers != self.raw_state['routers']):
self.raw_state['routers'] = routers
self._translate_routers(routers)
LOG.debug("Neutron grabbing security groups")
security = self.neutron.list_security_groups()
if ('security_groups' not in self.raw_state or
security != self.raw_state['security_groups']):
security != self.raw_state['security_groups']):
self.raw_state['security_groups'] = security
self._translate_security_groups(security)

4
congress/datasources/swift_driver.py
View File

@ -94,12 +94,12 @@ class SwiftDriver(DataSourceDriver):
LOG.debug("Object Lists--->: %s " % objects)
if ('containers' not in self.raw_state or containers !=
self.raw_state['containers']):
self.raw_state['containers']):
self.raw_state['containers'] = containers
self._translate_containers(containers)
if ('objects' not in self.raw_state or objects !=
self.raw_state['objects']):
self.raw_state['objects']):
self.raw_state['objects'] = objects
self._translate_objects(objects)

2
congress/policy/runtime.py
View File

@ -2624,7 +2624,7 @@ class Runtime (object):
# but formulas can be inserted/deleted into each policy individually.
if all([compile.is_atom(event.formula) for event in events]):
if (theory is self.theory[self.CLASSIFY_THEORY] or
theory is self.theory[self.DATABASE]):
theory is self.theory[self.DATABASE]):
return self.theory[self.ENFORCEMENT_THEORY]
return theory

3
tox.ini
View File

@ -34,7 +34,6 @@ commands = python setup.py testr --no-parallel --testr-args='test_benchmark {pos
testr slowest --all
[flake8]
# E129 visually indented line with same indent as next logical line
# H237 module is removed in Python 3
# H305 imports not grouped correctly
# H405 multi line docstring summary not separated with an empty line
@ -44,6 +43,6 @@ commands = python setup.py testr --no-parallel --testr-args='test_benchmark {pos
show-source = True
ignore = E129,H237,H305,H405,H904,H302
ignore = H237,H305,H405,H904,H302
builtins = _
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,*thirdparty/*,CongressLexer.py,CongressParser.py