diff options
| author | Georg Brandl <georg@python.org> | 2009-10-27 13:44:06 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-10-27 13:44:06 +0000 |
| commit | d3717c50d38690260f42cf0c73b19e6689c7cee9 (patch) | |
| tree | 9c2c4fdc75ecf114cdd627fafb529c0d04c0e0e8 | |
| parent | bbdbea70e1c63799e7220e6755a96d5d278a91c5 (diff) | |
| download | cpython-git-d3717c50d38690260f42cf0c73b19e6689c7cee9.tar.gz | |
Merged revisions 69987,70002,70061 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69987 | benjamin.peterson | 2009-02-26 01:30:11 +0100 (Do, 26 Feb 2009) | 1 line
fix str.format()'s first arg #5371
........
r70002 | andrew.kuchling | 2009-02-26 23:34:30 +0100 (Do, 26 Feb 2009) | 1 line
The curses panel library is now supported
........
r70061 | hirokazu.yamamoto | 2009-02-28 16:24:00 +0100 (Sa, 28 Feb 2009) | 1 line
Binary flag is needed on windows.
........
| -rw-r--r-- | Doc/howto/curses.rst | 2 | ||||
| -rw-r--r-- | Doc/library/mmap.rst | 4 | ||||
| -rw-r--r-- | Doc/library/stdtypes.rst | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Doc/howto/curses.rst b/Doc/howto/curses.rst index 2d964c393c..71e640cb34 100644 --- a/Doc/howto/curses.rst +++ b/Doc/howto/curses.rst @@ -426,7 +426,7 @@ quirks, and provide complete lists of all the functions, attributes, and Because the curses API is so large, some functions aren't supported in the Python interface, not because they're difficult to implement, but because no one has needed them yet. Feel free to add them and then submit a patch. Also, we -don't yet have support for the menus or panels libraries associated with +don't yet have support for the menu library associated with ncurses; feel free to add that. If you write an interesting little program, feel free to contribute it as diff --git a/Doc/library/mmap.rst b/Doc/library/mmap.rst index 09ec73b094..a6e9bdc855 100644 --- a/Doc/library/mmap.rst +++ b/Doc/library/mmap.rst @@ -99,10 +99,10 @@ memory but does not update the underlying file. import mmap # write a simple example file - with open("hello.txt", "w") as f: + with open("hello.txt", "wb") as f: f.write("Hello Python!\n") - with open("hello.txt", "r+") as f: + with open("hello.txt", "r+b") as f: # memory-map the file, size 0 means whole file map = mmap.mmap(f.fileno(), 0) # read content via standard file methods diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 3417970dcb..deebda7afc 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -861,7 +861,7 @@ string functions based on regular expressions. found. -.. method:: str.format(format_string, *args, **kwargs) +.. method:: str.format(*args, **kwargs) Perform a string formatting operation. The *format_string* argument can contain literal text or replacement fields delimited by braces ``{}``. Each |