summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-11-25 03:16:09 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-11-25 03:16:09 (GMT)
commit5833c00427651c2b7d99c663da81df9418a6bc83 (patch)
tree99202667d55ee03e3cab14796a2a3a0b45fa1ce6 /Lib
parent799f81b14c554547eeb64bafc0019995b7f08b03 (diff)
parent4bcc796acc17f8ab7eeaa3f7faa6a61135b2c090 (diff)
downloadcpython-5833c00427651c2b7d99c663da81df9418a6bc83.zip
cpython-5833c00427651c2b7d99c663da81df9418a6bc83.tar.gz
cpython-5833c00427651c2b7d99c663da81df9418a6bc83.tar.bz2
#19620: merge with 3.3.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/lib2to3/pgen2/tokenize.py4
-rw-r--r--Lib/tokenize.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/lib2to3/pgen2/tokenize.py b/Lib/lib2to3/pgen2/tokenize.py
index 83656fc..b7c6461 100644
--- a/Lib/lib2to3/pgen2/tokenize.py
+++ b/Lib/lib2to3/pgen2/tokenize.py
@@ -252,7 +252,7 @@ def _get_normal_name(orig_enc):
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 untokenize(iterable):
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
index 91f8e47..f614aeb 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -333,7 +333,7 @@ def _get_normal_name(orig_enc):
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