From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Tue, 31 Jan 2012 07:42:19 +0000 (-0500)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~273^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8672bec683120d0cfc3ce4da63ecda9ae959532;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell.
  Original patches by Marco Scataglini and Roger Serwy.
Merge 3.2 #13506 Add '' to path for interactive interpreter by adding with_cwd
parameter to PyShell.PyShell.transfer_path() and changing elsewhere as needed.
Original patches by Marco Scataglini and Roger Serwy.
---

f8672bec683120d0cfc3ce4da63ecda9ae959532
diff --cc Misc/NEWS
index 8b6725743323,2f552c37486c..9ee1ce75840b
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -463,9 -113,9 +463,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell.
+   Original patches by Marco Scataglini and Roger Serwy.
+ 
 +- Issue #8828: Add new function os.replace(), for cross-platform renaming
 +  with overwriting.
 +
  - Issue #13848: open() and the FileIO constructor now check for NUL
    characters in the file name.  Patch by Hynek Schlawack.