diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-02-02 20:41:29 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-02-02 20:41:29 (GMT) |
| commit | d925ef83bc07df1708124bf48d5ee5f06576b071 (patch) | |
| tree | 41eb1074f2c83fd26066a70ffb3c497724393e8d /Python | |
| parent | 3571d8115f4f62022889761bef2af024b4ff9fd1 (diff) | |
| download | cpython-d925ef83bc07df1708124bf48d5ee5f06576b071.zip cpython-d925ef83bc07df1708124bf48d5ee5f06576b071.tar.gz cpython-d925ef83bc07df1708124bf48d5ee5f06576b071.tar.bz2 | |
Merged revisions 69214 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r69214 | mark.dickinson | 2009-02-02 20:36:42 +0000 (Mon, 02 Feb 2009) | 4 lines
Issue #1717: rename tp_compare to tp_reserved. I'll change the
type of tp_compare in a separate commit, for ease of reversion
should things go wrong.
........
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/Python-ast.c | 2 | ||||
| -rw-r--r-- | Python/bltinmodule.c | 6 | ||||
| -rw-r--r-- | Python/import.c | 2 | ||||
| -rw-r--r-- | Python/symtable.c | 2 | ||||
| -rw-r--r-- | Python/traceback.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Python/Python-ast.c b/Python/Python-ast.c index 72b5b05..4083f80 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -479,7 +479,7 @@ static PyTypeObject AST_type = { 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ - 0, /* tp_compare */ + 0, /* tp_reserved */ 0, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_sequence */ diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 79ad66d..a6d13d2 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -417,7 +417,7 @@ PyTypeObject PyFilter_Type = { 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ - 0, /* tp_compare */ + 0, /* tp_reserved */ 0, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_sequence */ @@ -1018,7 +1018,7 @@ PyTypeObject PyMap_Type = { 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ - 0, /* tp_compare */ + 0, /* tp_reserved */ 0, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_sequence */ @@ -2169,7 +2169,7 @@ PyTypeObject PyZip_Type = { 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ - 0, /* tp_compare */ + 0, /* tp_reserved */ 0, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_sequence */ diff --git a/Python/import.c b/Python/import.c index a2e0f26..397bfd8 100644 --- a/Python/import.c +++ b/Python/import.c @@ -3290,7 +3290,7 @@ PyTypeObject PyNullImporter_Type = { 0, /*tp_print*/ 0, /*tp_getattr*/ 0, /*tp_setattr*/ - 0, /*tp_compare*/ + 0, /*tp_reserved*/ 0, /*tp_repr*/ 0, /*tp_as_number*/ 0, /*tp_as_sequence*/ diff --git a/Python/symtable.c b/Python/symtable.c index e3bb270..17876ea 100644 --- a/Python/symtable.c +++ b/Python/symtable.c @@ -130,7 +130,7 @@ PyTypeObject PySTEntry_Type = { 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ - 0, /* tp_compare */ + 0, /* tp_reserved */ (reprfunc)ste_repr, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_sequence */ diff --git a/Python/traceback.c b/Python/traceback.c index 42bbd53..e77b1b2 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -72,7 +72,7 @@ PyTypeObject PyTraceBack_Type = { 0, /*tp_print*/ 0, /*tp_getattr*/ 0, /*tp_setattr*/ - 0, /*tp_compare*/ + 0, /*tp_reserved*/ 0, /*tp_repr*/ 0, /*tp_as_number*/ 0, /*tp_as_sequence*/ |