[Python-checkins] CVS: python/dist/src/Lib sre_parse.py,1.49,1.50

Tim Peters tim_one@users.sourceforge.net
Sat, 03 Nov 2001 11:35:45 -0800


Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv27485/python/Lib

Modified Files:
	sre_parse.py 
Log Message:
Improved error msg when a symbolic group name is redefined.  Added docs
and NEWS.  Bugfix candidate?  That's a dilemma for Anthony <wink>:  /F
did fix a longstanding bug here, but the fix can cause code to raise an
exception that previously worked by accident.


Index: sre_parse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/sre_parse.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** sre_parse.py	2001/11/02 13:59:51	1.49
--- sre_parse.py	2001/11/03 19:35:42	1.50
***************
*** 82,87 ****
          self.groups = gid + 1
          if name:
!             if self.groupdict.has_key(name):
!                 raise error, "can only use each group name once"
              self.groupdict[name] = gid
          self.open.append(gid)
--- 82,89 ----
          self.groups = gid + 1
          if name:
!             ogid = self.groupdict.get(name, None)
!             if ogid is not None:
!                 raise error, ("redefinition of group name %s as group %d; " +
!                               "was group %d") % (`name`, gid,  ogid)
              self.groupdict[name] = gid
          self.open.append(gid)