summaryrefslogtreecommitdiffstats
path: root/Lib/ast.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-04-24 00:39:43 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-04-24 00:39:43 (GMT)
commitcae1be85f5ac78a7ec73d129ca46cdfc5c5a5ad9 (patch)
tree786ea49a8c479b6cc89f6801925bcadd3786c9b5 /Lib/ast.py
parent5569e9b1507ac0ff18fec433a7733a0185dde7b0 (diff)
parent37e6c54ba122703a0162dd44cf3eac78c46c8bdd (diff)
downloadcpython-cae1be85f5ac78a7ec73d129ca46cdfc5c5a5ad9.zip
cpython-cae1be85f5ac78a7ec73d129ca46cdfc5c5a5ad9.tar.gz
cpython-cae1be85f5ac78a7ec73d129ca46cdfc5c5a5ad9.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):