Remove 2.6 versionchanges, turn 2.7 ones into 3.1.

diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
index bf2f484d76d7d50fba63fc7edb8b97a807c3636e..21051b980cdcdbc080e057b7d4b6915760614669 100644 (file)
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -262,8 +262,6 @@ is considered sufficient for this determination.
    allowing a type to explicitly indicate to the interpreter that it is not
    hashable.
 
-   .. versionadded:: 2.6
-
 
 .. cfunction:: int PyObject_IsTrue(PyObject *o)
 

diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst
index 80b43b9850329d375c2f20af2392155e2a3a76c5..05f9c4d8cb64376ab06c31d93cc99e21a9102154 100644 (file)
--- a/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@ -598,7 +598,7 @@ units as well as normal text:
 
    Example::
 
-      .. versionadded:: 2.5
+      .. versionadded:: 3.1
          The *spam* parameter.
 
    Note that there must be no blank line between the directive head and the

diff --git a/Doc/extending/windows.rst b/Doc/extending/windows.rst
index aac1d2dc98ec77d21032d2cf8ceec9befab16e08..29e9e1ecf15d7434b4d6f90406e1ffdf1cb65220 100644 (file)
--- a/Doc/extending/windows.rst
+++ b/Doc/extending/windows.rst
@@ -107,10 +107,6 @@ described here are distributed with the Python sources in the
    to avoid confusion with a system library :file:`spam.dll` to which your module
    could be a Python interface.
 
-   .. versionchanged:: 2.5
-      Previously, file names like :file:`spam.dll` (in release mode) or
-      :file:`spam_d.dll` (in debug mode) were also recognized.
-
    Now your options are:
 
 #. Copy :file:`example.sln` and :file:`example.vcproj`, rename them to

diff --git a/Doc/library/http.cookies.rst b/Doc/library/http.cookies.rst
index 0b6607287b89903e06f8ba56ccecf29c6c7f8307..7470c6151d6797485e5c58485b8b3fbf96b76fdb 100644 (file)
--- a/Doc/library/http.cookies.rst
+++ b/Doc/library/http.cookies.rst
@@ -131,9 +131,6 @@ Morsel Objects
 
    The keys are case-insensitive.
 
-   .. versionadded:: 2.6
-      The :attr:`httponly` attribute was added.
-
 
 .. attribute:: Morsel.value
 

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index c7c553f9e409cc85c0e57e9a7690f7cf2eed372d..d849247410eb20cdfe65ab04f82249c7bba8e168 100644 (file)
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -562,16 +562,11 @@ Row Objects
    If two :class:`Row` objects have exactly the same columns and their
    members are equal, they compare equal.
 
-   .. versionchanged:: 2.6
-      Added iteration and equality (hashability).
-
    .. method:: keys
 
       This method returns a tuple of column names. Immediately after a query,
       it is the first member of each tuple in :attr:`Cursor.description`.
 
-      .. versionadded:: 2.6
-
 Let's assume we initialize a table as in the example given above::
 
     conn = sqlite3.connect(":memory:")

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index fb3a50d81c13b80c65123e28d0fbb355528b19a8..79ca823bbb6ffacfe0124acc87e6f45565e5405e 100644 (file)
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -461,8 +461,6 @@ The float type has some additional methods.
     :exc:`OverflowError` on infinities and a :exc:`ValueError` on
     NaNs.
 
-    .. versionadded:: 2.6
-
 Two methods support conversion to
 and from hexadecimal strings.  Since Python's floats are stored
 internally as binary numbers, converting a float to or from a

diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 7bb1e016d2da88f3ac215b4a2ef9397db73129a7..bc3d714e110d3db06f4c9a63d8c605957811bc97 100644 (file)
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -353,5 +353,3 @@ The :mod:`test.support` module defines the following classes:
    Class used to record warnings for unit tests. See documentation of
    :func:`check_warnings` above for more details.
 
-   .. versionadded:: 2.6
-

diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
index f6b3db5c8b74cda645b56962027d7601a0e0d9bf..f6856ff7213ccd1c4f2ddfc2a0228eb1ff9ca7e1 100644 (file)
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -335,8 +335,3 @@ Available Context Managers
     module returned when you import :mod:`warnings` whose filter will be
     protected. This argument exists primarily for testing the :mod:`warnings`
     module itself.
-
-    .. versionchanged:: 3.0
-
-       Constructor arguments turned into keyword-only arguments.
-

diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 35838564068fc88cac054cfbc274253e5c2bc3c8..a4c7e4e3f9441173dd48ae6e16b5883703d519a9 100644 (file)
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -67,8 +67,8 @@ The module defines the following items:
    otherwise returns ``False``.  *filename* may be a file or file-like object too.
    This module does not currently handle ZIP files which have appended comments.
 
-   .. versionchanged:: 2.7
-   Support for file and file-like objects.
+   .. versionchanged:: 3.1
+      Support for file and file-like objects.
 
 .. data:: ZIP_STORED