[Python-checkins] CVS: python/dist/src/Modules _sre.c,2.40,2.41

[Fredrik Lundh]

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

Modified Files:
	_sre.c 
Log Message:


return -1 for undefined groups (as implemented in 1.5.2) instead of
None (as documented) from start/end/span.  closes bug #113254


Index: _sre.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_sre.c,v
retrieving revision 2.40
retrieving revision 2.41
diff -C2 -r2.40 -r2.41
*** _sre.c	2000/08/27 21:32:46	2.40
--- _sre.c	2000/09/02 16:36:57	2.41
***************
*** 18,21 ****
--- 18,22 ----
   * 00-08-08 fl  changed findall to return empty strings instead of None
   * 00-08-27 fl  properly propagate memory errors
+  * 00-09-02 fl  return -1 instead of None for start/end/span
   *
   * Copyright (c) 1997-2000 by Secret Labs AB.  All rights reserved.
***************
*** 1984,1992 ****
      }
  
!     if (self->mark[index*2] < 0) {
!         Py_INCREF(Py_None);
!         return Py_None;
!     }
! 
      return Py_BuildValue("i", self->mark[index*2]);
  }
--- 1985,1989 ----
      }
  
!     /* mark is -1 if group is undefined */
      return Py_BuildValue("i", self->mark[index*2]);
  }
***************
*** 2010,2019 ****
          return NULL;
      }
- 
-     if (self->mark[index*2] < 0) {
-         Py_INCREF(Py_None);
-         return Py_None;
-     }
  
      return Py_BuildValue("i", self->mark[index*2+1]);
  }
--- 2007,2012 ----
          return NULL;
      }
  
+     /* mark is -1 if group is undefined */
      return Py_BuildValue("i", self->mark[index*2+1]);
  }
***************
*** 2064,2074 ****
          return NULL;
      }
- 
-     if (self->mark[index*2] < 0) {
-         Py_INCREF(Py_None);
-         Py_INCREF(Py_None);
-         return Py_BuildValue("OO", Py_None, Py_None);
-     }
  
      return _pair(self->mark[index*2], self->mark[index*2+1]);
  }
--- 2057,2062 ----
          return NULL;
      }
  
+     /* marks are -1 if group is undefined */
      return _pair(self->mark[index*2], self->mark[index*2+1]);
  }