*** Lib\test\re_tests.py.orig	Sun Apr 20 00:35:44 2003
--- Lib\test\re_tests.py	Mon Apr 21 10:06:42 2003
***************
*** 659,664 ****
--- 659,673 ----
      ('^([ab]*?)(?=(b)?)c', 'abc', SUCCEED, 'g1+"-"+g2', 'ab-None'),
      ('^([ab]*?)(?!(b))c', 'abc', SUCCEED, 'g1+"-"+g2', 'ab-None'),
      ('^([ab]*?)(?<!(a))c', 'abc', SUCCEED, 'g1+"-"+g2', 'ab-None'),
+     # capturing groups in alternatives in repeats
+     ('^((a)|b)*', 'abc', SUCCEED, 'g1+"-"+g2', 'b-a'),
+     ('^(([ab])|c)*', 'abc', SUCCEED, 'g1+"-"+g2', 'c-b'),
+     ('^((d)|[ab])*', 'abc', SUCCEED, 'g1+"-"+g2', 'b-None'),
+     ('^((a)c|[ab])*', 'abc', SUCCEED, 'g1+"-"+g2', 'b-None'),
+     ('^((a)|b)*?c', 'abc', SUCCEED, 'g1+"-"+g2', 'b-a'),
+     ('^(([ab])|c)*?d', 'abcd', SUCCEED, 'g1+"-"+g2', 'c-b'),
+     ('^((d)|[ab])*?c', 'abc', SUCCEED, 'g1+"-"+g2', 'b-None'),
+     ('^((a)c|[ab])*?c', 'abc', SUCCEED, 'g1+"-"+g2', 'b-None'),
  ]
  
  try:
*** Modules\_sre.c.orig	Sun Apr 20 00:35:44 2003
--- Modules\_sre.c	Mon Apr 21 09:40:38 2003
***************
*** 938,947 ****
--- 938,957 ----
                  if (pattern[1] == SRE_OP_IN &&
                      (ptr >= end || !SRE_CHARSET(pattern + 3, (SRE_CODE) *ptr)))
                      continue;
+                 if (state->repeat) {
+                     i = mark_save(state, 0, lastmark);
+                     if (i < 0)
+                         return i;
+                 }
                  state->ptr = ptr;
                  i = SRE_MATCH(state, pattern + 1, level + 1);
                  if (i)
                      return i;
+                 if (state->repeat) {
+                     i = mark_restore(state, 0, lastmark);
+                     if (i < 0)
+                         return i;
+                 }
                  LASTMARK_RESTORE();
              }
              return 0;