diff Objects/object.c @ 1848:b724599401ff legacy-trunk

Merge back to main trunk
author Guido van Rossum <guido@python.org>
date Tue, 30 Aug 1994 08:27:36 +0000
parents aac8231a715c
children 2cede61e9b1b
line wrap: on
line diff
--- a/Objects/object.c	Tue Aug 30 08:19:36 1994 +0000
+++ b/Objects/object.c	Tue Aug 30 08:27:36 1994 +0000
@@ -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 @@
 	int flags;
 {
 	int ret = 0;
-	if (intrcheck()) {
-		err_set(KeyboardInterrupt);
+	if (sigcheck())
 		return -1;
-	}
 	if (op == NULL) {
 		fprintf(fp, "<nil>");
 	}
@@ -159,10 +157,8 @@
 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 @@
 	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*/