[Python-checkins] cpython (merge 3.3 -> default): #17402: merge with 3.3.

Wed Mar 13 01:28:14 CET 2013

http://hg.python.org/cpython/rev/b49971a1e70d
changeset: 82640:b49971a1e70d
parent: 82636:885ffda21849
parent: 82639:bf0632a17ab4
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Wed Mar 13 02:27:53 2013 +0200
summary:
 #17402: merge with 3.3.
files:
 Doc/library/mmap.rst | 28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Doc/library/mmap.rst b/Doc/library/mmap.rst
--- a/Doc/library/mmap.rst
+++ b/Doc/library/mmap.rst
@@ -106,19 +106,19 @@
 
 with open("hello.txt", "r+b") as f:
 # memory-map the file, size 0 means whole file
- map = mmap.mmap(f.fileno(), 0)
+ mm = mmap.mmap(f.fileno(), 0)
 # read content via standard file methods
- print(map.readline()) # prints b"Hello Python!\n"
+ print(mm.readline()) # prints b"Hello Python!\n"
 # read content via slice notation
- print(map[:5]) # prints b"Hello"
+ print(mm[:5]) # prints b"Hello"
 # update content using slice notation;
 # note that new content must have same size
- map[6:] = b" world!\n"
+ mm[6:] = b" world!\n"
 # ... and read again using standard file methods
- map.seek(0)
- print(map.readline()) # prints b"Hello world!\n"
+ mm.seek(0)
+ print(mm.readline()) # prints b"Hello world!\n"
 # close the map
- map.close()
+ mm.close()
 
 
 :class:`mmap` can also be used as a context manager in a :keyword:`with`
@@ -126,8 +126,8 @@
 
 import mmap
 
- with mmap.mmap(-1, 13) as map:
- map.write("Hello world!")
+ with mmap.mmap(-1, 13) as mm:
+ mm.write("Hello world!")
 
 .. versionadded:: 3.2
 Context manager support.
@@ -139,16 +139,16 @@
 import mmap
 import os
 
- map = mmap.mmap(-1, 13)
- map.write(b"Hello world!")
+ mm = mmap.mmap(-1, 13)
+ mm.write(b"Hello world!")
 
 pid = os.fork()
 
 if pid == 0: # In a child process
- map.seek(0)
- print(map.readline())
+ mm.seek(0)
+ print(mm.readline())
 
- map.close()
+ mm.close()
 
 
 Memory-mapped file objects support the following methods:
-- 
Repository URL: http://hg.python.org/cpython
