summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-07-05 18:57:33 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-07-05 18:57:33 (GMT)
commit74de1536810946f82c1e6526fff55646fa119b3d (patch)
treec75412336e6184533054ef65c0a9704bf7196e2a
parentf28fbabc7fa7cf1c4880ce39b507f600def35439 (diff)
parent01cca5e45185474bdb3c621c5dec4bfc0b323483 (diff)
downloadcpython-74de1536810946f82c1e6526fff55646fa119b3d.zip
cpython-74de1536810946f82c1e6526fff55646fa119b3d.tar.gz
cpython-74de1536810946f82c1e6526fff55646fa119b3d.tar.bz2
Issue #15020: The program name used to search for Python's path is now python3 under Unix, not python.
-rw-r--r--Misc/NEWS3
-rw-r--r--Python/pythonrun.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index ab02a97..a78f72b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.3.0 Beta 2?
Core and Builtins
-----------------
+- Issue #15020: The program name used to search for Python's path is now
+ "python3" under Unix, not "python".
+
- Issue #15033: Fix the exit status bug when modules invoked using -m swith,
return the proper failure return value (1). Patch contributed by Jeff Knupp.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 465aa7d..a9ed588 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -778,7 +778,11 @@ Py_EndInterpreter(PyThreadState *tstate)
PyInterpreterState_Delete(interp);
}
+#ifdef MS_WINDOWS
static wchar_t *progname = L"python";
+#else
+static wchar_t *progname = L"python3";
+#endif
void
Py_SetProgramName(wchar_t *pn)