FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Remove meaning of -ttt, but still accept -t option on cmdline for com… · python/cpython@e1b5ac6 · GitHub

  1. python
  2. cpython

Repository navigation

Commit e1b5ac6

Browse files
birkenfeld
committed
Remove meaning of -ttt, but still accept -t option on cmdline for compatibility.
1 parent a26f8ca commit e1b5ac6

22 files changed

Lines changed: 31 additions & 61 deletions

File tree

‎Doc/library/sys.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,6 @@ always available.
231231
+------------------------------+------------------------------------------+
232232
| :const:`ignore_environment` | -E |
233233
+------------------------------+------------------------------------------+
234-
| :const:`tabcheck` | -t or -tt |
235-
+------------------------------+------------------------------------------+
236234
| :const:`verbose` | -v |
237235
+------------------------------+------------------------------------------+
238236
| :const:`unicode` | -U |

‎Doc/using/cmdline.rst‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -222,13 +222,6 @@ Miscellaneous options
222222
manipulations of :data:`sys.path` that it entails.
223223

224224

225-
.. cmdoption:: -t
226-
227-
Issue a warning when a source file mixes tabs and spaces for indentation in a
228-
way that makes it depend on the worth of a tab expressed in spaces. Issue an
229-
error when the option is given twice (:option:`-tt`).
230-
231-
232225
.. cmdoption:: -u
233226

234227
Force stdin, stdout and stderr to be totally unbuffered. On systems where it

‎Include/pydebug.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ PyAPI_DATA(int) Py_NoSiteFlag;
1414
PyAPI_DATA(int) Py_BytesWarningFlag;
1515
PyAPI_DATA(int) Py_UseClassExceptionsFlag;
1616
PyAPI_DATA(int) Py_FrozenFlag;
17-
PyAPI_DATA(int) Py_TabcheckFlag;
1817
PyAPI_DATA(int) Py_IgnoreEnvironmentFlag;
1918
PyAPI_DATA(int) Py_DivisionWarningFlag;
2019
PyAPI_DATA(int) Py_DontWriteBytecodeFlag;

‎Lib/test/test_exceptions.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ def testRaising(self):
8080
self.raise_catch(IndentationError, "IndentationError")
8181

8282
self.raise_catch(TabError, "TabError")
83-
# can only be tested under -tt, and is the only test for -tt
84-
#try: compile("try:\n\t1/0\n \t1/0\nfinally:\n pass\n", '<string>', 'exec')
85-
#except TabError: pass
86-
#else: self.fail("TabError not raised")
83+
try: compile("try:\n\t1/0\n \t1/0\nfinally:\n pass\n",
84+
'<string>', 'exec')
85+
except TabError: pass
86+
else: self.fail("TabError not raised")
8787

8888
self.raise_catch(SystemError, "SystemError")
8989

‎Mac/BuildScript/scripts/postflight.framework‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
PYVER="@PYVER@"
77
FWK="/Library/Frameworks/Python.framework/Versions/@PYVER@"
88

9-
"${FWK}/bin/python" -Wi -tt \
9+
"${FWK}/bin/python" -Wi \
1010
"${FWK}/lib/python${PYVER}/compileall.py" \
1111
-x badsyntax -x site-packages \
1212
"${FWK}/lib/python${PYVER}"
1313

14-
"${FWK}/bin/python" -Wi -tt -O \
14+
"${FWK}/bin/python" -Wi -O \
1515
"${FWK}/lib/python${PYVER}/compileall.py" \
1616
-x badsyntax -x site-packages \
1717
"${FWK}/lib/python${PYVER}"
1818

19-
"${FWK}/bin/python" -Wi -tt \
19+
"${FWK}/bin/python" -Wi \
2020
"${FWK}/lib/python${PYVER}/compileall.py" \
2121
-x badsyntax -x site-packages \
2222
"${FWK}/Mac/Tools"
2323

24-
"${FWK}/bin/python" -Wi -tt -O \
24+
"${FWK}/bin/python" -Wi -O \
2525
"${FWK}/lib/python${PYVER}/compileall.py" \
2626
-x badsyntax -x site-packages \
2727
"${FWK}/Mac/Tools"

‎Mac/Makefile.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ installmacsubtree:
226226

227227

228228
$(RUNSHARED) $(BUILDPYTHON) $(CACHERSRC) -v $(DESTDIR)$(MACLIBDEST) $(DESTDIR)$(MACTOOLSDEST)
229-
$(RUNSHARED) $(BUILDPYTHON) -Wi -tt $(compileall) -d $(MACTOOLSDEST) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
230-
$(RUNSHARED) $(BUILDPYTHON) -O -Wi -tt $(compileall) -d $(MACTOOLSDEST) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
229+
$(RUNSHARED) $(BUILDPYTHON) -Wi $(compileall) -d $(MACTOOLSDEST) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
230+
$(RUNSHARED) $(BUILDPYTHON) -O -Wi $(compileall) -d $(MACTOOLSDEST) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
231231

232232
$(INSTALLED_PYTHONAPP): install_Python
233233

‎Makefile.pre.in‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
664664

665665
TESTOPTS= -l $(EXTRATESTOPTS)
666666
TESTPROG= $(srcdir)/Lib/test/regrtest.py
667-
TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -E -tt -bb
667+
TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -E -bb
668668
test: all platform
669669
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
670670
-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
@@ -687,7 +687,7 @@ testuniversal: all platform
687687
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
688688
-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
689689
$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) -uall
690-
$(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) $(TESTOPTS) -uall
690+
$(RUNSHARED) /usr/libexec/oah/translate ./$(BUILDPYTHON) -E $(TESTPROG) $(TESTOPTS) -uall
691691

692692

693693
# Like testall, but with a single pass only
@@ -872,23 +872,23 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
872872
done
873873
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
874874
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
875-
./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
875+
./$(BUILDPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
876876
-d $(LIBDEST) -f \
877877
-x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
878878
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
879-
./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
879+
./$(BUILDPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
880880
-d $(LIBDEST) -f \
881881
-x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
882882
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
883-
./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
883+
./$(BUILDPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
884884
-d $(LIBDEST)/site-packages -f \
885885
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
886886
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
887-
./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
887+
./$(BUILDPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
888888
-d $(LIBDEST)/site-packages -f \
889889
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
890890
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
891-
./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram"
891+
./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram"
892892

893893
# Create the PLATDIR source directory, if one wasn't distributed..
894894
$(srcdir)/Lib/$(PLATDIR):

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ What's new in Python 3.0b1?
1212
Core and Builtins
1313
-----------------
1414

15+
- Removed the already-defunct ``-t`` option.
16+
1517
- Issue #2957: Corrected a ValueError "recursion limit exceeded", when
1618
unmarshalling many code objects, which happens when importing a
1719
large .pyc file (~1000 functions).

‎Misc/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ RSYNC_OPTS="-aC -e ssh"
5959
PYTHON=$INSTALL_DIR/bin/python
6060

6161
# Python options and regression test program that should always be run.
62-
REGRTEST_ARGS="-E -tt $INSTALL_DIR/lib/python3.0/test/regrtest.py"
62+
REGRTEST_ARGS="-E $INSTALL_DIR/lib/python3.0/test/regrtest.py"
6363

6464
REFLOG="build/reflog.txt.out"
6565
# These tests are not stable and falsely report leaks sometimes.

‎Misc/cheatsheet‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ Option Effect
4646
-OO remove doc-strings in addition to the -O optimizations
4747
-Q arg division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew
4848
-S Don't perform 'import site' on initialization
49-
-t Issue warnings about inconsistent tab usage (-tt: issue errors)
5049
-u Unbuffered binary stdout and stderr (also PYTHONUNBUFFERED=x).
5150
-v Verbose (trace import statements) (also PYTHONVERBOSE=x)
5251
-W arg : warning control (arg is action:message:category:module:lineno)

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL