openstack
/
congress
Code Issues Proposed changes

Enabled H233/H402 check 

Enabled the following pep8 checks:
H233 Python 3.x incompatible use of print operator
H402 one line docstring needs punctuation

Closes-Bug: #1398683

Change-Id: I53da19191ac63b5317e2c2ed705bd945229ddb00
This commit is contained in:
Lianhao Lu 2014-12-03 14:15:37 +08:00
parent fae0f8f488
commit f8f469a6e7
13 changed files with 60 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
congress/datasources/benchmark_driver.py
View File

@ -66,13 +66,13 @@ class BenchmarkDriver(DataSourceDriver):
# Allow simple manual tests on mocked data
def main():
print 'Schema:'
print '\n'.join(['%s %s' % (k, v)
for k, v in BenchmarkDriver.get_schema().items()])
print('Schema:')
print('\n'.join(['%s %s' % (k, v)
for k, v in BenchmarkDriver.get_schema().items()]))
driver = BenchmarkDriver()
driver.update_from_datasource()
print 'Resulting state'
print str(driver.state)
print('Resulting state')
print(str(driver.state))
if __name__ == '__main__':

22
congress/datasources/ceilometer_driver.py
View File

@ -289,21 +289,21 @@ class CeilometerDriver(DataSourceDriver):
def main():
driver = CeilometerDriver()
print "Last updated: %s" % driver.get_last_updated_time()
print("Last updated: %s" % driver.get_last_updated_time())
print "Starting Ceilometer Sync Service"
print "Tuple Names : " + str(driver.get_tuple_names())
print ("Tuple Metadata - : " +
str(CeilometerDriver.get_schema()))
print("Starting Ceilometer Sync Service")
print("Tuple Names : " + str(driver.get_tuple_names()))
print("Tuple Metadata - : " +
str(CeilometerDriver.get_schema()))
# sync with the ceilometer service
driver.update_from_datasource()
print "Meters: %s" % driver.get_all(driver.METERS)
print "Alarms: %s" % driver.get_all(driver.ALARMS)
print "Events: %s" % driver.get_all(driver.EVENTS)
print "Last updated: %s" % driver.get_last_updated_time()
print "Sync completed"
print("Meters: %s" % driver.get_all(driver.METERS))
print("Alarms: %s" % driver.get_all(driver.ALARMS))
print("Events: %s" % driver.get_all(driver.EVENTS))
print("Last updated: %s" % driver.get_last_updated_time())
print("Sync completed")
print "-----------------------------------------"
print("-----------------------------------------")
if __name__ == '__main__':

8
congress/datasources/cinder_driver.py
View File

@ -123,10 +123,10 @@ class CinderDriver(DataSourceDriver):
def main():
driver = CinderDriver()
driver.update_from_datasource()
print "Original api data"
print str(driver.raw_state)
print "Resulting state"
print str(driver.state)
print("Original api data")
print(str(driver.raw_state))
print("Resulting state")
print(str(driver.state))
if __name__ == '__main__':
try:

6
congress/datasources/keystone_driver.py
View File

@ -104,9 +104,9 @@ class KeystoneDriver(DataSourceDriver):
def main():
print 'Schema:'
print '\n'.join([k + ' ' + str(v)
for k, v in KeystoneDriver.get_schema().items()])
print('Schema:')
print('\n'.join([k + ' ' + str(v)
for k, v in KeystoneDriver.get_schema().items()]))
if __name__ == '__main__':

14
congress/datasources/neutron_driver.py
View File

@ -280,16 +280,16 @@ class NeutronDriver(DataSourceDriver):
# Useful to have a main so we can run manual tests easily
# and see the Input/Output for a live Neutron
def main():
print 'Schema:'
print '\n'.join([k + ' ' + str(v)
for k, v in NeutronDriver.get_schema().items()])
print('Schema:')
print('\n'.join([k + ' ' + str(v)
for k, v in NeutronDriver.get_schema().items()]))
driver = NeutronDriver()
driver.update_from_datasource()
print "Original api data"
print str(driver.raw_state)
print "Resulting state"
print str(driver.state)
print("Original api data")
print(str(driver.raw_state))
print("Resulting state")
print(str(driver.state))
if __name__ == '__main__':

14
congress/datasources/nova_driver.py
View File

@ -156,16 +156,16 @@ class NovaDriver(DataSourceDriver):
# Useful to have a main so we can run manual tests easily
# and see the Input/Output for the mocked Neutron
def main():
print 'Schema:'
print '\n'.join([k + ' ' + str(v)
for k, v in NovaDriver.get_schema().items()])
print('Schema:')
print('\n'.join([k + ' ' + str(v)
for k, v in NovaDriver.get_schema().items()]))
driver = NovaDriver()
driver.update_from_datasource()
print "Original api data"
print str(driver.raw_state)
print "Resulting state"
print str(driver.state)
print("Original api data")
print(str(driver.raw_state))
print("Resulting state")
print(str(driver.state))
if __name__ == '__main__':

2
congress/datasources/swift_driver.py
View File

@ -142,7 +142,7 @@ def main():
driver = SwiftDriver()
driver.update_from_datasource()
print "Starting Swift Sync Service"
print("Starting Swift Sync Service")
if __name__ == '__main__':
try:

12
congress/policy/builtin/congressbuiltin.py
View File

@ -195,7 +195,7 @@ class CongressBuiltinPred(object):
self.predname = predstring.split('(')[0]
self.predargs = predstring.split('(')[1].split(')')[0].split(',')
except Exception:
print "Unexpected error in parsing predicate string"
print("Unexpected error in parsing predicate string")
def __str__(self):
return self.predname + '(' + ",".join(self.predargs) + ')'
@ -338,7 +338,7 @@ class CongressBuiltinCategoryMap(object):
for key, value in self.categorydict.items():
predlist = self.categorydict[key]
for pred in predlist:
print str(pred)
print(str(pred))
# a Singleton that serves as the entry point for builtin functionality
@ -349,16 +349,16 @@ def main():
cbcmap = CongressBuiltinCategoryMap(_builtin_map)
cbcmap.list_available_builtins()
predl = cbcmap.builtin('lt')
print predl
print 'printing pred'
print(predl)
print('printing pred')
predl.string_to_pred('ltc(x,y)')
cbcmap.list_available_builtins()
cbcmap.delete_builtin('arithmetic', 'max', 2)
cbcmap.list_available_builtins()
predl = cbcmap.builtin('plus')
result = predl.code(1, 2)
print result
print cbcmap
print(result)
print(cbcmap)
if __name__ == "__main__":
main()

2
congress/policy/builtin/tests/test_builtin.py
View File

@ -342,7 +342,7 @@ class TestTheories(unittest.TestCase):
self.test_builtins_content(MAT_THEORY)
def test_builtins_content(self, th=NREC_THEORY):
"""Test the content of the builtins, not the mechanism"""
"""Test the content of the builtins, not the mechanism."""
def check_true(code, msg):
run = self.prep_runtime('')
run.insert(code, target=th)

6
congress/policy/compile.py
View File

@ -1329,8 +1329,8 @@ def print_tree(tree, text, kids, ind=0):
function KIDS to compute the children of a given node.
IND is a number representing the indentation level.
"""
print "|" * ind,
print "{}".format(str(text(tree)))
print("|" * ind)
print("{}".format(str(text(tree))))
children = kids(tree)
if children:
for child in children:
@ -1382,7 +1382,7 @@ def get_compiler(args, theories=None):
def main(args):
c = get_compiler(args)
for formula in c.theory:
print str(c)
print(str(c))
if __name__ == '__main__':

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

@ -189,7 +189,6 @@ class TestDatasourceDriver(base.TestCase):
'id-col': 'id_col', 'key-col': 'key', 'val-col': 'value',
'translator': self.val_trans}
rows, k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
k1 = self.compute_hash((('a', 'FOO'), ('b', 123)))
@ -205,7 +204,6 @@ class TestDatasourceDriver(base.TestCase):
'key-col': 'key', 'val-col': 'value',
'translator': self.val_trans}
rows, k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
self.assertEqual(2, len(rows))
self.assertEqual(None, k)
@ -222,7 +220,6 @@ class TestDatasourceDriver(base.TestCase):
'id-col': 'id_col', 'val-col': 'val_col',
'translator': self.val_trans}}
rows, actual_k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
k1 = self.compute_hash((1, 2, 3))
k2 = self.compute_hash(('a', 'b'))
@ -255,7 +252,6 @@ class TestDatasourceDriver(base.TestCase):
'id-col': 'id_col', 'val-col': 'value',
'translator': self.val_trans}
rows, k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
k1 = self.compute_hash((1, 'a', 'b', 'True'))
@ -272,7 +268,6 @@ class TestDatasourceDriver(base.TestCase):
translator = {'translation-type': 'LIST', 'table-name': 'testtable',
'val-col': 'value', 'translator': self.val_trans}
rows, k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
self.assertEqual(4, len(rows))
self.assertEqual(None, k)
@ -291,7 +286,6 @@ class TestDatasourceDriver(base.TestCase):
'id-col': 'id_col', 'val-col': 'val_col',
'translator': self.val_trans}}
rows, actual_k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
k1 = self.compute_hash((1, 2, 3))
k2 = self.compute_hash(('a', 'b', 'c'))
@ -324,7 +318,6 @@ class TestDatasourceDriver(base.TestCase):
{'fieldname': 'testfield2', 'col': 'col2',
'translator': self.val_trans})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
self.assertEqual(1, len(rows))
self.assertEqual(None, k)
@ -342,7 +335,6 @@ class TestDatasourceDriver(base.TestCase):
{'fieldname': 'testfield2', 'col': 'col2',
'translator': self.val_trans})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
self.assertEqual(1, len(rows))
self.assertEqual(None, k)
@ -357,7 +349,6 @@ class TestDatasourceDriver(base.TestCase):
'field-translators': (
{'fieldname': 'testfield1', 'translator': self.val_trans},)}
rows, k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
self.assertEqual(1, len(rows))
self.assertEqual(None, k)
@ -382,7 +373,6 @@ class TestDatasourceDriver(base.TestCase):
{'fieldname': 'testfield3', 'col': 'col3',
'translator': {'translation-type': 'VALUE'}})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
self.assertEqual(1, len(rows))
self.assertEqual(self.compute_hash(('FOO', 123, 456)), k)
@ -406,7 +396,6 @@ class TestDatasourceDriver(base.TestCase):
'id-col': 'id', 'val-col': 'value',
'translator': self.val_trans}})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
k1 = self.compute_hash(('FOO', 'BAR'))
k2 = self.compute_hash((1, 2, 3))
@ -440,7 +429,6 @@ class TestDatasourceDriver(base.TestCase):
'val-col': 'value',
'translator': self.val_trans}})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
k1 = self.compute_hash((('a', 123), ('b', 456)))
k2 = self.compute_hash((('c', 'abc'), ('d', 'def')))
@ -491,7 +479,6 @@ class TestDatasourceDriver(base.TestCase):
'translator': subtranslator_2})}
rows, k = DataSourceDriver.convert_obj(resp, translator)
print "Rows: %s" % ('\n'.join([str(x) for x in rows]))
k1 = self.compute_hash((123, 456))
k2 = self.compute_hash(('abc', 'def'))
@ -847,8 +834,6 @@ class TestDatasourceDriver(base.TestCase):
self.register_translator(self.translator)
schema = TestDriver().get_schema()
print "SCHEMA: %s" % str([str((k, schema[k]))
for k in sorted(schema.keys())])
self.assertEqual(7, len(schema))
self.assertTrue(schema['subtable1'] == ('id1', 'a1', 'b1'))
self.assertTrue(schema['subtable2'] == ('id2', 'c1', 'd1'))
@ -876,8 +861,7 @@ class TestDatasourceDriver(base.TestCase):
self.register_translator(self.translator)
try:
schema = TestDriver().get_schema()
print "SCHEMA: " + str(schema)
TestDriver().get_schema()
except exception.DuplicateTableName, e:
self.assertTrue('table (testtable) used twice' in str(e))
else:
@ -904,8 +888,7 @@ class TestDatasourceDriver(base.TestCase):
self.register_translator(self.translator)
schema = TestDriver().get_schema()
print "SCHEMA: %s" % str([str((k, schema[k]))
for k in sorted(schema.keys())])
self.assertEqual(2, len(schema))
self.assertTrue(schema['testtable'] == ('id_col', 'unique_key'))
self.assertTrue(schema['subtable'] == ('parent_key', 'val'))
@ -929,8 +912,7 @@ class TestDatasourceDriver(base.TestCase):
self.register_translator(self.translator)
schema = TestDriver().get_schema()
print "SCHEMA: %s" % str([str((k, schema[k]))
for k in sorted(schema.keys())])
self.assertEqual(2, len(schema))
self.assertTrue(schema['testtable'] == ('id_col', 'key'))
self.assertTrue(schema['subtable'] == ('parent_key', 'val'))

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

@ -570,16 +570,16 @@ def main():
driver = NeutronDriver(name="testneutron", args=args)
driver.update_from_datasource()
print "Original api data"
print str(driver.raw_state)
print "Resulting state"
print str(driver.state)
print("Original api data")
print(str(driver.raw_state))
print("Resulting state")
print(str(driver.state))
driver.update_from_datasource()
print "Original api data"
print str(driver.raw_state)
print "Resulting state"
print str(driver.state)
print("Original api data")
print(str(driver.raw_state))
print("Resulting state")
print(str(driver.state))
# Only diffs between network1 and network2 are the IDs
network1 = {'networks': [

2
tox.ini
View File

@ -56,6 +56,6 @@ commands = python setup.py testr --no-parallel --testr-args='test_benchmark {pos
show-source = True
ignore = E125,E126,E128,E129,E251,E713,F402,F811,F812,H237,H305,H307,H401,H404,H405,H904,H231,E122,H301,
ignore = E125,E126,E128,E129,E251,E713,F402,F811,F812,H237,H305,H307,H401,H404,H405,H904,H231,E122,H301
builtins = _
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,*thirdparty/*,CongressLexer.py,CongressParser.py