openstack
/
congress
Code Issues Proposed changes

Enable: E122 continuation line missing indentation or outdented 

Change-Id: I90897f0c027a5b7ed43f42030bf7c5425be66b84
Closes-Bug: #1398558
This commit is contained in:
Samta Rangare 2014-12-06 22:33:00 +05:30
parent 1bd869c3df
commit ee647bfe63
3 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
congress/tests/datasources/test_datasource_driver.py
View File

@ -313,10 +313,10 @@ class TestDatasourceDriver(base.TestCase):
translator = {'translation-type': 'HDICT', 'table-name': 'testtable',
'selector-type': 'DOT_SELECTOR',
'field-translators': (
{'fieldname': 'testfield1', 'col': 'col1',
'translator': self.val_trans},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': self.val_trans})}
{'fieldname': 'testfield1', 'col': 'col1',
'translator': self.val_trans},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': self.val_trans})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
self.assertEqual(1, len(rows))
@ -330,10 +330,10 @@ class TestDatasourceDriver(base.TestCase):
translator = {'translation-type': 'HDICT', 'table-name': 'testtable',
'selector-type': 'DOT_SELECTOR',
'field-translators': (
{'fieldname': 'testfield1', 'col': 'col1',
'translator': self.val_trans},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': self.val_trans})}
{'fieldname': 'testfield1', 'col': 'col1',
'translator': self.val_trans},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': self.val_trans})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
self.assertEqual(1, len(rows))
@ -347,7 +347,8 @@ class TestDatasourceDriver(base.TestCase):
translator = {'translation-type': 'HDICT', 'table-name': 'testtable',
'selector-type': 'DOT_SELECTOR',
'field-translators': (
{'fieldname': 'testfield1', 'translator': self.val_trans},)}
{'fieldname': 'testfield1',
'translator': self.val_trans},)}
rows, k = DataSourceDriver.convert_obj(resp, translator)
self.assertEqual(1, len(rows))
@ -364,14 +365,14 @@ class TestDatasourceDriver(base.TestCase):
translator = {'translation-type': 'HDICT', 'table-name': 'testtable',
'id-col': 'id_col', 'selector-type': 'DOT_SELECTOR',
'field-translators': (
{'fieldname': 'testfield1', 'col': 'col1',
'translator': {'translation-type': 'VALUE',
'extract-fn': lambda x: x['a']}},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': {'translation-type': 'VALUE',
'extract-fn': lambda x: x.b}},
{'fieldname': 'testfield3', 'col': 'col3',
'translator': {'translation-type': 'VALUE'}})}
{'fieldname': 'testfield1', 'col': 'col1',
'translator': {'translation-type': 'VALUE',
'extract-fn': lambda x: x['a']}},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': {'translation-type': 'VALUE',
'extract-fn': lambda x: x.b}},
{'fieldname': 'testfield3', 'col': 'col3',
'translator': {'translation-type': 'VALUE'}})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
self.assertEqual(1, len(rows))
@ -385,16 +386,16 @@ class TestDatasourceDriver(base.TestCase):
translator = {'translation-type': 'HDICT', 'table-name': 'testtable',
'selector-type': 'DOT_SELECTOR',
'field-translators': (
{'fieldname': 'testfield1', 'col': 'col1',
'translator': {'translation-type': 'LIST',
'table-name': 'subtable1',
'id-col': 'id', 'val-col': 'value',
'translator': self.val_trans}},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': {'translation-type': 'LIST',
'table-name': 'subtable2',
'id-col': 'id', 'val-col': 'value',
'translator': self.val_trans}})}
{'fieldname': 'testfield1', 'col': 'col1',
'translator': {'translation-type': 'LIST',
'table-name': 'subtable1',
'id-col': 'id', 'val-col': 'value',
'translator': self.val_trans}},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': {'translation-type': 'LIST',
'table-name': 'subtable2',
'id-col': 'id', 'val-col': 'value',
'translator': self.val_trans}})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
k1 = self.compute_hash(('FOO', 'BAR'))
@ -416,18 +417,18 @@ class TestDatasourceDriver(base.TestCase):
translator = {'translation-type': 'HDICT', 'table-name': 'testtable',
'selector-type': 'DOT_SELECTOR',
'field-translators': (
{'fieldname': 'testfield1', 'col': 'col1',
'translator': {'translation-type': 'VDICT',
'table-name': 'subtable1',
'id-col': 'id', 'key-col': 'key',
'val-col': 'value',
'translator': self.val_trans}},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': {'translation-type': 'VDICT',
'table-name': 'subtable2',
'id-col': 'id', 'key-col': 'key',
'val-col': 'value',
'translator': self.val_trans}})}
{'fieldname': 'testfield1', 'col': 'col1',
'translator': {'translation-type': 'VDICT',
'table-name': 'subtable1',
'id-col': 'id', 'key-col': 'key',
'val-col': 'value',
'translator': self.val_trans}},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': {'translation-type': 'VDICT',
'table-name': 'subtable2',
'id-col': 'id', 'key-col': 'key',
'val-col': 'value',
'translator': self.val_trans}})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
k1 = self.compute_hash((('a', 123), ('b', 456)))
@ -451,32 +452,32 @@ class TestDatasourceDriver(base.TestCase):
'selector-type': 'DICT_SELECTOR',
'id-col': 'id',
'field-translators': (
{'fieldname': 'a',
'col': 'a1',
'translator': self.val_trans},
{'fieldname': 'b',
'col': 'b1',
'translator': self.val_trans})}
{'fieldname': 'a',
'col': 'a1',
'translator': self.val_trans},
{'fieldname': 'b',
'col': 'b1',
'translator': self.val_trans})}
subtranslator_2 = {'translation-type': 'HDICT',
'table-name': 'subtable2',
'selector-type': 'DICT_SELECTOR',
'id-col': 'id',
'field-translators': (
{'fieldname': 'c',
'col': 'c1',
'translator': self.val_trans},
{'fieldname': 'd',
'col': 'd1',
'translator': self.val_trans})}
{'fieldname': 'c',
'col': 'c1',
'translator': self.val_trans},
{'fieldname': 'd',
'col': 'd1',
'translator': self.val_trans})}
translator = {'translation-type': 'HDICT', 'table-name': 'testtable',
'selector-type': 'DOT_SELECTOR',
'field-translators': (
{'fieldname': 'testfield1', 'col': 'col1',
'translator': subtranslator_1},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': subtranslator_2})}
{'fieldname': 'testfield1', 'col': 'col1',
'translator': subtranslator_1},
{'fieldname': 'testfield2', 'col': 'col2',
'translator': subtranslator_2})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
@ -786,23 +787,23 @@ class TestDatasourceDriver(base.TestCase):
'table-name': 'subtable1',
'id-col': 'id1',
'field-translators': (
{'fieldname': 'a',
'col': 'a1',
'translator': self.val_trans},
{'fieldname': 'b',
'col': 'b1',
'translator': self.val_trans})}},
{'fieldname': 'a',
'col': 'a1',
'translator': self.val_trans},
{'fieldname': 'b',
'col': 'b1',
'translator': self.val_trans})}},
{'fieldname': 'testfield2',
'translator': {'translation-type': 'HDICT',
'table-name': 'subtable2',
'id-col': 'id2',
'field-translators': (
{'fieldname': 'c',
'col': 'c1',
'translator': self.val_trans},
{'fieldname': 'd',
'col': 'd1',
'translator': self.val_trans})}},
{'fieldname': 'c',
'col': 'c1',
'translator': self.val_trans},
{'fieldname': 'd',
'col': 'd1',
'translator': self.val_trans})}},
{'fieldname': 'ztestfield3', 'col': 'zparent_col3',
'translator': self.val_trans},
{'fieldname': 'testfield4', 'col': 'parent_col4',

18
congress/tests/datasources/test_neutron_driver.py
View File

@ -515,10 +515,10 @@ def create_network_group(tablename, full_neutron_tablename=None):
network_args = ['x' + str(i) for i in xrange(0, network_max_index + 1)]
formula = compile.parse1(
'{}({}) :- {}({})'.format(
tablename,
'x' + str(network_id_index),
full_neutron_tablename,
",".join(network_args)))
tablename,
'x' + str(network_id_index),
full_neutron_tablename,
",".join(network_args)))
return formula
@ -535,11 +535,11 @@ def create_networkXnetwork_group(tablename):
net2_args = ['y' + str(i) for i in xrange(0, network_max_index + 1)]
formula = compile.parse1(
'{}({},{}) :- neutron:networks({}), neutron2:networks({})'.format(
tablename,
'x' + str(network_id_index),
'y' + str(network_id_index),
",".join(net1_args),
",".join(net2_args)))
tablename,
'x' + str(network_id_index),
'y' + str(network_id_index),
",".join(net1_args),
",".join(net2_args)))
return formula

3
tox.ini
View File

@ -46,12 +46,11 @@ commands = python setup.py testr --no-parallel --testr-args='test_benchmark {pos
# H904 Wrap long lines in parentheses instead of a backslash
# H404 multi line docstring should start with a summary
# H231 Python 3.x incompatible
# E122 continuation line missing indentation or outdented
# E113 unexpected indentation
# H302 import only modules
show-source = True
ignore = E128,E129,E251,F402,F811,F812,H237,H305,H401,H404,H405,H904,H231,E122,H302
ignore = E128,E129,E251,F402,F811,F812,H237,H305,H401,H404,H405,H904,H231,H302
builtins = _
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,*thirdparty/*,CongressLexer.py,CongressParser.py