*** Lib\test\re_tests.py.orig	Sun Apr 20 00:35:44 2003
--- Lib\test\re_tests.py	Mon Apr 21 10:48:57 2003
***************
*** 659,664 ****
--- 659,669 ----
      ('^([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'),
+     # test that capturing groups inside negative assertions work correctly
+     # for backreferences inside the assertion, but are None outside
+     ('^(?!(a)\\1)', 'aa', FAIL),
+     ('^(a)(?:(?!(b)*))*', 'abb', SUCCEED, 'g1+"-"+g2', 'a-None'),
+     ('^((?!(a)c)[ab])*', 'abc', SUCCEED, 'g1+"-"+g2', 'b-None'),
  ]
  
  try:
*** Modules\_sre.c.orig	Sun Apr 20 00:35:44 2003
--- Modules\_sre.c	Mon Apr 21 10:30:12 2003
***************
*** 344,349 ****
--- 344,350 ----
  #define SRE_COUNT sre_count
  #define SRE_CHARSET sre_charset
  #define SRE_INFO sre_info
+ #define SRE_ASSERT_NOT sre_assert_not
  #define SRE_MATCH sre_match
  #define SRE_SEARCH sre_search
  #define SRE_LITERAL_TEMPLATE sre_literal_template
***************
*** 358,363 ****
--- 359,365 ----
  #undef SRE_SEARCH
  #undef SRE_MATCH
  #undef SRE_INFO
+ #undef SRE_ASSERT_NOT
  #undef SRE_CHARSET
  #undef SRE_COUNT
  #undef SRE_AT
***************
*** 370,375 ****
--- 372,378 ----
  #define SRE_COUNT sre_ucount
  #define SRE_CHARSET sre_ucharset
  #define SRE_INFO sre_uinfo
+ #define SRE_ASSERT_NOT sre_uassert_not
  #define SRE_MATCH sre_umatch
  #define SRE_SEARCH sre_usearch
  #define SRE_LITERAL_TEMPLATE sre_uliteral_template
***************
*** 694,699 ****
--- 697,727 ----
      } while (0)
  
  LOCAL(int)
+ SRE_ASSERT_NOT(SRE_STATE *state, SRE_CODE *pattern, int level)
+ {
+     int lastmark, lastindex, lastbase, i, result;
+ 
+     LASTMARK_SAVE();
+     i = mark_save(state, 0, lastmark);
+     if (i < 0)
+         return i;
+     lastbase = state->mark_stack_base;  
+ 
+     result = SRE_MATCH(state, pattern, level);
+     if (result < 0)
+         return result;
+ 
+     state->mark_stack_base = lastbase;  /* pop off any marks that may have 
+                                            been left by successful repeats or 
+                                            branches */
+     i = mark_restore(state, 0, lastmark);
+     LASTMARK_RESTORE();
+ 
+     return !result;
+ }
+ 
+ 
+ LOCAL(int)
  SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
  {
      /* check if string matches the given pattern.  returns <0 for
***************
*** 917,927 ****
              TRACE(("|%p|%p|ASSERT_NOT %d\n", pattern, ptr, pattern[1]));
              state->ptr = ptr - pattern[1];
              if (state->ptr >= state->beginning) {
!                 i = SRE_MATCH(state, pattern + 2, level + 1);
!                 if (i < 0)
                      return i;
-                 if (i)
-                     return 0;
              }
              pattern += pattern[0];
              break;
--- 945,953 ----
              TRACE(("|%p|%p|ASSERT_NOT %d\n", pattern, ptr, pattern[1]));
              state->ptr = ptr - pattern[1];
              if (state->ptr >= state->beginning) {
!                 i = SRE_ASSERT_NOT(state, pattern + 2, level + 1);
!                 if (i <= 0)
                      return i;
              }
              pattern += pattern[0];
              break;