diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2015-08-26 17:04:06 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2015-08-26 17:04:06 (GMT) |
| commit | 7f344a89ef36970ed495aeb2aadbf37199753c6e (patch) | |
| tree | 82f51d3ddab443b13802e6b9172ad4d7c39d21a5 | |
| parent | 7a1a0bbbf160e62f97d68d5743469ed56e3c1706 (diff) | |
| parent | beaa5094a2ad4cdcbfb463c2037fad5f8da43e68 (diff) | |
| download | cpython-7f344a89ef36970ed495aeb2aadbf37199753c6e.zip cpython-7f344a89ef36970ed495aeb2aadbf37199753c6e.tar.gz cpython-7f344a89ef36970ed495aeb2aadbf37199753c6e.tar.bz2 | |
Merge 3.5
| -rw-r--r-- | Doc/includes/typestruct.h | 3 | ||||
| -rw-r--r-- | Include/object.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Doc/includes/typestruct.h b/Doc/includes/typestruct.h index 50c4621..9f47899 100644 --- a/Doc/includes/typestruct.h +++ b/Doc/includes/typestruct.h @@ -9,7 +9,8 @@ typedef struct _typeobject { printfunc tp_print; getattrfunc tp_getattr; setattrfunc tp_setattr; - PyAsyncMethods *tp_as_async; /* formerly known as tp_compare or tp_reserved */ + PyAsyncMethods *tp_as_async; /* formerly known as tp_compare (Python 2) + or tp_reserved (Python 3) */ reprfunc tp_repr; /* Method suites for standard classes */ diff --git a/Include/object.h b/Include/object.h index 8afcbe9..4d286ef 100644 --- a/Include/object.h +++ b/Include/object.h @@ -351,7 +351,8 @@ typedef struct _typeobject { printfunc tp_print; getattrfunc tp_getattr; setattrfunc tp_setattr; - PyAsyncMethods *tp_as_async; /* formerly known as tp_compare or tp_reserved */ + PyAsyncMethods *tp_as_async; /* formerly known as tp_compare (Python 2) + or tp_reserved (Python 3) */ reprfunc tp_repr; /* Method suites for standard classes */ |