return -1 for undefined groups (as implemented in 1.5.2) instead of

Fredrik Lundh · Fredrik Lundh · commit 510c97ba2f57 · 2000-09-02T16:36:57.000Z
None (as documented) from start/end/span. closes bug #113254
diff --git a/Lib/test/test_sre.py b/Lib/test/test_sre.py
@@ -46,7 +46,7 @@ def test(expression, result, exception=None):
 if verbose:
     print 'Running tests on character literals'
 
-for i in range(0, 256):
+for i in [0, 8, 16, 32, 64, 127, 128, 255]:
     test(r"""sre.match("\%03o" % i, chr(i)) != None""", 1)
     test(r"""sre.match("\%03o0" % i, chr(i)+"0") != None""", 1)
     test(r"""sre.match("\%03o8" % i, chr(i)+"8") != None""", 1)
@@ -73,6 +73,11 @@ def test(expression, result, exception=None):
 test(r"""sre.match('x*', 'xxxa').span()""", (0, 3))
 test(r"""sre.match('a+', 'xxx')""", None)
 
+# bug 113254
+test(r"""sre.match('(a)|(b)', 'b').start(1)""", -1)
+test(r"""sre.match('(a)|(b)', 'b').end(1)""", -1)
+test(r"""sre.match('(a)|(b)', 'b').span(1)""", (-1, -1))
+
 if verbose:
     print 'Running tests on sre.sub'
 
diff --git a/Modules/_sre.c b/Modules/_sre.c
@@ -17,6 +17,7 @@
  * 00-08-07 fl  use PyOS_CheckStack() if available
  * 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.
  *
@@ -1983,11 +1984,7 @@ match_start(MatchObject* self, PyObject* args)
         return NULL;
     }
 
-    if (self->mark[index*2] < 0) {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
+    /* mark is -1 if group is undefined */
     return Py_BuildValue("i", self->mark[index*2]);
 }
 
@@ -2010,11 +2007,7 @@ match_end(MatchObject* self, PyObject* args)
         return NULL;
     }
 
-    if (self->mark[index*2] < 0) {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
+    /* mark is -1 if group is undefined */
     return Py_BuildValue("i", self->mark[index*2+1]);
 }
 
@@ -2064,12 +2057,7 @@ match_span(MatchObject* self, PyObject* args)
         return NULL;
     }
 
-    if (self->mark[index*2] < 0) {
-        Py_INCREF(Py_None);
-        Py_INCREF(Py_None);
-        return Py_BuildValue("OO", Py_None, Py_None);
-    }
-
+    /* marks are -1 if group is undefined */
     return _pair(self->mark[index*2], self->mark[index*2+1]);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`* 00-08-07 fl use PyOS_CheckStack() if available`
`18`	`18`	`* 00-08-08 fl changed findall to return empty strings instead of None`
`19`	`19`	`* 00-08-27 fl properly propagate memory errors`
	`20`	`+ * 00-09-02 fl return -1 instead of None for start/end/span`
`20`	`21`	`*`
`21`	`22`	`* Copyright (c) 1997-2000 by Secret Labs AB. All rights reserved.`
`22`	`23`	`*`
`@@ -1983,11 +1984,7 @@ match_start(MatchObject* self, PyObject* args)`
`1983`	`1984`	`return NULL;`
`1984`	`1985`	`}`
`1985`	`1986`
`1986`		`- if (self->mark[index*2] < 0) {`
`1987`		`- Py_INCREF(Py_None);`
`1988`		`- return Py_None;`
`1989`		`- }`
`1990`		`-`
	`1987`	`+ /* mark is -1 if group is undefined */`
`1991`	`1988`	`return Py_BuildValue("i", self->mark[index*2]);`
`1992`	`1989`	`}`
`1993`	`1990`
`@@ -2010,11 +2007,7 @@ match_end(MatchObject* self, PyObject* args)`
`2010`	`2007`	`return NULL;`
`2011`	`2008`	`}`
`2012`	`2009`
`2013`		`- if (self->mark[index*2] < 0) {`
`2014`		`- Py_INCREF(Py_None);`
`2015`		`- return Py_None;`
`2016`		`- }`
`2017`		`-`
	`2010`	`+ /* mark is -1 if group is undefined */`
`2018`	`2011`	`return Py_BuildValue("i", self->mark[index*2+1]);`
`2019`	`2012`	`}`
`2020`	`2013`
`@@ -2064,12 +2057,7 @@ match_span(MatchObject* self, PyObject* args)`
`2064`	`2057`	`return NULL;`
`2065`	`2058`	`}`
`2066`	`2059`
`2067`		`- if (self->mark[index*2] < 0) {`
`2068`		`- Py_INCREF(Py_None);`
`2069`		`- Py_INCREF(Py_None);`
`2070`		`- return Py_BuildValue("OO", Py_None, Py_None);`
`2071`		`- }`
`2072`		`-`
	`2060`	`+ /* marks are -1 if group is undefined */`
`2073`	`2061`	`return _pair(self->mark[index2], self->mark[index2+1]);`
`2074`	`2062`	`}`
`2075`	`2063`