Kaydet (Commit) 54fab813 authored tarafından Georg Brandl's avatar Georg Brandl

Remove versionadded/changed directives merged as an oversight.

üst c2155835
...@@ -197,9 +197,6 @@ Importing Modules ...@@ -197,9 +197,6 @@ Importing Modules
to find out. Starting with Python 2.4, a failing import of a module no longer to find out. Starting with Python 2.4, a failing import of a module no longer
leaves the module in ``sys.modules``. leaves the module in ``sys.modules``.
.. versionchanged:: 2.6
always use absolute imports
.. index:: single: modules (in module sys) .. index:: single: modules (in module sys)
...@@ -216,8 +213,6 @@ Importing Modules ...@@ -216,8 +213,6 @@ Importing Modules
unless the the lock is hold. In the latter case the function raises an unless the the lock is hold. In the latter case the function raises an
ImportError. ImportError.
.. versionadded:: 2.6
.. cfunction:: PyObject* PyImport_ImportModuleEx(char *name, PyObject *globals, PyObject *locals, PyObject *fromlist) .. cfunction:: PyObject* PyImport_ImportModuleEx(char *name, PyObject *globals, PyObject *locals, PyObject *fromlist)
...@@ -236,9 +231,8 @@ Importing Modules ...@@ -236,9 +231,8 @@ Importing Modules
Failing imports remove incomplete module objects, like with Failing imports remove incomplete module objects, like with
:cfunc:`PyImport_ImportModule`. :cfunc:`PyImport_ImportModule`.
.. versionchanged:: 2.6 The function is an alias for `cfunc:PyImport_ImportModuleLevel` with -1 as
The function is an alias for `cfunc:PyImport_ImportModuleLevel` with *level*, meaning relative import.
-1 as level, meaning relative import.
.. cfunction:: PyObject* PyImport_ImportModuleLevel(char *name, PyObject *globals, PyObject *locals, PyObject *fromlist, int level) .. cfunction:: PyObject* PyImport_ImportModuleLevel(char *name, PyObject *globals, PyObject *locals, PyObject *fromlist, int level)
...@@ -252,18 +246,14 @@ Importing Modules ...@@ -252,18 +246,14 @@ Importing Modules
the return value when a submodule of a package was requested is normally the the return value when a submodule of a package was requested is normally the
top-level package, unless a non-empty *fromlist* was given. top-level package, unless a non-empty *fromlist* was given.
..versionadded:: 2.5
.. cfunction:: PyObject* PyImport_Import(PyObject *name) .. cfunction:: PyObject* PyImport_Import(PyObject *name)
This is a higher-level interface that calls the current "import hook function". This is a higher-level interface that calls the current "import hook
It invokes the :func:`__import__` function from the ``__builtins__`` of the function" (with an explicit *level* of 0, meaning absolute import). It
current globals. This means that the import is done using whatever import hooks invokes the :func:`__import__` function from the ``__builtins__`` of the
are installed in the current environment. current globals. This means that the import is done using whatever import
hooks are installed in the current environment.
.. versionchanged:: 2.6
always use absolute imports
.. cfunction:: PyObject* PyImport_ReloadModule(PyObject *m) .. cfunction:: PyObject* PyImport_ReloadModule(PyObject *m)
...@@ -1096,16 +1086,12 @@ The following functions provide locale-independent string to number conversions. ...@@ -1096,16 +1086,12 @@ The following functions provide locale-independent string to number conversions.
Case insensitive comparsion of strings. The functions works almost Case insensitive comparsion of strings. The functions works almost
identical to :cfunc:`strcmp` except that it ignores the case. identical to :cfunc:`strcmp` except that it ignores the case.
.. versionadded:: 2.6
.. cfunction:: char * PyOS_strnicmp(char *s1, char *s2, Py_ssize_t size) .. cfunction:: char * PyOS_strnicmp(char *s1, char *s2, Py_ssize_t size)
Case insensitive comparsion of strings. The functions works almost Case insensitive comparsion of strings. The functions works almost
identical to :cfunc:`strncmp` except that it ignores the case. identical to :cfunc:`strncmp` except that it ignores the case.
.. versionadded:: 2.6
.. _reflection: .. _reflection:
......
...@@ -99,8 +99,6 @@ particular functionality, for example:: ...@@ -99,8 +99,6 @@ particular functionality, for example::
Unix. They are also useful for tracking transactions and other pools of data Unix. They are also useful for tracking transactions and other pools of data
where only the most recent activity is of interest. where only the most recent activity is of interest.
.. versionchanged:: 2.6
Added *maxlen* parameter.
Deque objects support the following methods: Deque objects support the following methods:
......
...@@ -380,10 +380,6 @@ use :meth:`set_seq2` to set the commonly used sequence once and call ...@@ -380,10 +380,6 @@ use :meth:`set_seq2` to set the commonly used sequence once and call
.. XXX Explain why a dummy is used! .. XXX Explain why a dummy is used!
.. versionchanged:: 2.5
The guarantee that adjacent triples always describe non-adjacent blocks was
implemented.
:: ::
>>> s = SequenceMatcher(None, "abxcd", "abcd") >>> s = SequenceMatcher(None, "abxcd", "abcd")
......
...@@ -921,8 +921,6 @@ available. They are listed here in alphabetical order. ...@@ -921,8 +921,6 @@ available. They are listed here in alphabetical order.
``round(0.5)`` and ``round(-0.5)`` are ``0``, and ``round(1.5)`` is ``round(0.5)`` and ``round(-0.5)`` are ``0``, and ``round(1.5)`` is
``2``). Delegates to ``x.__round__(n)``. ``2``). Delegates to ``x.__round__(n)``.
.. versionchanged:: 2.6
.. function:: set([iterable]) .. function:: set([iterable])
:noindex: :noindex:
...@@ -1072,8 +1070,6 @@ available. They are listed here in alphabetical order. ...@@ -1072,8 +1070,6 @@ available. They are listed here in alphabetical order.
Return the :class:`Real` value *x* truncated to an :class:`Integral` (usually Return the :class:`Real` value *x* truncated to an :class:`Integral` (usually
a long integer). Delegates to ``x.__trunc__()``. a long integer). Delegates to ``x.__trunc__()``.
.. versionadded:: 2.6
.. function:: tuple([iterable]) .. function:: tuple([iterable])
......
...@@ -36,8 +36,6 @@ Number-theoretic and representation functions: ...@@ -36,8 +36,6 @@ Number-theoretic and representation functions:
Return *x* with the sign of *y*. ``copysign`` copies the sign bit of an IEEE Return *x* with the sign of *y*. ``copysign`` copies the sign bit of an IEEE
754 float, ``copysign(1, -0.0)`` returns *-1.0*. 754 float, ``copysign(1, -0.0)`` returns *-1.0*.
..versionadded:: 2.6
.. function:: fabs(x) .. function:: fabs(x)
...@@ -78,8 +76,6 @@ Number-theoretic and representation functions: ...@@ -78,8 +76,6 @@ Number-theoretic and representation functions:
Checks if the float *x* is positive or negative infinite. Checks if the float *x* is positive or negative infinite.
..versionadded:: 2.6
.. function:: isnan(x) .. function:: isnan(x)
...@@ -88,8 +84,6 @@ Number-theoretic and representation functions: ...@@ -88,8 +84,6 @@ Number-theoretic and representation functions:
``inf / inf`` or any operation involving a NaN, e.g. ``nan * 1``, return ``inf / inf`` or any operation involving a NaN, e.g. ``nan * 1``, return
a NaN. a NaN.
..versionadded:: 2.6
.. function:: ldexp(x, i) .. function:: ldexp(x, i)
......
...@@ -103,8 +103,6 @@ Console I/O ...@@ -103,8 +103,6 @@ Console I/O
Wide char variant of :func:`getch`, returning a Unicode value. Wide char variant of :func:`getch`, returning a Unicode value.
.. versionadded:: 2.6
.. function:: getche() .. function:: getche()
...@@ -116,8 +114,6 @@ Console I/O ...@@ -116,8 +114,6 @@ Console I/O
Wide char variant of :func:`getche`, returning a Unicode value. Wide char variant of :func:`getche`, returning a Unicode value.
.. versionadded:: 2.6
.. function:: putch(char) .. function:: putch(char)
...@@ -128,8 +124,6 @@ Console I/O ...@@ -128,8 +124,6 @@ Console I/O
Wide char variant of :func:`putch`, accepting a Unicode value. Wide char variant of :func:`putch`, accepting a Unicode value.
.. versionadded:: 2.6
.. function:: ungetch(char) .. function:: ungetch(char)
...@@ -141,8 +135,6 @@ Console I/O ...@@ -141,8 +135,6 @@ Console I/O
Wide char variant of :func:`ungetch`, accepting a Unicode value. Wide char variant of :func:`ungetch`, accepting a Unicode value.
.. versionadded:: 2.6
.. _msvcrt-other: .. _msvcrt-other:
......
...@@ -351,8 +351,6 @@ Notes: ...@@ -351,8 +351,6 @@ Notes:
float also accepts the strings "nan" and "inf" with an optional prefix "+" float also accepts the strings "nan" and "inf" with an optional prefix "+"
or "-" for Not a Number (NaN) and positive or negative infinity. or "-" for Not a Number (NaN) and positive or negative infinity.
.. versionadded:: 2.6
.. XXXJH exceptions: overflow (when? what operations?) zerodivision .. XXXJH exceptions: overflow (when? what operations?) zerodivision
...@@ -2017,9 +2015,6 @@ Files have the following methods: ...@@ -2017,9 +2015,6 @@ Files have the following methods:
Note that not all file objects are seekable. Note that not all file objects are seekable.
.. versionchanged:: 2.6
Passing float values as offset has been deprecated.
.. method:: file.tell() .. method:: file.tell()
......
...@@ -371,8 +371,6 @@ always available. ...@@ -371,8 +371,6 @@ always available.
take. It's usually ``2**31 - 1`` on a 32-bit platform and ``2**63 - 1`` on a take. It's usually ``2**31 - 1`` on a 32-bit platform and ``2**63 - 1`` on a
64-bit platform. 64-bit platform.
.. versionadded:: 3.0
.. data:: maxunicode .. data:: maxunicode
......
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