Enable E265 check
E265 block comment should start with ‘# ‘ Change-Id: I53a81e7fa0c4bfadb3e5e4d54bda06703583ec9f
This commit is contained in:
Aaron Rosen
parent
b1380ebf26
commit
dda28fc8af
|
|
@ -203,8 +203,8 @@ class CeilometerDriver(DataSourceDriver):
|
|||
for s, t in v.items():
|
||||
if type(t) != type(list()) and type(t) != type(dict()):
|
||||
# FIXME(madhumohan): Dirty workaround. A cleaner
|
||||
#approach is required to handled None object in the
|
||||
#data
|
||||
# approach is required to handled None object in
|
||||
# the data
|
||||
if t is None:
|
||||
t = 'None'
|
||||
row_thres_tuple = (threshold_rule_id, s, t)
|
||||
|
|
@ -247,8 +247,8 @@ class CeilometerDriver(DataSourceDriver):
|
|||
if trait['name'] == 'payload':
|
||||
t_dict = eval(trait['value'])
|
||||
for s, t in t_dict.items():
|
||||
#FIXME(madhumohan): Dictionary items within the payload are
|
||||
#handled as additional fields in the payload
|
||||
# FIXME(madhumohan): Dictionary items within the payload
|
||||
# are handled as additional fields in the payload
|
||||
# table. Need a better way to handle
|
||||
# dictionaries or other structures within payload
|
||||
# Nested dictionaries in the payload are skipped
|
||||
|
|
@ -258,8 +258,8 @@ class CeilometerDriver(DataSourceDriver):
|
|||
if type(m) != type(dict()) and \
|
||||
type(m) != type(list()):
|
||||
# FIXME(madhumohan): Dirty workaround. A cleaner
|
||||
#approach is required to handled None object in the
|
||||
#data
|
||||
# approach is required to handled None object in
|
||||
# the data
|
||||
if m is None:
|
||||
m = 'None'
|
||||
row_trait_tuple = \
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ class TestNeutronDriver(base.TestCase):
|
|||
sec_grp[d['id']])
|
||||
|
||||
|
||||
#### Tests for DataSourceDriver
|
||||
# Tests for DataSourceDriver
|
||||
# Note: these tests are really testing the functionality of the class
|
||||
# DataSourceDriver, but it's useful to use an actual subclass so
|
||||
# we can test the functionality end-to-end. We use Neutron for
|
||||
|
|
@ -656,7 +656,7 @@ network2 = {'networks': [
|
|||
'provider:segmentation_id': 4}]}
|
||||
|
||||
|
||||
## Sample responses from neutron-client, after parsing
|
||||
# Sample responses from neutron-client, after parsing
|
||||
network_response = \
|
||||
{'networks':
|
||||
[{'status': 'ACTIVE',
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class CongressException (Exception):
|
|||
|
||||
|
||||
##############################################################################
|
||||
## Internal representation of policy language
|
||||
# Internal representation of policy language
|
||||
##############################################################################
|
||||
|
||||
class Location (object):
|
||||
|
|
@ -775,7 +775,7 @@ def is_extended_datalog(x):
|
|||
|
||||
|
||||
##############################################################################
|
||||
## Compiler
|
||||
# Compiler
|
||||
##############################################################################
|
||||
|
||||
|
||||
|
|
@ -826,7 +826,7 @@ class Compiler (object):
|
|||
|
||||
|
||||
##############################################################################
|
||||
## External syntax: datalog
|
||||
# External syntax: datalog
|
||||
##############################################################################
|
||||
|
||||
class CongressSyntax(object):
|
||||
|
|
@ -1011,7 +1011,7 @@ def print_tree(tree, text, kids, ind=0):
|
|||
|
||||
|
||||
##############################################################################
|
||||
## Mains
|
||||
# Mains
|
||||
##############################################################################
|
||||
|
||||
def parse(policy_string):
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ class ExecutionLogger(object):
|
|||
|
||||
|
||||
##############################################################################
|
||||
## Events
|
||||
# Events
|
||||
##############################################################################
|
||||
|
||||
class EventQueue(object):
|
||||
|
|
@ -167,7 +167,7 @@ def string_to_database(string):
|
|||
|
||||
|
||||
##############################################################################
|
||||
## Logical Building Blocks
|
||||
# Logical Building Blocks
|
||||
##############################################################################
|
||||
|
||||
class Proof(object):
|
||||
|
|
@ -237,7 +237,7 @@ class DeltaRule(object):
|
|||
|
||||
|
||||
##############################################################################
|
||||
## Abstract Theories
|
||||
# Abstract Theories
|
||||
##############################################################################
|
||||
|
||||
class Theory(object):
|
||||
|
|
@ -390,7 +390,7 @@ class TopDownTheory(Theory):
|
|||
iterstr(self.support)))
|
||||
|
||||
#########################################
|
||||
## External interface
|
||||
# External interface
|
||||
|
||||
def __init__(self, name=None, abbr=None):
|
||||
super(TopDownTheory, self).__init__(name=name, abbr=abbr)
|
||||
|
|
@ -523,7 +523,7 @@ class TopDownTheory(Theory):
|
|||
return list(set(caller.results))
|
||||
|
||||
#########################################
|
||||
## Internal implementation
|
||||
# Internal implementation
|
||||
|
||||
def top_down_eval(self, context, caller):
|
||||
"""Compute all instances of LITERALS (from LITERAL_INDEX and above)
|
||||
|
|
@ -751,7 +751,7 @@ class TopDownTheory(Theory):
|
|||
return False
|
||||
|
||||
#########################################
|
||||
## Routines for specialization
|
||||
# Routines for specialization
|
||||
|
||||
@classmethod
|
||||
def new_bi_unifier(cls, dictionary=None):
|
||||
|
|
@ -811,7 +811,7 @@ class TopDownTheory(Theory):
|
|||
|
||||
|
||||
##############################################################################
|
||||
## Concrete Theory: Database
|
||||
# Concrete Theory: Database
|
||||
##############################################################################
|
||||
|
||||
|
||||
|
|
@ -1120,21 +1120,14 @@ class Database(TopDownTheory):
|
|||
self.log(atom.table, "First tuple in table {}".format(table))
|
||||
return
|
||||
else:
|
||||
#self.log(table, "Not first tuple in table {}".format(table))
|
||||
for existingtuple in self.data[table]:
|
||||
assert(existingtuple.proofs is not None)
|
||||
if existingtuple.tuple == dbtuple.tuple:
|
||||
# self.log(table, "Found existing tuple: {}".format(
|
||||
# str(existingtuple)))
|
||||
assert(existingtuple.proofs is not None)
|
||||
existingtuple.proofs |= dbtuple.proofs
|
||||
# self.log(table,
|
||||
# "Updated tuple: {}".format(str(existingtuple)))
|
||||
assert(existingtuple.proofs is not None)
|
||||
return
|
||||
self.data[table].append(dbtuple)
|
||||
#self.log(table, "current contents of {}: {}".format(table,
|
||||
# iterstr(self.data[table])))
|
||||
|
||||
def delete_actual(self, atom, proofs=None):
|
||||
"""Workhorse for deleting ATOM from the DB, along with the proofs
|
||||
|
|
@ -1147,7 +1140,6 @@ class Database(TopDownTheory):
|
|||
return
|
||||
for i in xrange(0, len(self.data[table])):
|
||||
existingtuple = self.data[table][i]
|
||||
#self.log(table, "Checking tuple {}".format(str(existingtuple)))
|
||||
if existingtuple.tuple == dbtuple.tuple:
|
||||
existingtuple.proofs -= dbtuple.proofs
|
||||
if len(existingtuple.proofs) == 0:
|
||||
|
|
@ -1175,7 +1167,7 @@ class Database(TopDownTheory):
|
|||
|
||||
|
||||
##############################################################################
|
||||
## Concrete Theories: other
|
||||
# Concrete Theories: other
|
||||
##############################################################################
|
||||
|
||||
class NonrecursiveRuleTheory(TopDownTheory):
|
||||
|
|
@ -1189,7 +1181,7 @@ class NonrecursiveRuleTheory(TopDownTheory):
|
|||
for rule in rules:
|
||||
self.insert(rule)
|
||||
|
||||
############### External Interface ###############
|
||||
# External Interface
|
||||
|
||||
# SELECT implemented by TopDownTheory
|
||||
|
||||
|
|
@ -1267,7 +1259,7 @@ class NonrecursiveRuleTheory(TopDownTheory):
|
|||
return None
|
||||
return len(self.contents[tablename][0].head.arguments)
|
||||
|
||||
############### Internal Interface ###############
|
||||
# Internal Interface
|
||||
|
||||
def insert_actual(self, rule):
|
||||
"""Insert RULE and return True if there was a change.
|
||||
|
|
@ -1613,7 +1605,7 @@ class MaterializedViewTheory(TopDownTheory):
|
|||
'database': self.database.tracer,
|
||||
'delta_rules': self.delta_rules.tracer}
|
||||
|
||||
############### External Interface ###############
|
||||
# External Interface
|
||||
|
||||
# SELECT is handled by TopDownTheory
|
||||
|
||||
|
|
@ -1682,7 +1674,7 @@ class MaterializedViewTheory(TopDownTheory):
|
|||
return result
|
||||
return self.delta_rules.get_arity_self(tablename)
|
||||
|
||||
############### Interface implementation ###############
|
||||
# Interface implementation
|
||||
|
||||
def explain_aux(self, query, depth):
|
||||
self.log(query.table, "Explaining {}".format(str(query)), depth)
|
||||
|
|
@ -1875,7 +1867,7 @@ class MaterializedViewTheory(TopDownTheory):
|
|||
|
||||
|
||||
##############################################################################
|
||||
## Runtime
|
||||
# Runtime
|
||||
##############################################################################
|
||||
|
||||
class Runtime (object):
|
||||
|
|
@ -1954,7 +1946,7 @@ class Runtime (object):
|
|||
tracer = Tracer()
|
||||
self.set_tracer(tracer)
|
||||
|
||||
############### External interface ###############
|
||||
# External interface
|
||||
def dump_dir(self, path):
|
||||
"""Dump each theory into its own file within the
|
||||
directory PATH. The name of the file is the name of
|
||||
|
|
@ -2179,13 +2171,13 @@ class Runtime (object):
|
|||
def reserved_tablename(self, name):
|
||||
return name.startswith('___')
|
||||
|
||||
############### Internal interface ###############
|
||||
## Translate different representations of formulas into
|
||||
## the compiler's internal representation and then invoke
|
||||
## appropriate theory's version of the API.
|
||||
# Internal interface
|
||||
# Translate different representations of formulas into
|
||||
# the compiler's internal representation and then invoke
|
||||
# appropriate theory's version of the API.
|
||||
|
||||
## Arguments that are strings are suffixed with _string.
|
||||
## All other arguments are instances of Theory, Literal, etc.
|
||||
# Arguments that are strings are suffixed with _string.
|
||||
# All other arguments are instances of Theory, Literal, etc.
|
||||
|
||||
###################################
|
||||
# Update policies and data.
|
||||
|
|
@ -2450,7 +2442,7 @@ class Runtime (object):
|
|||
return (result, tracer.get_value())
|
||||
return result
|
||||
|
||||
############### Helpers ###############
|
||||
# Helpers
|
||||
|
||||
def react_to_changes(self, changes):
|
||||
"""Filters changes and executes actions contained therein."""
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ class TestRuntime(unittest.TestCase):
|
|||
"\n".join([str(x) for x in errs])))
|
||||
return
|
||||
|
||||
#### Ports
|
||||
# Ports
|
||||
query = 'neutron:port(x1, x2, x3, x4, x5, x6, x7, x8, x9)'
|
||||
acts = 'neutron:create_port("net1", 17), sys:user("tim") :- true'
|
||||
correct = ('neutron:port(id, "net1", name, mac, "null",'
|
||||
|
|
@ -345,7 +345,7 @@ class TestRuntime(unittest.TestCase):
|
|||
correct = ''
|
||||
check(query, acts, correct, 'Port create, update, delete')
|
||||
|
||||
#### Networks
|
||||
# Networks
|
||||
query = ('neutron:network(id, name, status, admin_state, shared,'
|
||||
'tenenant_id)')
|
||||
acts = 'neutron:create_network(17), sys:user("tim") :- true'
|
||||
|
|
@ -369,7 +369,7 @@ class TestRuntime(unittest.TestCase):
|
|||
correct = ''
|
||||
check(query, acts, correct, 'Network creation, update')
|
||||
|
||||
#### Subnets
|
||||
# Subnets
|
||||
query = ('neutron:subnet(id, name, network_id, '
|
||||
'gateway_ip, ip_version, cidr, enable_dhcp, tenant_id)')
|
||||
acts = ('neutron:create_subnet("net1", "10.0.0.1/24", 17), '
|
||||
|
|
|
|||
3
tox.ini
3
tox.ini
|
|
@ -28,7 +28,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
|
|||
# E128 continuation line under-indented for visual indent
|
||||
# E129 visually indented line with same indent as next logical line
|
||||
# E251 unexpected spaces around keyword / parameter equals
|
||||
# E265 block comment should start with ‘# ‘
|
||||
# E713 test for membership should be ‘not in’
|
||||
# F402 import module shadowed by loop variable
|
||||
# F811 redefinition of unused variable
|
||||
|
|
@ -52,6 +51,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
|
|||
|
||||
|
||||
show-source = True
|
||||
ignore = E125,E126,E128,E129,E251,E265,E713,F402,F811,F812,H237,H305,H307,H401,H402,H404,H405,H904,H302,H231,E122,E113,H301,H233,E112,E303
|
||||
ignore = E125,E126,E128,E129,E251,E713,F402,F811,F812,H237,H305,H307,H401,H402,H404,H405,H904,H302,H231,E122,E113,H301,H233,E112,E303
|
||||
builtins = _
|
||||
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,*thirdparty/*,CongressLexer.py,CongressParser.py
|
||||
|
|
|
|||
Loading…
Reference in New Issue