Browse Source

Issue #28761: The fields name and doc of structures PyMemberDef, PyGetSetDef,

PyStructSequence_Field, PyStructSequence_Desc, and wrapperbase are now of
type "const char *" rather of "char *".
pull/2/head
Serhiy Storchaka 9 years ago
parent
commit
007d7ff73f
  1. 10
      Doc/c-api/typeobj.rst
  2. 10
      Doc/extending/newtypes.rst
  3. 6
      Doc/whatsnew/3.7.rst
  4. 8
      Include/descrobject.h
  5. 4
      Include/structmember.h
  6. 8
      Include/structseq.h
  7. 4
      Misc/NEWS
  8. 2
      Objects/structseq.c

10
Doc/c-api/typeobj.rst

@ -725,11 +725,11 @@ type objects) *must* have the :attr:`ob_size` field.
typedef int (*setter)(PyObject *, PyObject *, void *);
typedef struct PyGetSetDef {
char *name; /* attribute name */
getter get; /* C function to get the attribute */
setter set; /* C function to set or delete the attribute */
char *doc; /* optional doc string */
void *closure; /* optional additional data for getter and setter */
const char *name; /* attribute name */
getter get; /* C function to get the attribute */
setter set; /* C function to set or delete the attribute */
const char *doc; /* optional doc string */
void *closure; /* optional additional data for getter and setter */
} PyGetSetDef;

10
Doc/extending/newtypes.rst

@ -1138,11 +1138,11 @@ in the instance. A variety of primitive C types are supported, and access may
be read-only or read-write. The structures in the table are defined as::
typedef struct PyMemberDef {
char *name;
int type;
int offset;
int flags;
char *doc;
const char *name;
int type;
int offset;
int flags;
const char *doc;
} PyMemberDef;
For each entry in the table, a :term:`descriptor` will be constructed and added to the

6
Doc/whatsnew/3.7.rst

@ -99,6 +99,12 @@ Build and C API Changes
of libffi is now required when building ``_ctypes`` on such platforms.
Contributed by Zachary Ware in :issue:`27979`.
* The fields :c:member:`name` and :c:member:`doc` of structures
:c:type:`PyMemberDef`, :c:type:`PyGetSetDef`,
:c:type:`PyStructSequence_Field`, :c:type:`PyStructSequence_Desc`,
and :c:type:`wrapperbase` are now of type ``const char *`` rather of
``char *``. (Contributed by Serhiy Storchaka in :issue:`28761`.)
Deprecated
==========

8
Include/descrobject.h

@ -9,10 +9,10 @@ typedef PyObject *(*getter)(PyObject *, void *);
typedef int (*setter)(PyObject *, PyObject *, void *);
typedef struct PyGetSetDef {
char *name;
const char *name;
getter get;
setter set;
char *doc;
const char *doc;
void *closure;
} PyGetSetDef;
@ -24,11 +24,11 @@ typedef PyObject *(*wrapperfunc_kwds)(PyObject *self, PyObject *args,
void *wrapped, PyObject *kwds);
struct wrapperbase {
char *name;
const char *name;
int offset;
void *function;
wrapperfunc wrapper;
char *doc;
const char *doc;
int flags;
PyObject *name_strobj;
};

4
Include/structmember.h

@ -16,11 +16,11 @@ extern "C" {
pointer is NULL. */
typedef struct PyMemberDef {
char *name;
const char *name;
int type;
Py_ssize_t offset;
int flags;
char *doc;
const char *doc;
} PyMemberDef;
/* Types */

8
Include/structseq.h

@ -8,13 +8,13 @@ extern "C" {
#endif
typedef struct PyStructSequence_Field {
char *name;
char *doc;
const char *name;
const char *doc;
} PyStructSequence_Field;
typedef struct PyStructSequence_Desc {
char *name;
char *doc;
const char *name;
const char *doc;
struct PyStructSequence_Field *fields;
int n_in_sequence;
} PyStructSequence_Desc;

4
Misc/NEWS

@ -432,6 +432,10 @@ Windows
C API
-----
- Issue #28761: The fields name and doc of structures PyMemberDef, PyGetSetDef,
PyStructSequence_Field, PyStructSequence_Desc, and wrapperbase are now of
type "const char *" rather of "char *".
- Issue #28748: Private variable _Py_PackageContext is now of type "const char *"
rather of "char *".

2
Objects/structseq.c

@ -256,7 +256,7 @@ structseq_reduce(PyStructSequence* self)
}
for (; i < n_fields; i++) {
char *n = Py_TYPE(self)->tp_members[i-n_unnamed_fields].name;
const char *n = Py_TYPE(self)->tp_members[i-n_unnamed_fields].name;
if (PyDict_SetItemString(dict, n, self->ob_item[i]) < 0)
goto error;
}

Loading…
Cancel
Save