[Python-checkins] r82829 - in python/branches/release31-maint: Lib/ast.py Lib/test/test_ast.py Misc/NEWS

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Jul 12 01:10:08 2010
New Revision: 82829

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/ast.py
   python/branches/release31-maint/Lib/test/test_ast.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/ast.py
==============================================================================
--- python/branches/release31-maint/Lib/ast.py	(original)
+++ python/branches/release31-maint/Lib/ast.py	Mon Jul 12 01:10:08 2010
@@ -50,7 +50,7 @@
     if isinstance(node_or_string, Expression):
         node_or_string = node_or_string.body
     def _convert(node):
-        if isinstance(node, Str):
+        if isinstance(node, (Str, Bytes)):
             return node.s
         elif isinstance(node, Num):
             return node.n

Modified: python/branches/release31-maint/Lib/test/test_ast.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_ast.py	(original)
+++ python/branches/release31-maint/Lib/test/test_ast.py	Mon Jul 12 01:10:08 2010
@@ -271,6 +271,7 @@
         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('(True, False, None)'), (True, False, None))
+        self.assertEqual(ast.literal_eval('b"hi"'), b"hi")
         self.assertRaises(ValueError, ast.literal_eval, 'foo()')
 
     def test_literal_eval_issue4907(self):

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Mon Jul 12 01:10:08 2010
@@ -78,6 +78,8 @@
 Library
 -------
 
+- ``ast.literal_eval()`` now allows byte literals.
+
 - Issue #9137: Fix issue in MutableMapping.update, which incorrectly
   treated keyword arguments called 'self' or 'other' specially.