From 31904d58bdb1b5c4b30c5250288b5ab75a50bb24 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 2 Sep 2013 20:30:30 -0500 Subject: [PATCH] backported safe_eval to python 2.5 --- VERSION | 2 +- gluon/contrib/markmin/markmin2html.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index e29beaca..c045fd99 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.09.01.14.13.25 +Version 2.6.0-development+timestamp.2013.09.02.20.29.38 diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index 1fe4f9f7..5460794a 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -7,6 +7,12 @@ import re import ast from cgi import escape from string import maketrans +try: + from ast import parse as ast_parse + import ast +except ImportError: # python 2.5 + from compiler import parse + import compiler.ast as ast """ TODO: next version should use MathJax @@ -569,7 +575,7 @@ def safe_eval(node_or_string, env): _safe_names = {'None': None, 'True': True, 'False': False} _safe_names.update(env) if isinstance(node_or_string, basestring): - node_or_string = ast.parse(node_or_string, mode='eval') + node_or_string = ast_parse(node_or_string, mode='eval') if isinstance(node_or_string, ast.Expression): node_or_string = node_or_string.body def _convert(node):