summaryrefslogtreecommitdiff
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-08-17 16:13:22 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2013-08-17 16:13:22 +0300
commit8ae554e02011fa61fe225bea4ab78dfac77c28ab (patch)
tree184e72cba7114234d55bfef00f96aceb44b53268 /Lib/idlelib
parentd1f44be1d8b6e155555e318165b59709e21a0938 (diff)
parentdffd84e2ad12d684d6600fdfe33a8083ac25bdc5 (diff)
downloadcpython-8ae554e02011fa61fe225bea4ab78dfac77c28ab.tar.gz
#18741: merge with 3.3.
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/idle_test/mock_tk.py8
-rw-r--r--Lib/idlelib/idle_test/test_formatparagraph.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/Lib/idlelib/idle_test/mock_tk.py b/Lib/idlelib/idle_test/mock_tk.py
index 3f6c579c3c..762bbc905d 100644
--- a/Lib/idlelib/idle_test/mock_tk.py
+++ b/Lib/idlelib/idle_test/mock_tk.py
@@ -35,7 +35,7 @@ class Mbox:
"""Mock for tkinter.messagebox with an Mbox_func for each function.
This module was 'tkMessageBox' in 2.x; hence the 'import as' in 3.x.
- Example usage in test_module.py for testing functios in module.py:
+ Example usage in test_module.py for testing functions in module.py:
---
from idlelib.idle_test.mock_tk import Mbox
import module
@@ -98,7 +98,7 @@ class Text:
This implements .index without converting the result back to a string.
The result is contrained by the number of lines and linelengths of
- self.data. For many indexes, the result is initally (1, 0).
+ self.data. For many indexes, the result is initially (1, 0).
The input index may have any of several possible forms:
* line.char float: converted to 'line.char' string;
@@ -149,7 +149,7 @@ class Text:
-1: position before terminal \n; for .insert(), .delete
0: position after terminal \n; for .get, .delete index 1
- 1: same viewed as begininning of non-existent next line (for .index)
+ 1: same viewed as beginning of non-existent next line (for .index)
'''
n = len(self.data)
if endflag == 1:
@@ -271,7 +271,7 @@ class Text:
"Scroll screen to make the character at INDEX is visible."
pass
- # The following is a Misc method inheritet by Text.
+ # The following is a Misc method inherited by Text.
# It should properly go in a Misc mock, but is included here for now.
def bind(sequence=None, func=None, add=None):
diff --git a/Lib/idlelib/idle_test/test_formatparagraph.py b/Lib/idlelib/idle_test/test_formatparagraph.py
index 2ec8232335..818c9d4b67 100644
--- a/Lib/idlelib/idle_test/test_formatparagraph.py
+++ b/Lib/idlelib/idle_test/test_formatparagraph.py
@@ -244,7 +244,7 @@ class FormatEventTest(unittest.TestCase):
"""Test the formatting of text inside a Text widget.
This is done with FormatParagraph.format.paragraph_event,
- which calls funtions in the module as appropriate.
+ which calls functions in the module as appropriate.
"""
test_string = (
" '''this is a test of a reformat for a triple "