Anonymous avatar Anonymous committed e89a6e0

Port rev. 56754, 56755.

Comments (0)

Files changed (2)

Doc-3k/c-api/concrete.rst

    is *NULL*.
 
 
-.. cfunction:: PyObject* PyUnicode_FromString(const char *u)
-
-   Create a Unicode Object from the char buffer *u*. *u* must be 0-terminated, the
-   bytes will be interpreted as being latin-1 encoded. *u* may also be *NULL* which
+.. cfunction:: PyObject* PyUnicode_FromStringAndSize(const char *u, Py_ssize_t size)
+
+   Create a Unicode Object from the char buffer *u*.  The bytes will be interpreted
+   as being UTF-8 encoded.  *u* may also be *NULL* which
    causes the contents to be undefined. It is the user's responsibility to fill in
    the needed data.  The buffer is copied into the new object. If the buffer is not
    *NULL*, the return value might be a shared object. Therefore, modification of
    .. versionadded:: 3.0
 
 
+.. cfunction:: PyObject *PyUnicode_FromString(const char *u)
+
+   Create a Unicode object from an UTF-8 encoded null-terminated char buffer
+   *u*.
+
+   .. versionadded:: 3.0
+
+
 .. cfunction:: PyObject* PyUnicode_FromFormat(const char *format, ...)
 
    Take a C :cfunc:`printf`\ -style *format* string and a variable number of

Doc-3k/library/bsddb.rst

    Consult the Berkeley DB documentation for their use and interpretation.
 
 
+.. class:: StringKeys(db)
+
+   Wrapper class around a DB object that supports string keys (rather than bytes).
+   All keys are encoded as UTF-8, then passed to the underlying object.
+   
+   .. versionadded:: 3.0
+
+
+.. class:: StringValues(db)
+
+   Wrapper class around a DB object that supports string values (rather than bytes).
+   All values are encoded as UTF-8, then passed to the underlying object.
+
+   .. versionadded:: 3.0
+
+
 .. seealso::
 
    Module :mod:`dbhash`
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.