[Python-checkins] cpython (merge 3.2 -> 3.2): Branch merge

[eric.araujo]

http://hg.python.org/cpython/rev/226b7a551931
changeset:   69607:226b7a551931
branch:      3.2
parent:      69439:d4bc42400692
parent:      69606:85fefd41ef5d
user:        Éric Araujo <merwok at netwok.org>
date:        Wed Apr 20 19:23:26 2011 +0200
summary:
  Branch merge

files:
  Lib/ast.py       |  4 ++--
  Lib/sysconfig.py |  1 -
  Lib/trace.py     |  2 +-
  3 files changed, 3 insertions(+), 4 deletions(-)


diff --git a/Lib/ast.py b/Lib/ast.py
--- a/Lib/ast.py
+++ b/Lib/ast.py
@@ -40,8 +40,8 @@
     """
     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):
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -694,7 +694,6 @@
                     m = re.search(
                             r'<key>ProductUserVisibleVersion</key>\s*' +
                             r'<string>(.*?)</string>', f.read())
-                    f.close()
                     if m is not None:
                         macrelease = '.'.join(m.group(1).split('.')[:2])
                     # else: fall back to the default behaviour
diff --git a/Lib/trace.py b/Lib/trace.py
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -688,7 +688,7 @@
 
     for opt, val in opts:
         if opt == "--help":
-            usage(sys.stdout)
+            _usage(sys.stdout)
             sys.exit(0)
 
         if opt == "--version":

-- 
Repository URL: http://hg.python.org/cpython