Skip to content

Commit b70ccc3

Browse files
ashemedaiashemedai
committed
After discussing some more with Georg, do no migrate versionchanged:: 2.5 to
this branch. While I am here, also get rid of other versionchanged:: 2.x constructs, as discussed.
1 parent 7b6ca4a commit b70ccc3

File tree

19 files changed

+3
-360
lines changed

19 files changed

+3
-360
lines changed

‎Doc/c-api/allocation.rst‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ Allocating Objects on the Heap
1111

1212
.. cfunction:: PyVarObject* _PyObject_NewVar(PyTypeObject *type, Py_ssize_t size)
1313

14-
.. versionchanged:: 2.5
15-
This function used an :ctype:`int` type for *size*. This might require
16-
changes in your code for properly supporting 64-bit systems.
17-
1814

1915
.. cfunction:: PyObject* PyObject_Init(PyObject *op, PyTypeObject *type)
2016

@@ -30,10 +26,6 @@ Allocating Objects on the Heap
3026
This does everything :cfunc:`PyObject_Init` does, and also initializes the
3127
length information for a variable-size object.
3228

33-
.. versionchanged:: 2.5
34-
This function used an :ctype:`int` type for *size*. This might require
35-
changes in your code for properly supporting 64-bit systems.
36-
3729

3830
.. cfunction:: TYPE* PyObject_New(TYPE, PyTypeObject *type)
3931

@@ -55,10 +47,6 @@ Allocating Objects on the Heap
5547
fields into the same allocation decreases the number of allocations,
5648
improving the memory management efficiency.
5749

58-
.. versionchanged:: 2.5
59-
This function used an :ctype:`int` type for *size*. This might require
60-
changes in your code for properly supporting 64-bit systems.
61-
6250

6351
.. cfunction:: void PyObject_Del(PyObject *op)
6452

‎Doc/c-api/arg.rst‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,6 @@ and the following format units are left untouched.
406406

407407
PyArg_ParseTuple(args, "O|O:ref", &object, &callback)
408408

409-
.. versionchanged:: 2.5
410-
This function used an :ctype:`int` type for *min* and *max*. This might
411-
require changes in your code for properly supporting 64-bit systems.
412-
413409

414410
.. cfunction:: PyObject* Py_BuildValue(const char *format, ...)
415411

‎Doc/c-api/dict.rst‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,6 @@ Dictionary Objects
140140
Return the number of items in the dictionary. This is equivalent to
141141
``len(p)`` on a dictionary.
142142

143-
.. versionchanged:: 2.5
144-
This function returned an :ctype:`int` type. This might require changes
145-
in your code for properly supporting 64-bit systems.
146-
147143

148144
.. cfunction:: int PyDict_Next(PyObject *p, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue)
149145

@@ -190,10 +186,6 @@ Dictionary Objects
190186
Py_DECREF(o);
191187
}
192188

193-
.. versionchanged:: 2.5
194-
This function used an :ctype:`int *` type for *ppos*. This might require
195-
changes in your code for properly supporting 64-bit systems.
196-
197189

198190
.. cfunction:: int PyDict_Merge(PyObject *a, PyObject *b, int override)
199191

‎Doc/c-api/gcsupport.rst‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,12 @@ Constructors for container types must conform to two rules:
4545
Analogous to :cfunc:`PyObject_NewVar` but for container objects with the
4646
:const:`Py_TPFLAGS_HAVE_GC` flag set.
4747

48-
.. versionchanged:: 2.5
49-
This function used an :ctype:`int` type for *size*. This might require
50-
changes in your code for properly supporting 64-bit systems.
51-
5248

5349
.. cfunction:: TYPE* PyObject_GC_Resize(TYPE, PyVarObject *op, Py_ssize_t newsize)
5450

5551
Resize an object allocated by :cfunc:`PyObject_NewVar`. Returns the
5652
resized object or *NULL* on failure.
5753

58-
.. versionchanged:: 2.5
59-
This function used an :ctype:`int` type for *newsize*. This might
60-
require changes in your code for properly supporting 64-bit systems.
61-
6254

6355
.. cfunction:: void PyObject_GC_Track(PyObject *op)
6456

‎Doc/c-api/list.rst‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ List Objects
4545
:cfunc:`PySequence_SetItem` or expose the object to Python code before
4646
setting all items to a real object with :cfunc:`PyList_SetItem`.
4747

48-
.. versionchanged:: 2.5
49-
This function used an :ctype:`int` for *size*. This might require
50-
changes in your code for properly supporting 64-bit systems.
51-
5248

5349
.. cfunction:: Py_ssize_t PyList_Size(PyObject *list)
5450

@@ -57,19 +53,11 @@ List Objects
5753
Return the length of the list object in *list*; this is equivalent to
5854
``len(list)`` on a list object.
5955

60-
.. versionchanged:: 2.5
61-
This function returned an :ctype:`int`. This might require changes in
62-
your code for properly supporting 64-bit systems.
63-
6456

6557
.. cfunction:: Py_ssize_t PyList_GET_SIZE(PyObject *list)
6658

6759
Macro form of :cfunc:`PyList_Size` without error checking.
6860

69-
.. versionchanged:: 2.5
70-
This macro returned an :ctype:`int`. This might require changes in your
71-
code for properly supporting 64-bit systems.
72-
7361

7462
.. cfunction:: PyObject* PyList_GetItem(PyObject *list, Py_ssize_t index)
7563

@@ -78,19 +66,11 @@ List Objects
7866
supported. If *pos* is out of bounds, return *NULL* and set an
7967
:exc:`IndexError` exception.
8068

81-
.. versionchanged:: 2.5
82-
This function used an :ctype:`int` for *index*. This might require
83-
changes in your code for properly supporting 64-bit systems.
84-
8569

8670
.. cfunction:: PyObject* PyList_GET_ITEM(PyObject *list, Py_ssize_t i)
8771

8872
Macro form of :cfunc:`PyList_GetItem` without error checking.
8973

90-
.. versionchanged:: 2.5
91-
This macro used an :ctype:`int` for *i*. This might require changes in
92-
your code for properly supporting 64-bit systems.
93-
9474

9575
.. cfunction:: int PyList_SetItem(PyObject *list, Py_ssize_t index, PyObject *item)
9676

@@ -102,10 +82,6 @@ List Objects
10282
This function "steals" a reference to *item* and discards a reference to
10383
an item already in the list at the affected position.
10484

105-
.. versionchanged:: 2.5
106-
This function used an :ctype:`int` for *index*. This might require
107-
changes in your code for properly supporting 64-bit systems.
108-
10985

11086
.. cfunction:: void PyList_SET_ITEM(PyObject *list, Py_ssize_t i, PyObject *o)
11187

@@ -119,21 +95,13 @@ List Objects
11995
is being replaced; any reference in *list* at position *i* will be
12096
leaked.
12197

122-
.. versionchanged:: 2.5
123-
This macro used an :ctype:`int` for *i*. This might require
124-
changes in your code for properly supporting 64-bit systems.
125-
12698

12799
.. cfunction:: int PyList_Insert(PyObject *list, Py_ssize_t index, PyObject *item)
128100

129101
Insert the item *item* into list *list* in front of index *index*. Return
130102
``0`` if successful; return ``-1`` and set an exception if unsuccessful.
131103
Analogous to ``list.insert(index, item)``.
132104

133-
.. versionchanged:: 2.5
134-
This function used an :ctype:`int` for *index*. This might require
135-
changes in your code for properly supporting 64-bit systems.
136-
137105

138106
.. cfunction:: int PyList_Append(PyObject *list, PyObject *item)
139107

@@ -148,10 +116,6 @@ List Objects
148116
*low* and *high*. Return *NULL* and set an exception if unsuccessful.
149117
Analogous to ``list[low:high]``.
150118

151-
.. versionchanged:: 2.5
152-
This function used an :ctype:`int` for *low* and *high*. This might
153-
require changes in your code for properly supporting 64-bit systems.
154-
155119

156120
.. cfunction:: int PyList_SetSlice(PyObject *list, Py_ssize_t low, Py_ssize_t high, PyObject *itemlist)
157121

@@ -160,10 +124,6 @@ List Objects
160124
be *NULL*, indicating the assignment of an empty list (slice deletion).
161125
Return ``0`` on success, ``-1`` on failure.
162126

163-
.. versionchanged:: 2.5
164-
This function used an :ctype:`int` for *low* and *high*. This might
165-
require changes in your code for properly supporting 64-bit systems.
166-
167127

168128
.. cfunction:: int PyList_Sort(PyObject *list)
169129

‎Doc/c-api/long.rst‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@ All integers are implemented as "long" integer objects of arbitrary size.
100100
string is first encoded to a byte string using :cfunc:`PyUnicode_EncodeDecimal`
101101
and then converted using :cfunc:`PyLong_FromString`.
102102

103-
.. versionchanged:: 2.5
104-
This function used an :ctype:`int` for *length*. This might require
105-
changes in your code for properly supporting 64-bit systems.
106-
107103

108104
.. cfunction:: PyObject* PyLong_FromVoidPtr(void *p)
109105

‎Doc/c-api/mapping.rst‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ Mapping Protocol
2121
objects that do not provide mapping protocol, this is equivalent to the Python
2222
expression ``len(o)``.
2323

24-
.. versionchanged:: 2.5
25-
These functions returned an :ctype:`int` type. This might require
26-
changes in your code for properly supporting 64-bit systems.
27-
2824

2925
.. cfunction:: int PyMapping_DelItemString(PyObject *o, char *key)
3026

‎Doc/c-api/marshal.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,3 @@ written using these routines?
8787
appropriate exception (:exc:`EOFError` or :exc:`TypeError`) and returns
8888
*NULL*.
8989

90-
.. versionchanged:: 2.5
91-
This function used an :ctype:`int` type for *len*. This might require
92-
changes in your code for properly supporting 64-bit systems.

‎Doc/c-api/objbuffer.rst‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ Buffer Protocol
1414
and *buffer_len* to the buffer length. Returns ``-1`` and sets a
1515
:exc:`TypeError` on error.
1616

17-
.. versionchanged:: 2.5
18-
This function used an :ctype:`int *` type for *buffer_len*. This might
19-
require changes in your code for properly supporting 64-bit systems.
20-
2117

2218
.. cfunction:: int PyObject_AsReadBuffer(PyObject *obj, const void **buffer, Py_ssize_t *buffer_len)
2319

@@ -27,10 +23,6 @@ Buffer Protocol
2723
and *buffer_len* to the buffer length. Returns ``-1`` and sets a
2824
:exc:`TypeError` on error.
2925

30-
.. versionchanged:: 2.5
31-
This function used an :ctype:`int *` type for *buffer_len*. This might
32-
require changes in your code for properly supporting 64-bit systems.
33-
3426

3527
.. cfunction:: int PyObject_CheckReadBuffer(PyObject *o)
3628

@@ -45,7 +37,3 @@ Buffer Protocol
4537
returns ``0``, sets *buffer* to the memory location and *buffer_len* to the
4638
buffer length. Returns ``-1`` and sets a :exc:`TypeError` on error.
4739

48-
.. versionchanged:: 2.5
49-
This function used an :ctype:`int *` type for *buffer_len*. This might
50-
require changes in your code for properly supporting 64-bit systems.
51-

‎Doc/c-api/object.rst‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,6 @@ is considered sufficient for this determination.
304304
and mapping protocols, the sequence length is returned. On error, ``-1`` is
305305
returned. This is the equivalent to the Python expression ``len(o)``.
306306

307-
.. versionchanged:: 2.5
308-
These functions returned an :ctype:`int` type. This might require
309-
changes in your code for properly supporting 64-bit systems.
310-
311307

312308
.. cfunction:: PyObject* PyObject_GetItem(PyObject *o, PyObject *key)
313309

0 commit comments

Comments
 (0)