[Python-checkins] r81964 - in python/trunk: Doc/using/cmdline.rst Misc/NEWS Modules/main.c

[nick.coghlan]

Author: nick.coghlan
Date: Sun Jun 13 08:50:39 2010
New Revision: 81964

Log:
Revert r80580 due to some unintended side effects. See issue #8202 for details.

Modified:
   python/trunk/Doc/using/cmdline.rst
   python/trunk/Misc/NEWS
   python/trunk/Modules/main.c

Modified: python/trunk/Doc/using/cmdline.rst
==============================================================================
--- python/trunk/Doc/using/cmdline.rst	(original)
+++ python/trunk/Doc/using/cmdline.rst	Sun Jun 13 08:50:39 2010
@@ -95,9 +95,8 @@
       file is not available.
 
    If this option is given, the first element of :data:`sys.argv` will be the
-   full path to the module file (while the module file is being located, the
-   first element will be set to ``"-m"``). As with the :option:`-c` option,
-   the current directory will be added to the start of :data:`sys.path`.
+   full path to the module file. As with the :option:`-c` option, the current
+   directory will be added to the start of :data:`sys.path`.
 
    Many standard library modules contain code that is invoked on their execution
    as a script.  An example is the :mod:`timeit` module::

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Jun 13 08:50:39 2010
@@ -12,6 +12,10 @@
 Core and Builtins
 -----------------
 
+- Issue #8202: Previous change to ``sys.argv[0]`` handling for -m command line
+  option reverted due to unintended side effects on handling of ``sys.path``.
+  See tracker issue for details.
+
 - Issue #8941: decoding big endian UTF-32 data in UCS-2 builds could crash
   the interpreter with characters outside the Basic Multilingual Plane
   (higher than 0x10000).

Modified: python/trunk/Modules/main.c
==============================================================================
--- python/trunk/Modules/main.c	(original)
+++ python/trunk/Modules/main.c	Sun Jun 13 08:50:39 2010
@@ -519,10 +519,12 @@
     }
 
     if (module != NULL) {
-        /* Backup _PyOS_optind and force sys.argv[0] = '-m'
-           so that PySys_SetArgv correctly sets sys.path[0] to ''*/
+        /* Backup _PyOS_optind and force sys.argv[0] = '-c'
+           so that PySys_SetArgv correctly sets sys.path[0] to ''
+           rather than looking for a file called "-m". See
+           tracker issue #8202 for details. */
         _PyOS_optind--;
-        argv[_PyOS_optind] = "-m";
+        argv[_PyOS_optind] = "-c";
     }
 
     PySys_SetArgv(argc-_PyOS_optind, argv+_PyOS_optind);