Merged revisions 73462-73463 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73462 | georg.brandl | 2009-06-17 11:36:21 +0200 (Mi, 17 Jun 2009) | 1 line

  #6295: clarify blocking behavior of getch().
........
  r73463 | georg.brandl | 2009-06-17 11:43:31 +0200 (Mi, 17 Jun 2009) | 1 line

  #6255: document PyInt_FromSize_t.
........
This commit is contained in:
Georg Brandl 2009-06-17 10:03:58 +00:00
parent 5bc472a9a4
commit e810e5a03d

View file

@ -793,7 +793,8 @@ the following methods:
Get a character. Note that the integer returned does *not* have to be in ASCII
range: function keys, keypad keys and so on return numbers higher than 256. In
no-delay mode, -1 is returned if there is no input.
no-delay mode, -1 is returned if there is no input, else :func:`getch` waits
until a key is pressed.
.. method:: window.getkey([y, x])