summaryrefslogtreecommitdiffstats
path: root/Doc/library/shutil.rst
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-02-05 12:49:59 (GMT)
committerÉric Araujo <merwok@netwok.org>2012-02-05 12:49:59 (GMT)
commitcd0d951a707c0dbecfd45c14b0e6ec7bf83103a2 (patch)
tree3e40b36621bfc2f4140b612d8a6d2ed01d1f9e39 /Doc/library/shutil.rst
parentbe095b3b9857a5b949dd23b89dac5f5151b252d5 (diff)
parentcd2a6033ac0bafd69a7cba2d132e092127acc895 (diff)
downloadcpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.zip
cpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.tar.gz
cpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.tar.bz2
Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715)
Diffstat (limited to 'Doc/library/shutil.rst')
-rw-r--r--Doc/library/shutil.rst10
1 files changed, 7 insertions, 3 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index 9e8784b..77ce6b0 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -31,6 +31,8 @@ copying and removal. For operations on individual files, see also the
are not copied.
+.. _file-operations:
+
Directory and files operations
------------------------------
@@ -234,7 +236,7 @@ Directory and files operations
(*srcname*, *dstname*, *exception*).
-.. _shutil-example:
+.. _shutil-copytree-example:
copytree example
::::::::::::::::
@@ -301,6 +303,9 @@ Another example that uses the *ignore* argument to add a logging call::
Archiving operations
--------------------
+High-level utilities to create and read compressed and archived files are also
+provided. They rely on the :mod:`zipfile` and :mod:`tarfile` modules.
+
.. function:: make_archive(base_name, format, [root_dir, [base_dir, [verbose, [dry_run, [owner, [group, [logger]]]]]]])
Create an archive file (such as zip or tar) and return its name.
@@ -428,6 +433,7 @@ Archiving operations
.. versionadded:: 3.2
+.. _shutil-archiving-example:
Archiving example
:::::::::::::::::
@@ -453,5 +459,3 @@ The resulting archive contains::
-rw------- tarek/staff 1675 2008-06-09 13:26:54 ./id_rsa
-rw-r--r-- tarek/staff 397 2008-06-09 13:26:54 ./id_rsa.pub
-rw-r--r-- tarek/staff 37192 2010-02-06 18:23:10 ./known_hosts
-
-