From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 3 Jun 2012 10:33:23 +0000 (+0200)
Subject: merge 3.2
X-Git-Tag: v3.3.0b1~293
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f20940792df1f3b1dbda3ec5fdd6a8b6bc9f96d5;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

f20940792df1f3b1dbda3ec5fdd6a8b6bc9f96d5
diff --cc Lib/idlelib/NEWS.txt
index 7ea53db24723,de9f55d2f7eb..29398e299e95
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -2,12 -2,10 +2,12 @@@ What's New in IDLE 3.3.0
  =========================
  
  - Issue #14937: Perform auto-completion of filenames in strings even for
-   non-ASCII filenames.
+   non-ASCII filenames. Likewise for identifiers.
  
 -What's New in IDLE 3.2.3?
 -=========================
 +- Issue #8515: Set __file__ when run file in IDLE.
 +  Initial patch by Bruce Frederiksen.
 +
 +- IDLE can be launched as `python -m idlelib`
  
  - Issue #14409: IDLE now properly executes commands in the Shell window
    when it cannot read the normal config files on startup and