mirror of
https://github.com/python/cpython.git
synced 2025-10-09 08:31:26 +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
|
@ -24,6 +24,9 @@ term = os.environ.get('TERM')
|
|||
if not term or term == 'unknown':
|
||||
raise TestSkipped, "$TERM=%r, calling initscr() may cause exit" % term
|
||||
|
||||
if sys.platform == "cygwin":
|
||||
raise TestSkipped("cygwin's curses mostly just hangs")
|
||||
|
||||
def window_funcs(stdscr):
|
||||
"Test the methods of windows"
|
||||
win = curses.newwin(10,10)
|
||||
|
@ -201,11 +204,13 @@ def module_funcs(stdscr):
|
|||
curses.has_key(13)
|
||||
|
||||
if hasattr(curses, 'getmouse'):
|
||||
curses.mousemask(curses.BUTTON1_PRESSED)
|
||||
curses.mouseinterval(10)
|
||||
# just verify these don't cause errors
|
||||
m = curses.getmouse()
|
||||
curses.ungetmouse(*m)
|
||||
(availmask, oldmask) = curses.mousemask(curses.BUTTON1_PRESSED)
|
||||
# availmask indicates that mouse stuff not available.
|
||||
if availmask != 0:
|
||||
curses.mouseinterval(10)
|
||||
# just verify these don't cause errors
|
||||
m = curses.getmouse()
|
||||
curses.ungetmouse(*m)
|
||||
|
||||
def unit_tests():
|
||||
from curses import ascii
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue