Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv30149/Modules
Modified Files:
_sre.c
Log Message:
fix for SF #635398 (don't "downcast" return strings from unicode to ascii)
Index: _sre.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_sre.c,v
retrieving revision 2.86
retrieving revision 2.87
diff -C2 -d -r2.86 -r2.87
*** _sre.c 10 Nov 2002 14:33:25 -0000 2.86
--- _sre.c 22 Nov 2002 12:46:35 -0000 2.87
***************
*** 7,41 ****
* 1999-10-24 fl created (based on existing template matcher code)
* 2000-03-06 fl first alpha, sort of
- * 2000-06-30 fl added fast search optimization
- * 2000-06-30 fl added assert (lookahead) primitives, etc
- * 2000-07-02 fl added charset optimizations, etc
- * 2000-07-03 fl store code in pattern object, lookbehind, etc
- * 2000-07-08 fl added regs attribute
- * 2000-07-21 fl reset lastindex in scanner methods
* 2000-08-01 fl fixes for 1.6b1
- * 2000-08-03 fl added recursion limit
* 2000-08-07 fl use PyOS_CheckStack() if available
- * 2000-08-08 fl changed findall to return empty strings instead of None
- * 2000-08-27 fl properly propagate memory errors
- * 2000-09-02 fl return -1 instead of None for start/end/span
* 2000-09-20 fl added expand method
- * 2000-09-21 fl don't use the buffer interface for unicode strings
- * 2000-10-03 fl fixed assert_not primitive; support keyword arguments
- * 2000-10-24 fl really fixed assert_not; reset groups in findall
- * 2000-12-21 fl fixed memory leak in groupdict
- * 2001-01-02 fl properly reset pointer after failed assertion in MIN_UNTIL
- * 2001-01-15 fl avoid recursion for MIN_UNTIL; fixed uppercase literal bug
- * 2001-01-16 fl fixed memory leak in pattern destructor
* 2001-03-20 fl lots of fixes for 2.1b2
* 2001-04-15 fl export copyright as Python attribute, not global
* 2001-04-28 fl added __copy__ methods (work in progress)
! * 2001-05-14 fl fixes for 1.5.2
* 2001-07-01 fl added BIGCHARSET support (from Martin von Loewis)
* 2001-10-18 fl fixed group reset issue (from Matthew Mueller)
* 2001-10-20 fl added split primitive; reenable unicode for 1.6/2.0/2.1
* 2001-10-21 fl added sub/subn primitive
- * 2001-10-22 fl check for literal sub/subn templates
* 2001-10-24 fl added finditer primitive (for 2.2 only)
* 2001-12-07 fl fixed memory leak in sub/subn (Guido van Rossum)
*
* Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved.
--- 7,24 ----
* 1999-10-24 fl created (based on existing template matcher code)
* 2000-03-06 fl first alpha, sort of
* 2000-08-01 fl fixes for 1.6b1
* 2000-08-07 fl use PyOS_CheckStack() if available
* 2000-09-20 fl added expand method
* 2001-03-20 fl lots of fixes for 2.1b2
* 2001-04-15 fl export copyright as Python attribute, not global
* 2001-04-28 fl added __copy__ methods (work in progress)
! * 2001-05-14 fl fixes for 1.5.2 compatibility
* 2001-07-01 fl added BIGCHARSET support (from Martin von Loewis)
* 2001-10-18 fl fixed group reset issue (from Matthew Mueller)
* 2001-10-20 fl added split primitive; reenable unicode for 1.6/2.0/2.1
* 2001-10-21 fl added sub/subn primitive
* 2001-10-24 fl added finditer primitive (for 2.2 only)
* 2001-12-07 fl fixed memory leak in sub/subn (Guido van Rossum)
+ * 2002-11-09 fl fixed empty sub/subn return type
*
* Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved.
***************
*** 53,57 ****
static char copyright[] =
! " SRE 2.2.1 Copyright (c) 1997-2001 by Secret Labs AB ";
#include "Python.h"
--- 36,40 ----
static char copyright[] =
! " SRE 2.2.2 Copyright (c) 1997-2002 by Secret Labs AB ";
#include "Python.h"
***************
*** 1802,1806 ****
case 0:
Py_DECREF(list);
! return PyString_FromString("");
case 1:
result = PyList_GET_ITEM(list, 0);
--- 1785,1789 ----
case 0:
Py_DECREF(list);
! return PySequence_GetSlice(pattern, 0, 0);
case 1:
result = PyList_GET_ITEM(list, 0);
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4