From 57130cb3c237dd2b12690afa83c19dfa195234f3 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 14 Sep 2010 20:09:48 +0200 Subject: typo fix --- module/PluginManager.py | 2 +- module/SafeEval.py | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ module/SaveEval.py | 63 ------------------------------------------------- 3 files changed, 64 insertions(+), 64 deletions(-) create mode 100644 module/SafeEval.py delete mode 100644 module/SaveEval.py diff --git a/module/PluginManager.py b/module/PluginManager.py index 85504ed24..fc144e8d5 100644 --- a/module/PluginManager.py +++ b/module/PluginManager.py @@ -34,7 +34,7 @@ from itertools import chain try: from ast import literal_eval except ImportError: # python 2.5 - from module.SaveEval import save_eval as literal_eval + from module.SafeEval import safe_eval as literal_eval class PluginManager(): def __init__(self, core): diff --git a/module/SafeEval.py b/module/SafeEval.py new file mode 100644 index 000000000..863ff48cc --- /dev/null +++ b/module/SafeEval.py @@ -0,0 +1,63 @@ +## {{{ http://code.activestate.com/recipes/364469/ (r2) +import compiler + +class Unsafe_Source_Error(Exception): + def __init__(self,error,descr = None,node = None): + self.error = error + self.descr = descr + self.node = node + self.lineno = getattr(node,"lineno",None) + + def __repr__(self): + return "Line %d. %s: %s" % (self.lineno, self.error, self.descr) + __str__ = __repr__ + +class SafeEval(object): + + def visit(self, node,**kw): + cls = node.__class__ + meth = getattr(self,'visit'+cls.__name__,self.default) + return meth(node, **kw) + + def default(self, node, **kw): + for child in node.getChildNodes(): + return self.visit(child, **kw) + + visitExpression = default + + def visitConst(self, node, **kw): + return node.value + + def visitDict(self,node,**kw): + return dict([(self.visit(k),self.visit(v)) for k,v in node.items]) + + def visitTuple(self,node, **kw): + return tuple(self.visit(i) for i in node.nodes) + + def visitList(self,node, **kw): + return [self.visit(i) for i in node.nodes] + +class SafeEvalWithErrors(SafeEval): + + def default(self, node, **kw): + raise Unsafe_Source_Error("Unsupported source construct", + node.__class__,node) + + def visitName(self,node, **kw): + raise Unsafe_Source_Error("Strings must be quoted", + node.name, node) + + # Add more specific errors if desired + + +def safe_eval(source, fail_on_error = True): + walker = fail_on_error and SafeEvalWithErrors() or SafeEval() + try: + ast = compiler.parse(source,"eval") + except SyntaxError, err: + raise + try: + return walker.visit(ast) + except Unsafe_Source_Error, err: + raise +## end of http://code.activestate.com/recipes/364469/ }}} diff --git a/module/SaveEval.py b/module/SaveEval.py deleted file mode 100644 index 863ff48cc..000000000 --- a/module/SaveEval.py +++ /dev/null @@ -1,63 +0,0 @@ -## {{{ http://code.activestate.com/recipes/364469/ (r2) -import compiler - -class Unsafe_Source_Error(Exception): - def __init__(self,error,descr = None,node = None): - self.error = error - self.descr = descr - self.node = node - self.lineno = getattr(node,"lineno",None) - - def __repr__(self): - return "Line %d. %s: %s" % (self.lineno, self.error, self.descr) - __str__ = __repr__ - -class SafeEval(object): - - def visit(self, node,**kw): - cls = node.__class__ - meth = getattr(self,'visit'+cls.__name__,self.default) - return meth(node, **kw) - - def default(self, node, **kw): - for child in node.getChildNodes(): - return self.visit(child, **kw) - - visitExpression = default - - def visitConst(self, node, **kw): - return node.value - - def visitDict(self,node,**kw): - return dict([(self.visit(k),self.visit(v)) for k,v in node.items]) - - def visitTuple(self,node, **kw): - return tuple(self.visit(i) for i in node.nodes) - - def visitList(self,node, **kw): - return [self.visit(i) for i in node.nodes] - -class SafeEvalWithErrors(SafeEval): - - def default(self, node, **kw): - raise Unsafe_Source_Error("Unsupported source construct", - node.__class__,node) - - def visitName(self,node, **kw): - raise Unsafe_Source_Error("Strings must be quoted", - node.name, node) - - # Add more specific errors if desired - - -def safe_eval(source, fail_on_error = True): - walker = fail_on_error and SafeEvalWithErrors() or SafeEval() - try: - ast = compiler.parse(source,"eval") - except SyntaxError, err: - raise - try: - return walker.visit(ast) - except Unsafe_Source_Error, err: - raise -## end of http://code.activestate.com/recipes/364469/ }}} -- cgit v1.2.3