summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 22:36:38 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-03-11 22:36:38 (GMT)
commit8b53559a899e269aed6014eaaad545567c06b77e (patch)
treef85f02115f84d0cb1af9877cd90a45f1e1d1b010 /Lib/tkinter
parent16b5c13668b0fe0ecb2265b6d6968d3da5ca10ba (diff)
parent0f84764a09401bb93f544141a433db5acd751dd2 (diff)
downloadcpython-8b53559a899e269aed6014eaaad545567c06b77e.zip
cpython-8b53559a899e269aed6014eaaad545567c06b77e.tar.gz
cpython-8b53559a899e269aed6014eaaad545567c06b77e.tar.bz2
Merge with 3.3, issue #17047: remove doubled words added in 3.3,
as reported by Serhiy Storchaka and Matthew Barnett.
Diffstat (limited to 'Lib/tkinter')
-rw-r--r--Lib/tkinter/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index b261144..f78d24d 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -3113,7 +3113,7 @@ class Text(Widget, XView, YView):
def peer_create(self, newPathName, cnf={}, **kw): # new in Tk 8.5
"""Creates a peer text widget with the given newPathName, and any
optional standard configuration options. By default the peer will
- have the same start and and end line as the parent widget, but
+ have the same start and end line as the parent widget, but
these can be overriden with the standard configuration options."""
self.tk.call(self._w, 'peer', 'create', newPathName,
*self._options(cnf, kw))