[Python-checkins] cpython (merge 3.2 -> default): Restore [] where default arguments are not keywords

[hynek.schlawack]

http://hg.python.org/cpython/rev/dff6c506c2f1
changeset:   77107:dff6c506c2f1
parent:      77104:38b218b68d7f
parent:      77106:4fcdde674861
user:        Hynek Schlawack <hs at ox.cx>
date:        Tue May 22 16:14:56 2012 +0200
summary:
  Restore [] where default arguments are not keywords

files:
  Doc/library/curses.rst      |  2 +-
  Doc/library/os.rst          |  2 +-
  Doc/library/ossaudiodev.rst |  2 +-
  Doc/library/select.rst      |  2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -1120,7 +1120,7 @@
    rendition (as set by :meth:`bkgdset`) merged into them.
 
 
-.. method:: window.scroll(lines=1)
+.. method:: window.scroll([lines=1])
 
    Scroll the screen or scrolling region upward by *lines* lines.
 
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1786,7 +1786,7 @@
    Availability: Unix.
 
 
-.. function:: mknod(filename, mode=0o600, device=0)
+.. function:: mknod(filename[, mode=0o600[, device=0]])
 
    Create a filesystem node (file, device special file or named pipe) named
    *filename*. *mode* specifies both the permissions to use and the type of node
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -281,7 +281,7 @@
 simple calculations.
 
 
-.. method:: oss_audio_device.setparameters(format, nchannels, samplerate, strict=False)
+.. method:: oss_audio_device.setparameters(format, nchannels, samplerate[, strict=False])
 
    Set the key audio sampling parameters---sample format, number of channels, and
    sampling rate---in one method call.  *format*,  *nchannels*, and *samplerate*
diff --git a/Doc/library/select.rst b/Doc/library/select.rst
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -371,7 +371,7 @@
    Create a kqueue object from a given file descriptor.
 
 
-.. method:: kqueue.control(changelist, max_events, timeout=None) -> eventlist
+.. method:: kqueue.control(changelist, max_events[, timeout=None]) -> eventlist
 
    Low level interface to kevent
 

-- 
Repository URL: http://hg.python.org/cpython