[Python-checkins] CVS: python/dist/src/Objects object.c,2.124.4.24,2.124.4.25 stringobject.c,2.103.2.7,2.103.2.8 unicodeobject.c,2.87.2.7,2.87.2.8

[Tim Peters]

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

Modified Files:
      Tag: descr-branch
	object.c stringobject.c unicodeobject.c 
Log Message:
Mrege of trunk tag delta date2001-07-30 to date2001-08-01.


Index: object.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
retrieving revision 2.124.4.24
retrieving revision 2.124.4.25
diff -C2 -d -r2.124.4.24 -r2.124.4.25
*** object.c	2001/07/13 21:47:38	2.124.4.24
--- object.c	2001/08/02 02:40:43	2.124.4.25
***************
*** 1025,1033 ****
  }
  
- /* Internal API needed by PyObject_GetAttr(): */
- extern 
- PyObject *_PyUnicode_AsDefaultEncodedString(PyObject *unicode,
- 				  const char *errors);
- 
  PyObject *
  PyObject_GetAttr(PyObject *v, PyObject *name)
--- 1025,1028 ----

Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.103.2.7
retrieving revision 2.103.2.8
diff -C2 -d -r2.103.2.7 -r2.103.2.8
*** stringobject.c	2001/07/07 22:55:30	2.103.2.7
--- stringobject.c	2001/08/02 02:40:43	2.103.2.8
***************
*** 334,342 ****
  }
  
- /* Internal API needed by PyString_AsStringAndSize(): */
- extern
- PyObject *_PyUnicode_AsDefaultEncodedString(PyObject *unicode,
- 					    const char *errors);
- 
  int
  PyString_AsStringAndSize(register PyObject *obj,
--- 334,337 ----

Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.87.2.7
retrieving revision 2.87.2.8
diff -C2 -d -r2.87.2.7 -r2.87.2.8
*** unicodeobject.c	2001/07/28 05:02:59	2.87.2.7
--- unicodeobject.c	2001/08/02 02:40:43	2.87.2.8
***************
*** 567,584 ****
  }
  
- /* Return a Python string holding the default encoded value of the
-    Unicode object. 
- 
-    The resulting string is cached in the Unicode object for subsequent
-    usage by this function. The cached version is needed to implement
-    the character buffer interface and will live (at least) as long as
-    the Unicode object itself.
- 
-    The refcount of the string is *not* incremented.
- 
-    *** Exported for internal use by the interpreter only !!! ***
- 
- */
- 
  PyObject *_PyUnicode_AsDefaultEncodedString(PyObject *unicode,
  					    const char *errors)
--- 567,570 ----