summaryrefslogtreecommitdiffstats
path: root/Lib/ast.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-04-20 17:23:26 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-04-20 17:23:26 (GMT)
commit6f205ed37eb4b785b60081f957d515ca16b0db47 (patch)
tree4eae61a6207bdd98e0793dc58686c1923d7a4d72 /Lib/ast.py
parentf97255fd7c1d2b70dfe8032a54ce3ce0daf4cea3 (diff)
parent87f3a9aac7f4b324f10b23adb1e79ad6b69117ae (diff)
downloadcpython-6f205ed37eb4b785b60081f957d515ca16b0db47.zip
cpython-6f205ed37eb4b785b60081f957d515ca16b0db47.tar.gz
cpython-6f205ed37eb4b785b60081f957d515ca16b0db47.tar.bz2
Branch merge
Diffstat (limited to 'Lib/ast.py')
-rw-r--r--Lib/ast.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ast.py b/Lib/ast.py
index 72237ed..fb5adac 100644
--- a/Lib/ast.py
+++ b/Lib/ast.py
@@ -40,8 +40,8 @@ def literal_eval(node_or_string):
"""
Safely evaluate an expression node or a string containing a Python
expression. The string or node provided may only consist of the following
- Python literal structures: strings, numbers, tuples, lists, dicts, booleans,
- and None.
+ Python literal structures: strings, bytes, numbers, tuples, lists, dicts,
+ sets, booleans, and None.
"""
_safe_names = {'None': None, 'True': True, 'False': False}
if isinstance(node_or_string, str):