diff options
Diffstat (limited to 'Doc/c-api')
| -rw-r--r-- | Doc/c-api/buffer.rst | 2 | ||||
| -rw-r--r-- | Doc/c-api/import.rst | 2 | ||||
| -rw-r--r-- | Doc/c-api/unicode.rst | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst index 3f13e74..4824358 100644 --- a/Doc/c-api/buffer.rst +++ b/Doc/c-api/buffer.rst @@ -31,7 +31,7 @@ interface can be written to a file. There are a number of format codes to returning data from the target object. Starting from version 1.6, Python has been providing Python-level buffer -objects and a C-level buffer API so that any builtin or used-defined type can +objects and a C-level buffer API so that any built-in or used-defined type can expose its characteristics. Both, however, have been deprecated because of various shortcomings, and have been officially removed in Python 3.0 in favour of a new C-level buffer API and a new Python-level object named diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst index 581d396..2025ba1 100644 --- a/Doc/c-api/import.rst +++ b/Doc/c-api/import.rst @@ -167,7 +167,7 @@ Importing Modules *path*, possibly by fetching it from the :data:`sys.path_importer_cache` dict. If it wasn't yet cached, traverse :data:`sys.path_hooks` until a hook is found that can handle the path item. Return ``None`` if no hook could; - this tells our caller it should fall back to the builtin import mechanism. + this tells our caller it should fall back to the built-in import mechanism. Cache the result in :data:`sys.path_importer_cache`. Return a new reference to the importer object. diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index b603734..1249ed7 100644 --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -292,12 +292,12 @@ the system's :ctype:`wchar_t`. Built-in Codecs ^^^^^^^^^^^^^^^ -Python provides a set of builtin codecs which are written in C for speed. All of +Python provides a set of built-in codecs which are written in C for speed. All of these codecs are directly usable via the following functions. Many of the following APIs take two arguments encoding and errors. These parameters encoding and errors have the same semantics as the ones of the -builtin unicode() Unicode object constructor. +built-in :func:`unicode` Unicode object constructor. Setting encoding to *NULL* causes the default encoding to be used which is ASCII. The file system calls should use :cdata:`Py_FileSystemDefaultEncoding` @@ -307,7 +307,7 @@ at run-time (such as when the application invokes setlocale). Error handling is set by errors which may also be set to *NULL* meaning to use the default handling defined for the codec. Default error handling for all -builtin codecs is "strict" (:exc:`ValueError` is raised). +built-in codecs is "strict" (:exc:`ValueError` is raised). The codecs all use a similar interface. Only deviation from the following generic ones are documented for simplicity. @@ -321,7 +321,7 @@ These are the generic codec APIs: Create a Unicode object by decoding *size* bytes of the encoded string *s*. *encoding* and *errors* have the same meaning as the parameters of the same name - in the :func:`unicode` builtin function. The codec to be used is looked up + in the :func:`unicode` built-in function. The codec to be used is looked up using the Python codec registry. Return *NULL* if an exception was raised by the codec. |