[Python-checkins] cpython (merge 3.3 -> default): #19620: merge with 3.3.
ezio.melotti
python-checkins at python.org
Mon Nov 25 04:16:30 CET 2013
http://hg.python.org/cpython/rev/0d5da548b80a
changeset: 87531:0d5da548b80a
parent: 87528:d4ad2b523770
parent: 87530:3f99564b712e
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Mon Nov 25 05:16:09 2013 +0200
summary:
#19620: merge with 3.3.
files:
Lib/lib2to3/pgen2/tokenize.py | 4 ++--
Lib/tokenize.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Lib/lib2to3/pgen2/tokenize.py b/Lib/lib2to3/pgen2/tokenize.py
--- a/Lib/lib2to3/pgen2/tokenize.py
+++ b/Lib/lib2to3/pgen2/tokenize.py
@@ -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
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list