[Python-checkins] r71507 - in python/trunk: Misc/NEWS Modules/main.c

[georg.brandl]

Author: georg.brandl
Date: Sun Apr 12 14:08:12 2009
New Revision: 71507

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

Modified:
   python/trunk/Misc/NEWS
   python/trunk/Modules/main.c

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Apr 12 14:08:12 2009
@@ -12,6 +12,8 @@
 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.
 

Modified: python/trunk/Modules/main.c
==============================================================================
--- python/trunk/Modules/main.c	(original)
+++ python/trunk/Modules/main.c	Sun Apr 12 14:08:12 2009
@@ -432,6 +432,10 @@
 		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;