mirror of
https://github.com/python/cpython.git
synced 2025-07-28 13:44:43 +00:00
ast.literal_eval can properly evaluate complex numbers now. This fixes issue4907.
This commit is contained in:
parent
2d21d50c10
commit
dd53e114ef
2 changed files with 23 additions and 0 deletions
12
Lib/ast.py
12
Lib/ast.py
|
@ -64,6 +64,18 @@ def literal_eval(node_or_string):
|
|||
elif isinstance(node, Name):
|
||||
if node.id in _safe_names:
|
||||
return _safe_names[node.id]
|
||||
elif isinstance(node, BinOp) and \
|
||||
isinstance(node.op, (Add, Sub)) and \
|
||||
isinstance(node.right, Num) and \
|
||||
isinstance(node.right.n, complex) and \
|
||||
isinstance(node.left, Num) and \
|
||||
isinstance(node.left.n, (int, long, float)):
|
||||
left = node.left.n
|
||||
right = node.right.n
|
||||
if isinstance(node.op, Add):
|
||||
return left + right
|
||||
else:
|
||||
return left - right
|
||||
raise ValueError('malformed string')
|
||||
return _convert(node_or_string)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue