From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 26 May 2014 22:38:52 +0000 (-0700)
Subject: remove list of example incompatibilities (closes #21434)
X-Git-Tag: v2.7.8~37^2~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3690d41c480bedef7f4b7f725cf62425229c0923;p=thirdparty%2FPython%2Fcpython.git

remove list of example incompatibilities (closes #21434)
---

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index f99060bd57f5..842b266c6e58 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -397,18 +397,9 @@ Miscellaneous options
 
 .. cmdoption:: -3
 
-   Warn about Python 3.x incompatibilities which cannot be fixed trivially by
-   :ref:`2to3 <2to3-reference>`. Among these are:
-
-   * :meth:`dict.has_key`
-   * :func:`apply`
-   * :func:`callable`
-   * :func:`coerce`
-   * :func:`execfile`
-   * :func:`reduce`
-   * :func:`reload`
-
-   Using these will emit a :exc:`DeprecationWarning`.
+   Warn about Python 3.x possible incompatibilities by emitting a
+   :exc:`DeprecationWarning` for features that are removed or significantly
+   changed in Python 3.
 
    .. versionadded:: 2.6