summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2015-08-26 17:04:06 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2015-08-26 17:04:06 (GMT)
commit7f344a89ef36970ed495aeb2aadbf37199753c6e (patch)
tree82f51d3ddab443b13802e6b9172ad4d7c39d21a5 /Doc
parent7a1a0bbbf160e62f97d68d5743469ed56e3c1706 (diff)
parentbeaa5094a2ad4cdcbfb463c2037fad5f8da43e68 (diff)
downloadcpython-7f344a89ef36970ed495aeb2aadbf37199753c6e.zip
cpython-7f344a89ef36970ed495aeb2aadbf37199753c6e.tar.gz
cpython-7f344a89ef36970ed495aeb2aadbf37199753c6e.tar.bz2
Merge 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/includes/typestruct.h3
1 files changed, 2 insertions, 1 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 */