[Python-checkins] CVS: python/dist/src/Objects unicodeobject.c,2.119,2.119.2.1

Barry Warsaw bwarsaw@users.sourceforge.net
Fri, 19 Oct 2001 08:04:38 -0700


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

Modified Files:
      Tag: r22b1-branch
	unicodeobject.c 
Log Message:
Merging MAL's trunk changes into the branch:

    Additional test and documentation for the unicode() changes.

    This patch should also be applied to the 2.2b1 trunk.


Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.119
retrieving revision 2.119.2.1
diff -C2 -d -r2.119 -r2.119.2.1
*** unicodeobject.c	2001/10/19 02:01:31	2.119
--- unicodeobject.c	2001/10/19 15:04:36	2.119.2.1
***************
*** 427,432 ****
  #if 0
      /* For b/w compatibility we also accept Unicode objects provided
!        that no encodings is given and then redirect to PyObject_Unicode() 
!        which then applies the additional logic for Unicode subclasses.
  
         NOTE: This API should really only be used for object which
--- 427,433 ----
  #if 0
      /* For b/w compatibility we also accept Unicode objects provided
!        that no encodings is given and then redirect to
!        PyObject_Unicode() which then applies the additional logic for
!        Unicode subclasses.
  
         NOTE: This API should really only be used for object which