changeset: 77092:d13fdd97cc8e branch: 3.2 parent: 77090:1bee3da9a305 user: Hynek Schlawack date: Mon May 21 11:01:54 2012 +0200 files: Doc/library/curses.rst Doc/library/email.generator.rst Doc/library/http.cookiejar.rst Doc/library/nis.rst Doc/library/os.rst Doc/library/ossaudiodev.rst Doc/library/select.rst Doc/library/sqlite3.rst description: #14804: Remove [] around optional arguments with default values diff -r 1bee3da9a305 -r d13fdd97cc8e Doc/library/curses.rst --- a/Doc/library/curses.rst Sun May 20 18:32:53 2012 +0200 +++ b/Doc/library/curses.rst Mon May 21 11:01:54 2012 +0200 @@ -1091,7 +1091,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 -r 1bee3da9a305 -r d13fdd97cc8e Doc/library/email.generator.rst --- a/Doc/library/email.generator.rst Sun May 20 18:32:53 2012 +0200 +++ b/Doc/library/email.generator.rst Mon May 21 11:01:54 2012 +0200 @@ -178,7 +178,7 @@ representing the part. -.. class:: DecodedGenerator(outfp[, mangle_from_=True, maxheaderlen=78, fmt=None) +.. class:: DecodedGenerator(outfp, mangle_from_=True, maxheaderlen=78, fmt=None) This class, derived from :class:`Generator` walks through all the subparts of a message. If the subpart is of main type :mimetype:`text`, then it prints the diff -r 1bee3da9a305 -r d13fdd97cc8e Doc/library/http.cookiejar.rst --- a/Doc/library/http.cookiejar.rst Sun May 20 18:32:53 2012 +0200 +++ b/Doc/library/http.cookiejar.rst Mon May 21 11:01:54 2012 +0200 @@ -700,7 +700,7 @@ The :class:`Cookie` class also defines the following method: -.. method:: Cookie.is_expired([now=None]) +.. method:: Cookie.is_expired(now=None) True if cookie has passed the time at which the server requested it should expire. If *now* is given (in seconds since the epoch), return whether the diff -r 1bee3da9a305 -r d13fdd97cc8e Doc/library/nis.rst --- a/Doc/library/nis.rst Sun May 20 18:32:53 2012 +0200 +++ b/Doc/library/nis.rst Mon May 21 11:01:54 2012 +0200 @@ -17,7 +17,7 @@ The :mod:`nis` module defines the following functions: -.. function:: match(key, mapname[, domain=default_domain]) +.. function:: match(key, mapname, domain=default_domain) Return the match for *key* in map *mapname*, or raise an error (:exc:`nis.error`) if there is none. Both should be strings, *key* is 8-bit @@ -30,7 +30,7 @@ unspecified, lookup is in the default NIS domain. -.. function:: cat(mapname[, domain=default_domain]) +.. function:: cat(mapname, domain=default_domain) Return a dictionary mapping *key* to *value* such that ``match(key, mapname)==value``. Note that both keys and values of the dictionary are @@ -42,7 +42,7 @@ unspecified, lookup is in the default NIS domain. -.. function:: maps([domain=default_domain]) +.. function:: maps(domain=default_domain) Return a list of all valid maps. diff -r 1bee3da9a305 -r d13fdd97cc8e Doc/library/os.rst --- a/Doc/library/os.rst Sun May 20 18:32:53 2012 +0200 +++ b/Doc/library/os.rst Mon May 21 11:01:54 2012 +0200 @@ -1145,7 +1145,7 @@ Availability: Unix. -.. function:: mknod(filename[, mode=0o600[, device]]) +.. 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 -r 1bee3da9a305 -r d13fdd97cc8e Doc/library/ossaudiodev.rst --- a/Doc/library/ossaudiodev.rst Sun May 20 18:32:53 2012 +0200 +++ b/Doc/library/ossaudiodev.rst Mon May 21 11:01:54 2012 +0200 @@ -277,7 +277,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 -r 1bee3da9a305 -r d13fdd97cc8e Doc/library/select.rst --- a/Doc/library/select.rst Sun May 20 18:32:53 2012 +0200 +++ b/Doc/library/select.rst Mon May 21 11:01:54 2012 +0200 @@ -181,7 +181,7 @@ Remove a registered file descriptor from the epoll object. -.. method:: epoll.poll([timeout=-1[, maxevents=-1]]) +.. method:: epoll.poll(timeout=-1, maxevents=-1) Wait for events. timeout in seconds (float) @@ -285,7 +285,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 diff -r 1bee3da9a305 -r d13fdd97cc8e Doc/library/sqlite3.rst --- a/Doc/library/sqlite3.rst Sun May 20 18:32:53 2012 +0200 +++ b/Doc/library/sqlite3.rst Mon May 21 11:01:54 2012 +0200 @@ -514,7 +514,7 @@ or :const:`None` when no more data is available. -.. method:: Cursor.fetchmany([size=cursor.arraysize]) +.. method:: Cursor.fetchmany(size=cursor.arraysize) Fetches the next set of rows of a query result, returning a list. An empty list is returned when no more rows are available.

AltStyle によって変換されたページ (->オリジナル) /