[Python-checkins] python/dist/src/Lib sre_compile.py,1.49,1.49.6.1

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24226/Lib

Modified Files:
      Tag: release23-maint
	sre_compile.py 
Log Message:
Fix _sre.CODESIZE on 64-bit machines in UCS-4 mode. Fixes #931848.


Index: sre_compile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/sre_compile.py,v
retrieving revision 1.49
retrieving revision 1.49.6.1
diff -C2 -d -r1.49 -r1.49.6.1
*** sre_compile.py	2 Jul 2003 21:37:16 -0000	1.49
--- sre_compile.py	7 May 2004 07:16:32 -0000	1.49.6.1
***************
*** 309,320 ****
              data = data + _mk_bitmap(chunk)
      header = [block]
!     if MAXCODE == 65535:
          code = 'H'
      else:
!         code = 'L'
      # Convert block indices to byte array of 256 bytes
      mapping = array.array('b', mapping).tostring()
      # Convert byte array to word array
!     header = header + array.array(code, mapping).tolist()
      data[0:0] = header
      return [(BIGCHARSET, data)]
--- 309,322 ----
              data = data + _mk_bitmap(chunk)
      header = [block]
!     if _sre.CODESIZE == 2:
          code = 'H'
      else:
!         code = 'I'
      # Convert block indices to byte array of 256 bytes
      mapping = array.array('b', mapping).tostring()
      # Convert byte array to word array
!     mapping = array.array(code, mapping)
!     assert mapping.itemsize == _sre.CODESIZE
!     header = header + mapping.tolist()
      data[0:0] = header
      return [(BIGCHARSET, data)]