diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-07-09 20:16:23 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2014-07-09 20:16:23 +0300 |
| commit | 0be663062ade859fafdef448c1f0c70005e1eb17 (patch) | |
| tree | f4cf695ba893747226df5d3b9188f5ebdbd6ed8a | |
| parent | e4857f35285f15a80313bce7c0618cd3bad360d0 (diff) | |
| parent | 740c730086a82f95361f705e7445fe3767d137e3 (diff) | |
| download | cpython-git-0be663062ade859fafdef448c1f0c70005e1eb17.tar.gz | |
Issues #21948 and #16040: Merge with 3.4.
| -rw-r--r-- | Doc/library/hmac.rst | 2 | ||||
| -rw-r--r-- | Lib/nntplib.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/hmac.rst b/Doc/library/hmac.rst index 4858235107..b2e377f5eb 100644 --- a/Doc/library/hmac.rst +++ b/Doc/library/hmac.rst @@ -25,7 +25,7 @@ This module implements the HMAC algorithm as described by :rfc:`2104`. .. versionchanged:: 3.4 Parameter *key* can be a bytes or bytearray object. Parameter *msg* can be of any type supported by :mod:`hashlib`. - Paramter *digestmod* can be the name of a hash algorithm. + Parameter *digestmod* can be the name of a hash algorithm. .. deprecated:: 3.4 MD5 as implicit default digest for *digestmod* is deprecated. diff --git a/Lib/nntplib.py b/Lib/nntplib.py index e2c6579b67..4ded78a9e8 100644 --- a/Lib/nntplib.py +++ b/Lib/nntplib.py @@ -86,7 +86,7 @@ __all__ = ["NNTP", ] # maximal line length when calling readline(). This is to prevent -# reading arbitrary lenght lines. RFC 3977 limits NNTP line length to +# reading arbitrary length lines. RFC 3977 limits NNTP line length to # 512 characters, including CRLF. We have selected 2048 just to be on # the safe side. _MAXLINE = 2048 |