Commit b3a534a8 authored by Martin Panter's avatar Martin Panter

Issue #26638: Work around more CLI options that can’t be linked

* Cannot seem to link directly to main options from the “unittest” module,
  because that module has its own set of options
* Mask out linking for options that no longer exist in Python 3
parent ba5801e1
...@@ -1972,7 +1972,8 @@ Loading and running tests ...@@ -1972,7 +1972,8 @@ Loading and running tests
methods <deprecated-aliases>` are also special-cased and, when the warning methods <deprecated-aliases>` are also special-cased and, when the warning
filters are ``'default'`` or ``'always'``, they will appear only once filters are ``'default'`` or ``'always'``, they will appear only once
per-module, in order to avoid too many warning messages. This behavior can per-module, in order to avoid too many warning messages. This behavior can
be overridden using the :option:`-Wd` or :option:`-Wa` options and leaving be overridden using Python's :option:`!-Wd` or :option:`!-Wa` options
(see :ref:`Warning control <using-on-warnings>`) and leaving
*warnings* to ``None``. *warnings* to ``None``.
.. versionchanged:: 3.2 .. versionchanged:: 3.2
...@@ -2053,7 +2054,8 @@ Loading and running tests ...@@ -2053,7 +2054,8 @@ Loading and running tests
The *warnings* argument specifies the :ref:`warning filter <warning-filter>` The *warnings* argument specifies the :ref:`warning filter <warning-filter>`
that should be used while running the tests. If it's not specified, it will that should be used while running the tests. If it's not specified, it will
remain ``None`` if a :option:`-W` option is passed to :program:`python`, remain ``None`` if a :option:`!-W` option is passed to :program:`python`
(see :ref:`Warning control <using-on-warnings>`),
otherwise it will be set to ``'default'``. otherwise it will be set to ``'default'``.
Calling ``main`` actually returns an instance of the ``TestProgram`` class. Calling ``main`` actually returns an instance of the ``TestProgram`` class.
......
...@@ -313,6 +313,7 @@ Miscellaneous options ...@@ -313,6 +313,7 @@ Miscellaneous options
See also :envvar:`PYTHONVERBOSE`. See also :envvar:`PYTHONVERBOSE`.
.. _using-on-warnings:
.. cmdoption:: -W arg .. cmdoption:: -W arg
Warning control. Python's warning machinery by default prints warning Warning control. Python's warning machinery by default prints warning
......
...@@ -758,7 +758,7 @@ Here are the changes 2.2 introduces: ...@@ -758,7 +758,7 @@ Here are the changes 2.2 introduces:
operators. operators.
* Python 2.2 supports some command-line arguments for testing whether code will * Python 2.2 supports some command-line arguments for testing whether code will
work with the changed division semantics. Running python with :option:`-Q work with the changed division semantics. Running python with :option:`!-Q
warn` will cause a warning to be issued whenever division is applied to two warn` will cause a warning to be issued whenever division is applied to two
integers. You can use this to find code that's affected by the change and fix integers. You can use this to find code that's affected by the change and fix
it. By default, Python 2.2 will simply perform classic division without a it. By default, Python 2.2 will simply perform classic division without a
......
...@@ -58,7 +58,7 @@ Python 2.6 incorporates new features and syntax from 3.0 while ...@@ -58,7 +58,7 @@ Python 2.6 incorporates new features and syntax from 3.0 while
remaining compatible with existing code by not removing older features remaining compatible with existing code by not removing older features
or syntax. When it's not possible to do that, Python 2.6 tries to do or syntax. When it's not possible to do that, Python 2.6 tries to do
what it can, adding compatibility functions in a what it can, adding compatibility functions in a
:mod:`future_builtins` module and a :option:`-3` switch to warn about :mod:`future_builtins` module and a :option:`!-3` switch to warn about
usages that will become unsupported in 3.0. usages that will become unsupported in 3.0.
Some significant new packages have been added to the standard library, Some significant new packages have been added to the standard library,
...@@ -116,7 +116,7 @@ module has versions with the new 3.0 semantics. Code written to be ...@@ -116,7 +116,7 @@ module has versions with the new 3.0 semantics. Code written to be
compatible with 3.0 can do ``from future_builtins import hex, map`` as compatible with 3.0 can do ``from future_builtins import hex, map`` as
necessary. necessary.
A new command-line switch, :option:`-3`, enables warnings A new command-line switch, :option:`!-3`, enables warnings
about features that will be removed in Python 3.0. You can run code about features that will be removed in Python 3.0. You can run code
with this switch to see how much work will be necessary to port with this switch to see how much work will be necessary to port
code to 3.0. The value of this switch is available code to 3.0. The value of this switch is available
......
...@@ -198,8 +198,8 @@ Other new Python3-mode warnings include: ...@@ -198,8 +198,8 @@ Other new Python3-mode warnings include:
* :func:`operator.isCallable` and :func:`operator.sequenceIncludes`, * :func:`operator.isCallable` and :func:`operator.sequenceIncludes`,
which are not supported in 3.x, now trigger warnings. which are not supported in 3.x, now trigger warnings.
* The :option:`-3` switch now automatically * The :option:`!-3` switch now automatically
enables the :option:`-Qwarn <-Q>` switch that causes warnings enables the :option:`!-Qwarn` switch that causes warnings
about using classic division with integers and long integers. about using classic division with integers and long integers.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment