summaryrefslogtreecommitdiffstats
path: root/Lib/ast.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-04-20 18:22:57 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-04-20 18:22:57 (GMT)
commitab20b164b95fc9daaf5dbbb08bce6da2135d34ed (patch)
tree1cc3b189f247e9ba66073a18e9a4854e0c8afaa7 /Lib/ast.py
parent64e564b8f5de1f1822f051f98d3b247bdd001f74 (diff)
parent37e6c54ba122703a0162dd44cf3eac78c46c8bdd (diff)
downloadcpython-ab20b164b95fc9daaf5dbbb08bce6da2135d34ed.zip
cpython-ab20b164b95fc9daaf5dbbb08bce6da2135d34ed.tar.gz
cpython-ab20b164b95fc9daaf5dbbb08bce6da2135d34ed.tar.bz2
Merge 3.2
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):