[Python-checkins] cpython (merge 2.6 -> 2.7): 2.6 merge

[barry.warsaw]

http://hg.python.org/cpython/rev/32de3923bb94
changeset:   85915:32de3923bb94
branch:      2.7
parent:      85906:70850d6a16ee
parent:      85914:6d7ae764b4f2
user:        Barry Warsaw <barry at python.org>
date:        Tue Oct 01 11:39:08 2013 -0400
summary:
  2.6 merge

files:
  Lib/nntplib.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/nntplib.py b/Lib/nntplib.py
--- a/Lib/nntplib.py
+++ b/Lib/nntplib.py
@@ -38,7 +38,7 @@
            "error_data",]
 
 # 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