RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-02-23 04:56:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

sepolgen: Replace func_code calls with __code__.

Browse Source 
In Python 3, special function attributes have been
renamed for consistency with other attributes.
__code__ attribute is also present in py2.7 and py2.6

Signed-off-by: Robert Kuska <rkuska@redhat.com>
This commit is contained in:
Robert Kuska 2015-07-16 13:48:13 +02:00 committed by Stephen Smalley
parent fd00e882c4
commit 467c2a45b9
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sepolgen/src/sepolgen/lex.py
View File

@ -301,7 +301,7 @@ class Lexer:
if not self.lexoptimize: if not self.lexoptimize:
if not self.lextokens.has_key(newtok.type): if not self.lextokens.has_key(newtok.type):
raise LexError, ("%s:%d: Rule '%s' returned an unknown token type '%s'" % ( raise LexError, ("%s:%d: Rule '%s' returned an unknown token type '%s'" % (
func.func_code.co_filename, func.func_code.co_firstlineno, func.__code__.co_filename, func.__code__.co_firstlineno,
func.__name__, newtok.type),lexdata[lexpos:]) func.__name__, newtok.type),lexdata[lexpos:])
return newtok return newtok
@ -635,7 +635,7 @@ def lex(module=None,object=None,debug=0,optimize=0,lextab="lextab",reflags=0,now
# Sort the functions by line number # Sort the functions by line number
for f in funcsym.values(): for f in funcsym.values():
f.sort(lambda x,y: cmp(x[1].func_code.co_firstlineno,y[1].func_code.co_firstlineno)) f.sort(lambda x,y: cmp(x[1].__code__.co_firstlineno,y[1].__code__.co_firstlineno))
# Sort the strings by regular expression length # Sort the strings by regular expression length
for s in strsym.values(): for s in strsym.values():
@ -649,15 +649,15 @@ def lex(module=None,object=None,debug=0,optimize=0,lextab="lextab",reflags=0,now
# Add rules defined by functions first # Add rules defined by functions first
for fname, f in funcsym[state]: for fname, f in funcsym[state]:
line = f.func_code.co_firstlineno line = f.__code__.co_firstlineno
file = f.func_code.co_filename file = f.__code__.co_filename
files[file] = None files[file] = None
tokname = toknames[fname] tokname = toknames[fname]
ismethod = isinstance(f, types.MethodType) ismethod = isinstance(f, types.MethodType)
if not optimize: if not optimize:
nargs = f.func_code.co_argcount nargs = f.__code__.co_argcount
if ismethod: if ismethod:
reqargs = 2 reqargs = 2
else: else:

22
sepolgen/src/sepolgen/yacc.py
View File

@ -457,11 +457,11 @@ def validate_dict(d):
if n[0:2] == 'p_': if n[0:2] == 'p_':
sys.stderr.write("yacc: Warning. '%s' not defined as a function\n" % n) sys.stderr.write("yacc: Warning. '%s' not defined as a function\n" % n)
if 1 and isinstance(v,types.FunctionType) and v.func_code.co_argcount == 1: if 1 and isinstance(v,types.FunctionType) and v.__code__.co_argcount == 1:
try: try:
doc = v.__doc__.split(" ") doc = v.__doc__.split(" ")
if doc[1] == ':': if doc[1] == ':':
sys.stderr.write("%s:%d: Warning. Possible grammar rule '%s' defined without p_ prefix.\n" % (v.func_code.co_filename, v.func_code.co_firstlineno,n)) sys.stderr.write("%s:%d: Warning. Possible grammar rule '%s' defined without p_ prefix.\n" % (v.__code__.co_filename, v.__code__.co_firstlineno,n))
except StandardError: except StandardError:
pass pass
@ -722,8 +722,8 @@ def add_production(f,file,line,prodname,syms):
# and adds rules to the grammar # and adds rules to the grammar
def add_function(f): def add_function(f):
line = f.func_code.co_firstlineno line = f.__code__.co_firstlineno
file = f.func_code.co_filename file = f.__code__.co_filename
error = 0 error = 0
if isinstance(f,types.MethodType): if isinstance(f,types.MethodType):
@ -731,11 +731,11 @@ def add_function(f):
else: else:
reqdargs = 1 reqdargs = 1
if f.func_code.co_argcount > reqdargs: if f.__code__.co_argcount > reqdargs:
sys.stderr.write("%s:%d: Rule '%s' has too many arguments.\n" % (file,line,f.__name__)) sys.stderr.write("%s:%d: Rule '%s' has too many arguments.\n" % (file,line,f.__name__))
return -1 return -1
if f.func_code.co_argcount < reqdargs: if f.__code__.co_argcount < reqdargs:
sys.stderr.write("%s:%d: Rule '%s' requires an argument.\n" % (file,line,f.__name__)) sys.stderr.write("%s:%d: Rule '%s' requires an argument.\n" % (file,line,f.__name__))
return -1 return -1
@ -2079,11 +2079,11 @@ def yacc(method=default_lr, debug=yaccdebug, module=None, tabmodule=tab_module,
ismethod = 1 ismethod = 1
else: else:
raise YaccError,"'p_error' defined, but is not a function or method." raise YaccError,"'p_error' defined, but is not a function or method."
eline = ef.func_code.co_firstlineno eline = ef.__code__.co_firstlineno
efile = ef.func_code.co_filename efile = ef.__code__.co_filename
files[efile] = None files[efile] = None
if (ef.func_code.co_argcount != 1+ismethod): if (ef.__code__.co_argcount != 1+ismethod):
raise YaccError,"%s:%d: p_error() requires 1 argument." % (efile,eline) raise YaccError,"%s:%d: p_error() requires 1 argument." % (efile,eline)
global Errorfunc global Errorfunc
Errorfunc = ef Errorfunc = ef
@ -2100,14 +2100,14 @@ def yacc(method=default_lr, debug=yaccdebug, module=None, tabmodule=tab_module,
raise YaccError,"no rules of the form p_rulename are defined." raise YaccError,"no rules of the form p_rulename are defined."
# Sort the symbols by line number # Sort the symbols by line number
symbols.sort(lambda x,y: cmp(x.func_code.co_firstlineno,y.func_code.co_firstlineno)) symbols.sort(lambda x,y: cmp(x.__code__.co_firstlineno,y.__code__.co_firstlineno))
# Add all of the symbols to the grammar # Add all of the symbols to the grammar
for f in symbols: for f in symbols:
if (add_function(f)) < 0: if (add_function(f)) < 0:
error += 1 error += 1
else: else:
files[f.func_code.co_filename] = None files[f.__code__.co_filename] = None
# Make a signature of the docstrings # Make a signature of the docstrings
for f in symbols: for f in symbols: