[Python-checkins] python/dist/src/Lib sre_compile.py,1.54,1.55

Fri May 7 03:18:15 EDT 2004

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24486/Lib
Modified Files:
	sre_compile.py 
Log Message:
Fix _sre.CODESIZE on 64-bit machines in UCS-4 mode. Fixes #931848.
Backported to 2.3.
Index: sre_compile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/sre_compile.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** sre_compile.py	27 Mar 2004 09:24:36 -0000	1.54
--- sre_compile.py	7 May 2004 07:18:12 -0000	1.55
***************
*** 334,345 ****
 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)]
--- 334,347 ----
 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)]