diff options
| author | Guido van Rossum <guido@python.org> | 1994-08-30 08:27:36 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1994-08-30 08:27:36 (GMT) |
| commit | 1d5735e84621a7fe68d361fa0e289fa2c3310836 (patch) | |
| tree | 4ee6f32fa4743f4c6641b04131e449bc71a5ea25 /Objects/object.c | |
| parent | 013142a95fd63a05d09cec7b36b7c86cc98e30c1 (diff) | |
| download | cpython-1d5735e84621a7fe68d361fa0e289fa2c3310836.zip cpython-1d5735e84621a7fe68d361fa0e289fa2c3310836.tar.gz cpython-1d5735e84621a7fe68d361fa0e289fa2c3310836.tar.bz2 | |
Merge back to main trunk
Diffstat (limited to 'Objects/object.c')
| -rw-r--r-- | Objects/object.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Objects/object.c b/Objects/object.c index 7a7383e..072b50b 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1,5 +1,5 @@ /*********************************************************** -Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum, +Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum, Amsterdam, The Netherlands. All Rights Reserved @@ -107,10 +107,8 @@ printobject(op, fp, flags) int flags; { int ret = 0; - if (intrcheck()) { - err_set(KeyboardInterrupt); + if (sigcheck()) return -1; - } if (op == NULL) { fprintf(fp, "<nil>"); } @@ -159,10 +157,8 @@ object * reprobject(v) object *v; { - if (intrcheck()) { - err_set(KeyboardInterrupt); + if (sigcheck()) return NULL; - } if (v == NULL) return newstringobject("<NULL>"); else if (v->ob_type->tp_repr == NULL) { @@ -349,7 +345,7 @@ static typeobject Notype = { 0, /*tp_getattr*/ 0, /*tp_setattr*/ 0, /*tp_compare*/ - none_repr, /*tp_repr*/ + (reprfunc)none_repr, /*tp_repr*/ 0, /*tp_as_number*/ 0, /*tp_as_sequence*/ 0, /*tp_as_mapping*/ |