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

[ezio.melotti]

http://hg.python.org/cpython/rev/bf0632a17ab4
changeset:   82639:bf0632a17ab4
branch:      3.3
parent:      82635:dd2fad6b47c0
parent:      82638:df27ea4bdebd
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Mar 13 02:27:35 2013 +0200
summary:
  #17402: merge with 3.2.

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