mirror of
https://github.com/SELinuxProject/selinux
synced 2025-04-29 06:07:58 +00:00
python: reindent lines that were over-indented
Flake8 3.7.0 warns about lines that are over-indented, i.e. lines that
are indented with more than 4 spaces:
python/sepolgen/src/sepolgen/refparser.py:1047:26: E117 over-indented
python/sepolgen/src/sepolgen/yacc.py:2569:21: E117 over-indented
python/sepolicy/sepolicy/interface.py:196:13: E117 over-indented
python/sepolicy/sepolicy/interface.py:198:13: E117 over-indented
python/sepolicy/sepolicy/interface.py:215:13: E117 over-indented
python/sepolicy/sepolicy/interface.py:217:13: E117 over-indented
python/sepolicy/sepolicy/manpage.py:172:13: E117 over-indented
python/sepolicy/sepolicy/manpage.py:174:13: E117 over-indented
Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
This commit is contained in:
Nicolas Iooss
parent
0445e65d83
commit
61f7b35b10
@ -1044,7 +1044,7 @@ def list_headers(root):
|
|||||||
if name == "obj_perm_sets.spt":
|
if name == "obj_perm_sets.spt":
|
||||||
support_macros = filename
|
support_macros = filename
|
||||||
elif len(re.findall("patterns", modname[0])):
|
elif len(re.findall("patterns", modname[0])):
|
||||||
modules.append((modname[0], filename))
|
modules.append((modname[0], filename))
|
||||||
elif modname[1] == '.if':
|
elif modname[1] == '.if':
|
||||||
modules.append((modname[0], filename))
|
modules.append((modname[0], filename))
|
||||||
|
|
||||||
|
|||||||
@ -2566,118 +2566,118 @@ class LRGeneratedTable(LRTable):
|
|||||||
log.info('')
|
log.info('')
|
||||||
|
|
||||||
for p in I:
|
for p in I:
|
||||||
if p.len == p.lr_index + 1:
|
if p.len == p.lr_index + 1:
|
||||||
if p.name == "S'":
|
if p.name == "S'":
|
||||||
# Start symbol. Accept!
|
# Start symbol. Accept!
|
||||||
st_action['$end'] = 0
|
st_action['$end'] = 0
|
||||||
st_actionp['$end'] = p
|
st_actionp['$end'] = p
|
||||||
else:
|
|
||||||
# We are at the end of a production. Reduce!
|
|
||||||
if self.lr_method == 'LALR':
|
|
||||||
laheads = p.lookaheads[st]
|
|
||||||
else:
|
|
||||||
laheads = self.grammar.Follow[p.name]
|
|
||||||
for a in laheads:
|
|
||||||
actlist.append((a, p, 'reduce using rule %d (%s)' % (p.number, p)))
|
|
||||||
r = st_action.get(a)
|
|
||||||
if r is not None:
|
|
||||||
# Whoa. Have a shift/reduce or reduce/reduce conflict
|
|
||||||
if r > 0:
|
|
||||||
# Need to decide on shift or reduce here
|
|
||||||
# By default we favor shifting. Need to add
|
|
||||||
# some precedence rules here.
|
|
||||||
|
|
||||||
# Shift precedence comes from the token
|
|
||||||
sprec, slevel = Precedence.get(a, ('right', 0))
|
|
||||||
|
|
||||||
# Reduce precedence comes from rule being reduced (p)
|
|
||||||
rprec, rlevel = Productions[p.number].prec
|
|
||||||
|
|
||||||
if (slevel < rlevel) or ((slevel == rlevel) and (rprec == 'left')):
|
|
||||||
# We really need to reduce here.
|
|
||||||
st_action[a] = -p.number
|
|
||||||
st_actionp[a] = p
|
|
||||||
if not slevel and not rlevel:
|
|
||||||
log.info(' ! shift/reduce conflict for %s resolved as reduce', a)
|
|
||||||
self.sr_conflicts.append((st, a, 'reduce'))
|
|
||||||
Productions[p.number].reduced += 1
|
|
||||||
elif (slevel == rlevel) and (rprec == 'nonassoc'):
|
|
||||||
st_action[a] = None
|
|
||||||
else:
|
|
||||||
# Hmmm. Guess we'll keep the shift
|
|
||||||
if not rlevel:
|
|
||||||
log.info(' ! shift/reduce conflict for %s resolved as shift', a)
|
|
||||||
self.sr_conflicts.append((st, a, 'shift'))
|
|
||||||
elif r < 0:
|
|
||||||
# Reduce/reduce conflict. In this case, we favor the rule
|
|
||||||
# that was defined first in the grammar file
|
|
||||||
oldp = Productions[-r]
|
|
||||||
pp = Productions[p.number]
|
|
||||||
if oldp.line > pp.line:
|
|
||||||
st_action[a] = -p.number
|
|
||||||
st_actionp[a] = p
|
|
||||||
chosenp, rejectp = pp, oldp
|
|
||||||
Productions[p.number].reduced += 1
|
|
||||||
Productions[oldp.number].reduced -= 1
|
|
||||||
else:
|
|
||||||
chosenp, rejectp = oldp, pp
|
|
||||||
self.rr_conflicts.append((st, chosenp, rejectp))
|
|
||||||
log.info(' ! reduce/reduce conflict for %s resolved using rule %d (%s)',
|
|
||||||
a, st_actionp[a].number, st_actionp[a])
|
|
||||||
else:
|
|
||||||
raise LALRError('Unknown conflict in state %d' % st)
|
|
||||||
else:
|
|
||||||
st_action[a] = -p.number
|
|
||||||
st_actionp[a] = p
|
|
||||||
Productions[p.number].reduced += 1
|
|
||||||
else:
|
else:
|
||||||
i = p.lr_index
|
# We are at the end of a production. Reduce!
|
||||||
a = p.prod[i+1] # Get symbol right after the "."
|
if self.lr_method == 'LALR':
|
||||||
if a in self.grammar.Terminals:
|
laheads = p.lookaheads[st]
|
||||||
g = self.lr0_goto(I, a)
|
else:
|
||||||
j = self.lr0_cidhash.get(id(g), -1)
|
laheads = self.grammar.Follow[p.name]
|
||||||
if j >= 0:
|
for a in laheads:
|
||||||
# We are in a shift state
|
actlist.append((a, p, 'reduce using rule %d (%s)' % (p.number, p)))
|
||||||
actlist.append((a, p, 'shift and go to state %d' % j))
|
r = st_action.get(a)
|
||||||
r = st_action.get(a)
|
if r is not None:
|
||||||
if r is not None:
|
# Whoa. Have a shift/reduce or reduce/reduce conflict
|
||||||
# Whoa have a shift/reduce or shift/shift conflict
|
if r > 0:
|
||||||
if r > 0:
|
# Need to decide on shift or reduce here
|
||||||
if r != j:
|
# By default we favor shifting. Need to add
|
||||||
raise LALRError('Shift/shift conflict in state %d' % st)
|
# some precedence rules here.
|
||||||
elif r < 0:
|
|
||||||
# Do a precedence check.
|
|
||||||
# - if precedence of reduce rule is higher, we reduce.
|
|
||||||
# - if precedence of reduce is same and left assoc, we reduce.
|
|
||||||
# - otherwise we shift
|
|
||||||
|
|
||||||
# Shift precedence comes from the token
|
# Shift precedence comes from the token
|
||||||
sprec, slevel = Precedence.get(a, ('right', 0))
|
sprec, slevel = Precedence.get(a, ('right', 0))
|
||||||
|
|
||||||
# Reduce precedence comes from the rule that could have been reduced
|
# Reduce precedence comes from rule being reduced (p)
|
||||||
rprec, rlevel = Productions[st_actionp[a].number].prec
|
rprec, rlevel = Productions[p.number].prec
|
||||||
|
|
||||||
if (slevel > rlevel) or ((slevel == rlevel) and (rprec == 'right')):
|
|
||||||
# We decide to shift here... highest precedence to shift
|
|
||||||
Productions[st_actionp[a].number].reduced -= 1
|
|
||||||
st_action[a] = j
|
|
||||||
st_actionp[a] = p
|
|
||||||
if not rlevel:
|
|
||||||
log.info(' ! shift/reduce conflict for %s resolved as shift', a)
|
|
||||||
self.sr_conflicts.append((st, a, 'shift'))
|
|
||||||
elif (slevel == rlevel) and (rprec == 'nonassoc'):
|
|
||||||
st_action[a] = None
|
|
||||||
else:
|
|
||||||
# Hmmm. Guess we'll keep the reduce
|
|
||||||
if not slevel and not rlevel:
|
|
||||||
log.info(' ! shift/reduce conflict for %s resolved as reduce', a)
|
|
||||||
self.sr_conflicts.append((st, a, 'reduce'))
|
|
||||||
|
|
||||||
|
if (slevel < rlevel) or ((slevel == rlevel) and (rprec == 'left')):
|
||||||
|
# We really need to reduce here.
|
||||||
|
st_action[a] = -p.number
|
||||||
|
st_actionp[a] = p
|
||||||
|
if not slevel and not rlevel:
|
||||||
|
log.info(' ! shift/reduce conflict for %s resolved as reduce', a)
|
||||||
|
self.sr_conflicts.append((st, a, 'reduce'))
|
||||||
|
Productions[p.number].reduced += 1
|
||||||
|
elif (slevel == rlevel) and (rprec == 'nonassoc'):
|
||||||
|
st_action[a] = None
|
||||||
else:
|
else:
|
||||||
raise LALRError('Unknown conflict in state %d' % st)
|
# Hmmm. Guess we'll keep the shift
|
||||||
|
if not rlevel:
|
||||||
|
log.info(' ! shift/reduce conflict for %s resolved as shift', a)
|
||||||
|
self.sr_conflicts.append((st, a, 'shift'))
|
||||||
|
elif r < 0:
|
||||||
|
# Reduce/reduce conflict. In this case, we favor the rule
|
||||||
|
# that was defined first in the grammar file
|
||||||
|
oldp = Productions[-r]
|
||||||
|
pp = Productions[p.number]
|
||||||
|
if oldp.line > pp.line:
|
||||||
|
st_action[a] = -p.number
|
||||||
|
st_actionp[a] = p
|
||||||
|
chosenp, rejectp = pp, oldp
|
||||||
|
Productions[p.number].reduced += 1
|
||||||
|
Productions[oldp.number].reduced -= 1
|
||||||
|
else:
|
||||||
|
chosenp, rejectp = oldp, pp
|
||||||
|
self.rr_conflicts.append((st, chosenp, rejectp))
|
||||||
|
log.info(' ! reduce/reduce conflict for %s resolved using rule %d (%s)',
|
||||||
|
a, st_actionp[a].number, st_actionp[a])
|
||||||
else:
|
else:
|
||||||
st_action[a] = j
|
raise LALRError('Unknown conflict in state %d' % st)
|
||||||
st_actionp[a] = p
|
else:
|
||||||
|
st_action[a] = -p.number
|
||||||
|
st_actionp[a] = p
|
||||||
|
Productions[p.number].reduced += 1
|
||||||
|
else:
|
||||||
|
i = p.lr_index
|
||||||
|
a = p.prod[i+1] # Get symbol right after the "."
|
||||||
|
if a in self.grammar.Terminals:
|
||||||
|
g = self.lr0_goto(I, a)
|
||||||
|
j = self.lr0_cidhash.get(id(g), -1)
|
||||||
|
if j >= 0:
|
||||||
|
# We are in a shift state
|
||||||
|
actlist.append((a, p, 'shift and go to state %d' % j))
|
||||||
|
r = st_action.get(a)
|
||||||
|
if r is not None:
|
||||||
|
# Whoa have a shift/reduce or shift/shift conflict
|
||||||
|
if r > 0:
|
||||||
|
if r != j:
|
||||||
|
raise LALRError('Shift/shift conflict in state %d' % st)
|
||||||
|
elif r < 0:
|
||||||
|
# Do a precedence check.
|
||||||
|
# - if precedence of reduce rule is higher, we reduce.
|
||||||
|
# - if precedence of reduce is same and left assoc, we reduce.
|
||||||
|
# - otherwise we shift
|
||||||
|
|
||||||
|
# Shift precedence comes from the token
|
||||||
|
sprec, slevel = Precedence.get(a, ('right', 0))
|
||||||
|
|
||||||
|
# Reduce precedence comes from the rule that could have been reduced
|
||||||
|
rprec, rlevel = Productions[st_actionp[a].number].prec
|
||||||
|
|
||||||
|
if (slevel > rlevel) or ((slevel == rlevel) and (rprec == 'right')):
|
||||||
|
# We decide to shift here... highest precedence to shift
|
||||||
|
Productions[st_actionp[a].number].reduced -= 1
|
||||||
|
st_action[a] = j
|
||||||
|
st_actionp[a] = p
|
||||||
|
if not rlevel:
|
||||||
|
log.info(' ! shift/reduce conflict for %s resolved as shift', a)
|
||||||
|
self.sr_conflicts.append((st, a, 'shift'))
|
||||||
|
elif (slevel == rlevel) and (rprec == 'nonassoc'):
|
||||||
|
st_action[a] = None
|
||||||
|
else:
|
||||||
|
# Hmmm. Guess we'll keep the reduce
|
||||||
|
if not slevel and not rlevel:
|
||||||
|
log.info(' ! shift/reduce conflict for %s resolved as reduce', a)
|
||||||
|
self.sr_conflicts.append((st, a, 'reduce'))
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise LALRError('Unknown conflict in state %d' % st)
|
||||||
|
else:
|
||||||
|
st_action[a] = j
|
||||||
|
st_actionp[a] = p
|
||||||
|
|
||||||
# Print the actions associated with each terminal
|
# Print the actions associated with each terminal
|
||||||
_actprint = {}
|
_actprint = {}
|
||||||
|
|||||||
@ -193,9 +193,9 @@ def get_xml_file(if_file):
|
|||||||
""" Returns xml format of interfaces for given .if policy file"""
|
""" Returns xml format of interfaces for given .if policy file"""
|
||||||
import os
|
import os
|
||||||
try:
|
try:
|
||||||
from commands import getstatusoutput
|
from commands import getstatusoutput
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from subprocess import getstatusoutput
|
from subprocess import getstatusoutput
|
||||||
basedir = os.path.dirname(if_file) + "/"
|
basedir = os.path.dirname(if_file) + "/"
|
||||||
filename = os.path.basename(if_file).split(".")[0]
|
filename = os.path.basename(if_file).split(".")[0]
|
||||||
rc, output = getstatusoutput("python /usr/share/selinux/devel/include/support/segenxml.py -w -m %s" % basedir + filename)
|
rc, output = getstatusoutput("python /usr/share/selinux/devel/include/support/segenxml.py -w -m %s" % basedir + filename)
|
||||||
@ -212,9 +212,9 @@ def interface_compile_test(interface, path="/usr/share/selinux/devel/policy.xml"
|
|||||||
exclude_interface_type = ["template"]
|
exclude_interface_type = ["template"]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from commands import getstatusoutput
|
from commands import getstatusoutput
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from subprocess import getstatusoutput
|
from subprocess import getstatusoutput
|
||||||
import os
|
import os
|
||||||
policy_files = {'pp': "compiletest.pp", 'te': "compiletest.te", 'fc': "compiletest.fc", 'if': "compiletest.if"}
|
policy_files = {'pp': "compiletest.pp", 'te': "compiletest.te", 'fc': "compiletest.fc", 'if': "compiletest.if"}
|
||||||
idict = get_interface_dict(path)
|
idict = get_interface_dict(path)
|
||||||
|
|||||||
@ -169,9 +169,9 @@ def get_alphabet_manpages(manpage_list):
|
|||||||
|
|
||||||
def convert_manpage_to_html(html_manpage, manpage):
|
def convert_manpage_to_html(html_manpage, manpage):
|
||||||
try:
|
try:
|
||||||
from commands import getstatusoutput
|
from commands import getstatusoutput
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from subprocess import getstatusoutput
|
from subprocess import getstatusoutput
|
||||||
rc, output = getstatusoutput("/usr/bin/groff -man -Thtml %s 2>/dev/null" % manpage)
|
rc, output = getstatusoutput("/usr/bin/groff -man -Thtml %s 2>/dev/null" % manpage)
|
||||||
if rc == 0:
|
if rc == 0:
|
||||||
print(html_manpage, "has been created")
|
print(html_manpage, "has been created")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user