#5704: let python -3 imply -t as well.

diff --git a/Misc/NEWS b/Misc/NEWS
index d66695cdfd6ebeb9d910fce9a05e9309a7a2ede2..2112a807335a8e49c446f782f5f13d83db24f319 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.7 alpha 1
 Core and Builtins
 -----------------
 
+- Issue #5704: the "-3" command-line option now implies "-t".
+
 - Issue #2170: refactored xml.dom.minidom.normalize, increasing both
   its clarity and its speed.
 

diff --git a/Modules/main.c b/Modules/main.c
index 1a58071c4673b076c30122821a02741223ec6102..d6df92f6843f3746fb85c895e644b8662cbc12aa 100644 (file)
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -432,6 +432,10 @@ Py_Main(int argc, char **argv)
                return 0;
        }
 
+       if (Py_Py3kWarningFlag && !Py_TabcheckFlag)
+               /* -3 implies -t (but not -tt) */
+               Py_TabcheckFlag = 1;
+
        if (!Py_InspectFlag &&
            (p = Py_GETENV("PYTHONINSPECT")) && *p != '\0')
                Py_InspectFlag = 1;