[Python-checkins] CVS: python/dist/src/Lib sre_compile.py,1.16,1.17 sre_parse.py,1.16,1.17

Fredrik Lundh python-dev@python.org
Fri, 30 Jun 2000 11:39:23 -0700


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

Modified Files:
	sre_compile.py sre_parse.py 
Log Message:


- reverted to "\x is binary byte"

- removed evil tabs from sre_parse and sre_compile

Index: sre_compile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/sre_compile.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** sre_compile.py	2000/06/30 13:55:14	1.16
--- sre_compile.py	2000/06/30 18:39:20	1.17
***************
*** 40,44 ****
              else:
                  emit(OPCODES[op])
! 		fixup = lambda x: x
              skip = len(code); emit(0)
              for op, av in av:
--- 40,44 ----
              else:
                  emit(OPCODES[op])
!                 fixup = lambda x: x
              skip = len(code); emit(0)
              for op, av in av:

Index: sre_parse.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/sre_parse.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** sre_parse.py	2000/06/30 13:55:14	1.16
--- sre_parse.py	2000/06/30 18:39:20	1.17
***************
*** 20,25 ****
  MAXREPEAT = 32767
  
! # FIXME: same here
! CHARMASK = 0x7fff
  
  SPECIAL_CHARS = ".\\[{()*+?^$|"
--- 20,26 ----
  MAXREPEAT = 32767
  
! # FIXME: might change in 2.0 final.  but for now, this seems
! # to be the best way to be compatible with 1.5.2
! CHARMASK = 0xff
  
  SPECIAL_CHARS = ".\\[{()*+?^$|"
***************
*** 617,623 ****
      sep = match.string[:0]
      if type(sep) is type(""):
! 	char = chr
      else:
! 	char = unichr
      for c, s in template:
          if c is LITERAL:
--- 618,624 ----
      sep = match.string[:0]
      if type(sep) is type(""):
!         char = chr
      else:
!         char = unichr
      for c, s in template:
          if c is LITERAL: