Merge heads.

This commit is contained in:
Ezio Melotti 2011-06-25 20:30:52 +03:00
commit 935fa016f4
1 changed files with 3 additions and 3 deletions

View File

@ -9,11 +9,11 @@
This module adds the ability to import Python modules (:file:`\*.py`,
:file:`\*.py[co]`) and packages from ZIP-format archives. It is usually not
needed to use the :mod:`zipimport` module explicitly; it is automatically used
by the built-in :keyword:`import` mechanism for ``sys.path`` items that are paths
by the built-in :keyword:`import` mechanism for :data:`sys.path` items that are paths
to ZIP archives.
Typically, ``sys.path`` is a list of directory names as strings. This module
also allows an item of ``sys.path`` to be a string naming a ZIP file archive.
Typically, :data:`sys.path` is a list of directory names as strings. This module
also allows an item of :data:`sys.path` to be a string naming a ZIP file archive.
The ZIP archive can contain a subdirectory structure to support package imports,
and a path within the archive can be specified to only import from a
subdirectory. For example, the path :file:`/tmp/example.zip/lib/` would only