summaryrefslogtreecommitdiffstats
path: root/Doc/c-api
diff options
context:
space:
mode:
Diffstat (limited to 'Doc/c-api')
-rw-r--r--Doc/c-api/concrete.rst14
-rw-r--r--Doc/c-api/utilities.rst8
2 files changed, 11 insertions, 11 deletions
diff --git a/Doc/c-api/concrete.rst b/Doc/c-api/concrete.rst
index cc5c9d5..343223c 100644
--- a/Doc/c-api/concrete.rst
+++ b/Doc/c-api/concrete.rst
@@ -1259,7 +1259,7 @@ These are the UTF-8 codec APIs:
.. cfunction:: PyObject* PyUnicode_AsUTF8String(PyObject *unicode)
- Encode a Unicode objects using UTF-8 and return the result as Python string
+ Encode a Unicode object using UTF-8 and return the result as Python string
object. Error handling is "strict". Return *NULL* if an exception was raised
by the codec.
@@ -1411,7 +1411,7 @@ These are the "Unicode Escape" codec APIs:
.. cfunction:: PyObject* PyUnicode_AsUnicodeEscapeString(PyObject *unicode)
- Encode a Unicode objects using Unicode-Escape and return the result as Python
+ Encode a Unicode object using Unicode-Escape and return the result as Python
string object. Error handling is "strict". Return *NULL* if an exception was
raised by the codec.
@@ -1435,7 +1435,7 @@ These are the "Raw Unicode Escape" codec APIs:
.. cfunction:: PyObject* PyUnicode_AsRawUnicodeEscapeString(PyObject *unicode)
- Encode a Unicode objects using Raw-Unicode-Escape and return the result as
+ Encode a Unicode object using Raw-Unicode-Escape and return the result as
Python string object. Error handling is "strict". Return *NULL* if an exception
was raised by the codec.
@@ -1459,7 +1459,7 @@ ordinals and only these are accepted by the codecs during encoding.
.. cfunction:: PyObject* PyUnicode_AsLatin1String(PyObject *unicode)
- Encode a Unicode objects using Latin-1 and return the result as Python string
+ Encode a Unicode object using Latin-1 and return the result as Python string
object. Error handling is "strict". Return *NULL* if an exception was raised
by the codec.
@@ -1483,7 +1483,7 @@ codes generate errors.
.. cfunction:: PyObject* PyUnicode_AsASCIIString(PyObject *unicode)
- Encode a Unicode objects using ASCII and return the result as Python string
+ Encode a Unicode object using ASCII and return the result as Python string
object. Error handling is "strict". Return *NULL* if an exception was raised
by the codec.
@@ -1532,7 +1532,7 @@ characters to different code points.
.. cfunction:: PyObject* PyUnicode_AsCharmapString(PyObject *unicode, PyObject *mapping)
- Encode a Unicode objects using the given *mapping* object and return the result
+ Encode a Unicode object using the given *mapping* object and return the result
as Python string object. Error handling is "strict". Return *NULL* if an
exception was raised by the codec.
@@ -1582,7 +1582,7 @@ the user settings on the machine running the codec.
.. cfunction:: PyObject* PyUnicode_AsMBCSString(PyObject *unicode)
- Encode a Unicode objects using MBCS and return the result as Python string
+ Encode a Unicode object using MBCS and return the result as Python string
object. Error handling is "strict". Return *NULL* if an exception was raised
by the codec.
diff --git a/Doc/c-api/utilities.rst b/Doc/c-api/utilities.rst
index c30a62a..6138c63 100644
--- a/Doc/c-api/utilities.rst
+++ b/Doc/c-api/utilities.rst
@@ -201,12 +201,12 @@ Importing Modules
.. cfunction:: PyObject* PyImport_ImportModuleNoBlock(const char *name)
This version of :cfunc:`PyImport_ImportModule` does not block. It's intended
- to be used in C function which import other modules to execute a function.
+ to be used in C functions that import other modules to execute a function.
The import may block if another thread holds the import lock. The function
- :cfunc:`PyImport_ImportModuleNoBlock` doesn't block. It first tries to fetch
+ :cfunc:`PyImport_ImportModuleNoBlock` never blocks. It first tries to fetch
the module from sys.modules and falls back to :cfunc:`PyImport_ImportModule`
- unless the the lock is hold. In the latter case the function raises an
- ImportError.
+ unless the lock is held, in which case the function will raise an
+ :exc:`ImportError`.
.. cfunction:: PyObject* PyImport_ImportModuleEx(char *name, PyObject *globals, PyObject *locals, PyObject *fromlist)