[Python-checkins] CVS: python/dist/src/Objects object.c,2.133,2.134 stringobject.c,2.120,2.121 unicodeobject.c,2.104,2.105

[Jeremy Hylton]

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

Modified Files:
	object.c stringobject.c unicodeobject.c 
Log Message:
Add _PyUnicode_AsDefaultEncodedString to unicodeobject.h.

And remove all the extern decls in the middle of .c files.
Apparently, it was excluded from the header file because it is
intended for internal use by the interpreter.  It's still intended for
internal use and documented as such in the header file.



Index: object.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
retrieving revision 2.133
retrieving revision 2.134
diff -C2 -d -r2.133 -r2.134
*** object.c	2001/07/14 17:58:00	2.133
--- object.c	2001/07/30 22:34:24	2.134
***************
*** 1057,1065 ****
  }
  
- /* Internal API needed by PyObject_GetAttr(): */
- extern 
- PyObject *_PyUnicode_AsDefaultEncodedString(PyObject *unicode,
- 				  const char *errors);
- 
  PyObject *
  PyObject_GetAttr(PyObject *v, PyObject *name)
--- 1057,1060 ----

Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.120
retrieving revision 2.121
diff -C2 -d -r2.120 -r2.121
*** stringobject.c	2001/06/16 05:42:57	2.120
--- stringobject.c	2001/07/30 22:34:24	2.121
***************
*** 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.104
retrieving revision 2.105
diff -C2 -d -r2.104 -r2.105
*** unicodeobject.c	2001/07/25 16:05:59	2.104
--- unicodeobject.c	2001/07/30 22:34:24	2.105
***************
*** 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 ----