mirror of
https://github.com/python/cpython.git
synced 2025-11-01 02:38:53 +00:00
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.
This commit is contained in:
parent
9ada3d6e29
commit
49fd7fa443
640 changed files with 52240 additions and 18408 deletions
|
|
@ -449,18 +449,15 @@ class Misc:
|
|||
# I'd rather use time.sleep(ms*0.001)
|
||||
self.tk.call('after', ms)
|
||||
else:
|
||||
# XXX Disgusting hack to clean up after calling func
|
||||
tmp = []
|
||||
def callit(func=func, args=args, self=self, tmp=tmp):
|
||||
def callit():
|
||||
try:
|
||||
func(*args)
|
||||
finally:
|
||||
try:
|
||||
self.deletecommand(tmp[0])
|
||||
self.deletecommand(name)
|
||||
except TclError:
|
||||
pass
|
||||
name = self._register(callit)
|
||||
tmp.append(name)
|
||||
return self.tk.call('after', ms, name)
|
||||
def after_idle(self, func, *args):
|
||||
"""Call FUNC once if the Tcl main loop has no event to
|
||||
|
|
@ -486,7 +483,24 @@ class Misc:
|
|||
def bell(self, displayof=0):
|
||||
"""Ring a display's bell."""
|
||||
self.tk.call(('bell',) + self._displayof(displayof))
|
||||
|
||||
# Clipboard handling:
|
||||
def clipboard_get(self, **kw):
|
||||
"""Retrieve data from the clipboard on window's display.
|
||||
|
||||
The window keyword defaults to the root window of the Tkinter
|
||||
application.
|
||||
|
||||
The type keyword specifies the form in which the data is
|
||||
to be returned and should be an atom name such as STRING
|
||||
or FILE_NAME. Type defaults to STRING.
|
||||
|
||||
This command is equivalent to:
|
||||
|
||||
selection_get(CLIPBOARD)
|
||||
"""
|
||||
return self.tk.call(('clipboard', 'get') + self._options(kw))
|
||||
|
||||
def clipboard_clear(self, **kw):
|
||||
"""Clear the data in the Tk clipboard.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue