From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sun, 24 Feb 2002 23:07:04 +0000 (+0000)
Subject: bqackport of 1.73:
X-Git-Tag: v2.2.1c1~174
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11c8a87da0704066189e57a90e3d377fd9bdf7d6;p=thirdparty%2FPython%2Fcpython.git

bqackport of 1.73:
In MachoPython, don't simulate argc/argv unless we have argc=1 and argv[1]
starts with "-psn_". This means the drag-and-drop continues to work as
expected, but we can now also do
/Applications/Python.app/Contents/MacOS/python script.py
from the command line, which is a lot easier with debugging. Pressing <option>
at this point also has the expected effect of opening the options dialog!
---

diff --git a/Mac/Python/macmain.c b/Mac/Python/macmain.c
index b86b52847fc6..71b42e9e922f 100644
--- a/Mac/Python/macmain.c
+++ b/Mac/Python/macmain.c
@@ -316,8 +316,14 @@ init_common(int *argcp, char ***argvp, int embedded)
 		*argcp = 1;
 		*argvp = emb_argv;
 	} else {
-		/* Create argc/argv. Do it before we go into the options event loop. */
-		*argcp = PyMac_GetArgv(argvp, PyMac_options.noargs);
+		/* Create argc/argv. Do it before we go into the options event loop.
+		** In MachoPython we skip this step if we already have plausible
+		** command line arguments.
+		*/
+#if TARGET_API_MAC_OSX
+		if (*argcp == 2 && strncmp((*argvp)[1], "-psn_", 5) == 0)
+#endif
+			*argcp = PyMac_GetArgv(argvp, PyMac_options.noargs);
 #if !TARGET_API_MAC_OSX
 #ifndef NO_ARGV0_CHDIR
 		if (*argcp >= 1 && (*argvp)[0] && (*argvp)[0][0]) {