[Python-checkins] CVS: python/dist/src/Objects abstract.c,2.57.2.1,2.57.2.2

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv3568

Modified Files:
      Tag: iter-branch
	abstract.c 
Log Message:
A callable is not an iterator, not even inside #if 0.
Don't reference getiter() -- it's iter() now.


Index: abstract.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/abstract.c,v
retrieving revision 2.57.2.1
retrieving revision 2.57.2.2
diff -C2 -r2.57.2.1 -r2.57.2.2
*** abstract.c	2001/03/13 10:07:42	2.57.2.1
--- abstract.c	2001/03/13 12:01:26	2.57.2.2
***************
*** 1636,1649 ****
  		f = t->tp_iter;
  	if (f == NULL) {
- #if 0
- 		if (PyCallable_Check(o)) {
- 			Py_INCREF(o);
- 			return o;
- 		}
- #endif
  		if (PySequence_Check(o))
  			return PyIter_New(o);
! 		PyErr_SetString(PyExc_TypeError,
! 				"getiter() of non-sequence");
  		return NULL;
  	}
--- 1636,1642 ----
  		f = t->tp_iter;
  	if (f == NULL) {
  		if (PySequence_Check(o))
  			return PyIter_New(o);
! 		PyErr_SetString(PyExc_TypeError, "iter() of non-sequence");
  		return NULL;
  	}