Mercurial > cpython-lru_cache-weakref

changeset 87531:0d5da548b80a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#19620: merge with 3.3.
author Ezio Melotti <ezio.melotti@gmail.com>
date Mon, 25 Nov 2013 05:16:09 +0200
parents d4ad2b523770 (current diff) 3f99564b712e (diff)
children b2e917a6eb7b
files Lib/tokenize.py
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Lib/lib2to3/pgen2/tokenize.py	Sun Nov 24 14:53:54 2013 -0800
+++ b/Lib/lib2to3/pgen2/tokenize.py	Mon Nov 25 05:16:09 2013 +0200
@@ -252,7 +252,7 @@
 def detect_encoding(readline):
     """
     The detect_encoding() function is used to detect the encoding that should
-    be used to decode a Python source file. It requires one argment, readline,
+    be used to decode a Python source file. It requires one argument, readline,
     in the same way as the tokenize() generator.
 
     It will call readline a maximum of twice, and return the encoding used
@@ -343,7 +343,7 @@
 
 def generate_tokens(readline):
     """
-    The generate_tokens() generator requires one argment, readline, which
+    The generate_tokens() generator requires one argument, readline, which
     must be a callable object which provides the same interface as the
     readline() method of built-in file objects. Each call to the function
     should return one line of input as a string.  Alternately, readline
--- a/Lib/tokenize.py	Sun Nov 24 14:53:54 2013 -0800
+++ b/Lib/tokenize.py	Mon Nov 25 05:16:09 2013 +0200
@@ -333,7 +333,7 @@
 def detect_encoding(readline):
     """
     The detect_encoding() function is used to detect the encoding that should
-    be used to decode a Python source file.  It requires one argment, readline,
+    be used to decode a Python source file.  It requires one argument, readline,
     in the same way as the tokenize() generator.
 
     It will call readline a maximum of twice, and return the encoding used