[Python-checkins] CVS: python/dist/src/Modules pyexpat.c,2.20,2.21

Fred L. Drake python-dev@python.org
Fri, 22 Sep 2000 08:21:35 -0700


Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv21193

Modified Files:
	pyexpat.c 
Log Message:

When PyInt_FromLong() returns NULL, you do not need to check
PyErr_Occurred().  Removed the extra test and setting of a
bogus exception.


Index: pyexpat.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pyexpat.c,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** pyexpat.c	2000/09/22 06:01:11	2.20
--- pyexpat.c	2000/09/22 15:21:31	2.21
***************
*** 415,423 ****
      int len = -1;
  
!     if ((bytes = PyInt_FromLong(buf_size)) == NULL) {
!         if (!PyErr_Occurred())
!             PyErr_SetNone(PyExc_EOFError);
          goto finally;
!     }
      if ((arg = PyTuple_New(1)) == NULL)
          goto finally;
--- 415,421 ----
      int len = -1;
  
!     if ((bytes = PyInt_FromLong(buf_size)) == NULL)
          goto finally;
! 
      if ((arg = PyTuple_New(1)) == NULL)
          goto finally;