Merged revisions 82828 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82828 | benjamin.peterson | 2010-07-11 18:06:06 -0500 (Sun, 11 Jul 2010) | 1 line allow byte literals ........
This commit is contained in:
parent
16d037653d
commit
902be136be
|
@ -50,7 +50,7 @@ def literal_eval(node_or_string):
|
||||||
if isinstance(node_or_string, Expression):
|
if isinstance(node_or_string, Expression):
|
||||||
node_or_string = node_or_string.body
|
node_or_string = node_or_string.body
|
||||||
def _convert(node):
|
def _convert(node):
|
||||||
if isinstance(node, Str):
|
if isinstance(node, (Str, Bytes)):
|
||||||
return node.s
|
return node.s
|
||||||
elif isinstance(node, Num):
|
elif isinstance(node, Num):
|
||||||
return node.n
|
return node.n
|
||||||
|
|
|
@ -271,6 +271,7 @@ class ASTHelpers_Test(unittest.TestCase):
|
||||||
self.assertEqual(ast.literal_eval('[1, 2, 3]'), [1, 2, 3])
|
self.assertEqual(ast.literal_eval('[1, 2, 3]'), [1, 2, 3])
|
||||||
self.assertEqual(ast.literal_eval('{"foo": 42}'), {"foo": 42})
|
self.assertEqual(ast.literal_eval('{"foo": 42}'), {"foo": 42})
|
||||||
self.assertEqual(ast.literal_eval('(True, False, None)'), (True, False, None))
|
self.assertEqual(ast.literal_eval('(True, False, None)'), (True, False, None))
|
||||||
|
self.assertEqual(ast.literal_eval('b"hi"'), b"hi")
|
||||||
self.assertRaises(ValueError, ast.literal_eval, 'foo()')
|
self.assertRaises(ValueError, ast.literal_eval, 'foo()')
|
||||||
|
|
||||||
def test_literal_eval_issue4907(self):
|
def test_literal_eval_issue4907(self):
|
||||||
|
|
|
@ -78,6 +78,8 @@ C-API
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- ``ast.literal_eval()`` now allows byte literals.
|
||||||
|
|
||||||
- Issue #9137: Fix issue in MutableMapping.update, which incorrectly
|
- Issue #9137: Fix issue in MutableMapping.update, which incorrectly
|
||||||
treated keyword arguments called 'self' or 'other' specially.
|
treated keyword arguments called 'self' or 'other' specially.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue