Merged revisions 84156 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84156 | antoine.pitrou | 2010-08-17 23:11:49 +0200 (mar., 17 août 2010) | 3 lines

  Modernize gzip examples
........

diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst
index 1f644286c9c9cf2d8b094bb21c5c7c68b2fd310b..022bef721b7086c86c01cb51bf159cbd43a4e2ff 100644 (file)
--- a/Doc/library/gzip.rst
+++ b/Doc/library/gzip.rst
@@ -88,26 +88,22 @@ Examples of usage
 Example of how to read a compressed file::
 
    import gzip
-   f = gzip.open('/home/joe/file.txt.gz', 'rb')
-   file_content = f.read()
-   f.close()
+   with gzip.open('/home/joe/file.txt.gz', 'rb') as f:
+       file_content = f.read()
 
 Example of how to create a compressed GZIP file::
 
    import gzip
-   content = "Lots of content here"
-   f = gzip.open('/home/joe/file.txt.gz', 'wb')
-   f.write(content)
-   f.close()
+   content = b"Lots of content here"
+   with gzip.open('/home/joe/file.txt.gz', 'wb') as f:
+       f.write(content)
 
 Example of how to GZIP compress an existing file::
 
    import gzip
-   f_in = open('/home/joe/file.txt', 'rb')
-   f_out = gzip.open('/home/joe/file.txt.gz', 'wb')
-   f_out.writelines(f_in)
-   f_out.close()
-   f_in.close()
+   with open('/home/joe/file.txt', 'rb') as f_in:
+       with f_out = gzip.open('/home/joe/file.txt.gz', 'wb') as f_out:
+           f_out.writelines(f_in)
 
 
 .. seealso::