diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/howto/unicode.rst | 2 | ||||
| -rw-r--r-- | Doc/library/curses.rst | 2 | ||||
| -rw-r--r-- | Doc/library/datetime.rst | 2 | ||||
| -rw-r--r-- | Doc/library/nntplib.rst | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst index 2920aa1..9d48a78 100644 --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -514,7 +514,7 @@ columns and can return Unicode values from an SQL query. Unicode data is usually converted to a particular encoding before it gets written to disk or sent over a socket. It's possible to do all the work -yourself: open a file, read an 8-bit bytes object from it, and convert the string +yourself: open a file, read an 8-bit bytes object from it, and convert the bytes with ``bytes.decode(encoding)``. However, the manual approach is not recommended. One problem is the multi-byte nature of encodings; one Unicode character can be diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst index cd1915d..314636e 100644 --- a/Doc/library/curses.rst +++ b/Doc/library/curses.rst @@ -377,7 +377,7 @@ The module :mod:`curses` defines the following functions: is to be displayed. -.. function:: newwin(begin_y, begin_x) +.. function:: newwin(nlines, ncols) newwin(nlines, ncols, begin_y, begin_x) Return a new window, whose left-upper corner is at ``(begin_y, begin_x)``, and diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index f9d6918..e4f1eb2 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -1898,7 +1898,7 @@ Notes: making assumptions about the output value. Field orderings will vary (for example, "month/day/year" versus "day/month/year"), and the output may contain Unicode characters encoded using the locale's default encoding (for - example, if the current locale is ``js_JP``, the default encoding could be + example, if the current locale is ``ja_JP``, the default encoding could be any one of ``eucJP``, ``SJIS``, or ``utf-8``; use :meth:`locale.getlocale` to determine the current locale's encoding). diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst index 73b51c0..9ab2c94 100644 --- a/Doc/library/nntplib.rst +++ b/Doc/library/nntplib.rst @@ -394,18 +394,18 @@ tuples or objects that the method normally returns will be empty. .. method:: NNTP.next() - Send a ``NEXT`` command. Return as for :meth:`stat`. + Send a ``NEXT`` command. Return as for :meth:`.stat`. .. method:: NNTP.last() - Send a ``LAST`` command. Return as for :meth:`stat`. + Send a ``LAST`` command. Return as for :meth:`.stat`. .. method:: NNTP.article(message_spec=None, *, file=None) Send an ``ARTICLE`` command, where *message_spec* has the same meaning as - for :meth:`stat`. Return a tuple ``(response, info)`` where *info* + for :meth:`.stat`. Return a tuple ``(response, info)`` where *info* is a :class:`~collections.namedtuple` with three attributes *number*, *message_id* and *lines* (in that order). *number* is the article number in the group (or 0 if the information is not available), *message_id* the |