[Python-3000-checkins] r58677 - in python/branches/py3k: Doc/c-api/concrete.rst Include/stringobject.h

[guido.van.rossum]

Author: guido.van.rossum
Date: Fri Oct 26 21:34:40 2007
New Revision: 58677

Modified:
   python/branches/py3k/Doc/c-api/concrete.rst
   python/branches/py3k/Include/stringobject.h
Log:
Kill PyString_Encode(), which isn't used anywhere.
(We should also kill the other PyString_ encode/decode APIs, but they
still have some users.)


Modified: python/branches/py3k/Doc/c-api/concrete.rst
==============================================================================
--- python/branches/py3k/Doc/c-api/concrete.rst (original)
+++ python/branches/py3k/Doc/c-api/concrete.rst Fri Oct 26 21:34:40 2007
@@ -874,15 +874,6 @@
    if an exception was raised by the codec.
 
 
-.. cfunction:: PyObject* PyString_Encode(const char *s, Py_ssize_t size, const 
char *encoding, const char *errors)
-
-   Encode the :ctype:`char` buffer of the given size by passing it to the codec
-   registered for *encoding* and return a Python object. *encoding* and 
*errors*
-   have the same meaning as the parameters of the same name in the string
-   :meth:`encode` method. The codec to be used is looked up using the Python 
codec
-   registry.  Return *NULL* if an exception was raised by the codec.
-
-
 .. cfunction:: PyObject* PyString_AsEncodedObject(PyObject *str, const char 
*encoding, const char *errors)
 
    Encode a string object using the codec registered for *encoding* and return 
the

Modified: python/branches/py3k/Include/stringobject.h
==============================================================================
--- python/branches/py3k/Include/stringobject.h (original)
+++ python/branches/py3k/Include/stringobject.h Fri Oct 26 21:34:40 2007
@@ -70,7 +70,7 @@
 PyAPI_FUNC(PyObject *) PyString_Format(PyObject *, PyObject *);
 PyAPI_FUNC(PyObject *) _PyString_FormatLong(PyObject*, int, int,
                                                  int, char**, int*);
-PyAPI_FUNC(PyObject *) PyString_DecodeEscape(const char *, Py_ssize_t, 
+PyAPI_FUNC(PyObject *) PyString_DecodeEscape(const char *, Py_ssize_t,
                                                   const char *, Py_ssize_t,
                                                   const char *);
 
@@ -102,17 +102,7 @@
     const char *errors          /* error handling */
     );
 
-/* Encodes a char buffer of the given size and returns a 
-   Python object. */
-
-PyAPI_FUNC(PyObject*) PyString_Encode(
-    const char *s,              /* string char buffer */
-    Py_ssize_t size,            /* number of chars to encode */
-    const char *encoding,       /* encoding */
-    const char *errors          /* error handling */
-    );
-
-/* Encodes a string object and returns the result as Python 
+/* Encodes a string object and returns the result as Python
    object. */
 
 PyAPI_FUNC(PyObject*) PyString_AsEncodedObject(
@@ -122,8 +112,8 @@
     );
 
 /* Encodes a string object and returns the result as Python string
-   object.   
-   
+   object.
+
    If the codec returns an Unicode object, the object is converted
    back to a string using the default encoding.
 
@@ -135,7 +125,7 @@
     const char *errors         /* error handling */
     );
 
-/* Decodes a string object and returns the result as Python 
+/* Decodes a string object and returns the result as Python
    object. */
 
 PyAPI_FUNC(PyObject*) PyString_AsDecodedObject(
@@ -145,8 +135,8 @@
     );
 
 /* Decodes a string object and returns the result as Python string
-   object.  
-   
+   object.
+
    If the codec returns an Unicode object, the object is converted
    back to a string using the default encoding.
 
@@ -171,7 +161,7 @@
                                   (only possible for 0-terminated
                                   strings) */
     );
-    
+
 
 #ifdef __cplusplus
 }
_______________________________________________
Python-3000-checkins mailing list
Python-3000-checkins@python.org
http://mail.python.org/mailman/listinfo/python-3000-checkins