Merged revisions 78303 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78303 | andrew.kuchling | 2010-02-22 09:53:17 -0500 (Mon, 22 Feb 2010) | 1 line

  #7794: describe 2.6 support for executing directories and zip archives
........

diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 0a37f7bd9bd86b15bfc0b1551f5779eaaa43f66b..7c5902274d26edbb4c5388dea6aab3e3d491a240 100644 (file)
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -1483,6 +1483,13 @@ Other Language Changes
 
 Some smaller changes made to the core Python language are:
 
+* Directories and zip archives containing a :file:`__main__.py` file
+  can now be executed directly by passing their name to the
+  interpreter. The directory or zip archive is automatically inserted
+  as the first entry in sys.path.  (Suggestion and initial patch by
+  Andy Chu, subsequently revised by Phillip J. Eby and Nick Coghlan;
+  :issue:`1739468`.)
+
 * The :func:`hasattr` function was catching and ignoring all errors,
   under the assumption that they meant a :meth:`__getattr__` method
   was failing somehow and the return value of :func:`hasattr` would