[Python-checkins] cpython (merge 3.4 -> default): Issues #21948 and #16040: Merge with 3.4.

[berker.peksag]

http://hg.python.org/cpython/rev/051cc4f60384
changeset:   91621:051cc4f60384
parent:      91618:486c1a81ee32
parent:      91620:5be778fec115
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Wed Jul 09 20:16:23 2014 +0300
summary:
  Issues #21948 and #16040: Merge with 3.4.

files:
  Doc/library/hmac.rst |  2 +-
  Lib/nntplib.py       |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/hmac.rst b/Doc/library/hmac.rst
--- a/Doc/library/hmac.rst
+++ b/Doc/library/hmac.rst
@@ -25,7 +25,7 @@
    .. 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
--- a/Lib/nntplib.py
+++ b/Lib/nntplib.py
@@ -86,7 +86,7 @@
            ]
 
 # 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

-- 
Repository URL: http://hg.python.org/cpython