commit | 28479d8c7df55584ceb23041122cfbeb6073294e | [log] [tgz] |
---|---|---|
author | Zachary Ware <zachary.ware@gmail.com> | Fri Jan 31 12:06:48 2014 -0600 |
committer | Zachary Ware <zachary.ware@gmail.com> | Fri Jan 31 12:06:48 2014 -0600 |
tree | 164c14c20706c7dad04b8bb5b3b353d28b8b0f5a | |
parent | 607bc3dd8221664550941b611d56b3455d473368 [diff] | |
parent | a479b7505e88947dd8eff82b6bff604636287893 [diff] |
Issue #20460: Merge with 3.3
diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst index ee38e18..bf13eed 100644 --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst
@@ -515,7 +515,7 @@ ``None`` is returned. ``y`` (:class:`bytes`) [char \*] - This converts a C string to a Python :func:`bytes` object. If the C + This converts a C string to a Python :class:`bytes` object. If the C string pointer is *NULL*, ``None`` is returned. ``y#`` (:class:`bytes`) [char \*, int]