summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2008-05-16 00:41:41 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2008-05-16 00:41:41 (GMT)
commit8ae3e055a51e4cddce90d0faad79ad27e21942c2 (patch)
tree3c721d3c584ae68f3df1ab1697718f73b9957fba /Doc/library
parentd6bb7c2c405c72ca7cded5d0e5b873ed527b7f0b (diff)
downloadcpython-8ae3e055a51e4cddce90d0faad79ad27e21942c2.zip
cpython-8ae3e055a51e4cddce90d0faad79ad27e21942c2.tar.gz
cpython-8ae3e055a51e4cddce90d0faad79ad27e21942c2.tar.bz2
Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r63066 | georg.brandl | 2008-05-11 10:56:04 -0400 (Sun, 11 May 2008) | 2 lines #2709 followup: better description of Tk's pros and cons. ........ r63067 | georg.brandl | 2008-05-11 11:05:13 -0400 (Sun, 11 May 2008) | 2 lines #1326: document and test zipimporter.archive and zipimporter.prefix. ........ r63068 | georg.brandl | 2008-05-11 11:07:39 -0400 (Sun, 11 May 2008) | 2 lines #2816: clarify error messages for EOF while scanning strings. ........ r63069 | georg.brandl | 2008-05-11 11:17:41 -0400 (Sun, 11 May 2008) | 3 lines #2787: Flush stdout after writing test name, helpful when running hanging or long-running tests. Patch by Adam Olsen. ........ r63070 | georg.brandl | 2008-05-11 11:20:16 -0400 (Sun, 11 May 2008) | 3 lines #2803: fix wrong invocation of heappush in seldom-reached code. Thanks to Matt Harden. ........ r63073 | benjamin.peterson | 2008-05-11 12:38:07 -0400 (Sun, 11 May 2008) | 2 lines broaden .bzrignore ........ r63076 | andrew.kuchling | 2008-05-11 15:15:52 -0400 (Sun, 11 May 2008) | 1 line Add message to test assertion ........ r63083 | andrew.kuchling | 2008-05-11 16:08:33 -0400 (Sun, 11 May 2008) | 1 line Try setting HOME env.var to fix test on Win32 ........ r63092 | georg.brandl | 2008-05-11 16:53:55 -0400 (Sun, 11 May 2008) | 2 lines #2809 followup: even better split docstring. ........ r63094 | georg.brandl | 2008-05-11 17:03:42 -0400 (Sun, 11 May 2008) | 4 lines - #2250: Exceptions raised during evaluation of names in rlcompleter's ``Completer.complete()`` method are now caught and ignored. ........ r63095 | georg.brandl | 2008-05-11 17:16:37 -0400 (Sun, 11 May 2008) | 2 lines Clarify os.strerror()s exception behavior. ........ r63097 | georg.brandl | 2008-05-11 17:34:10 -0400 (Sun, 11 May 2008) | 2 lines #2535: remove duplicated method. ........ r63104 | alexandre.vassalotti | 2008-05-11 19:04:27 -0400 (Sun, 11 May 2008) | 2 lines Moved the Queue module stub in lib-old. ........
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/os.rst3
-rw-r--r--Doc/library/othergui.rst7
-rw-r--r--Doc/library/rlcompleter.rst3
-rw-r--r--Doc/library/tk.rst11
-rw-r--r--Doc/library/zipimport.rst25
5 files changed, 27 insertions, 22 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 55e007a..951474f 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -274,7 +274,8 @@ process and user.
.. function:: strerror(code)
Return the error message corresponding to the error code in *code*.
- Availability: Unix, Windows.
+ On platforms where :cfunc:`strerror` returns ``NULL`` when given an unknown
+ error number, :exc:`ValueError` is raised. Availability: Unix, Windows.
.. function:: umask(mask)
diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst
index ab4efdb..2d4ea37 100644
--- a/Doc/library/othergui.rst
+++ b/Doc/library/othergui.rst
@@ -69,10 +69,9 @@ also available for Python:
<http://www.amazon.com/exec/obidos/ASIN/1932394621>`_, by Noel Rappin and
Robin Dunn.
-PyGTK, PyQt, and wxPython, all have a modern look and feel and far more
-widgets and better documentation than Tkinter. In addition,
-there are many other GUI toolkits for Python, both cross-platform, and
-platform-specific. See the `GUI Programming
+PyGTK, PyQt, and wxPython, all have a modern look and feel and more
+widgets than Tkinter. In addition, there are many other GUI toolkits for
+Python, both cross-platform, and platform-specific. See the `GUI Programming
<http://wiki.python.org/moin/GuiProgramming>`_ page in the Python Wiki for a
much more complete list, and also for links to documents where the
different GUI toolkits are compared.
diff --git a/Doc/library/rlcompleter.rst b/Doc/library/rlcompleter.rst
index cec1e86..01efb03 100644
--- a/Doc/library/rlcompleter.rst
+++ b/Doc/library/rlcompleter.rst
@@ -61,5 +61,6 @@ Completer objects have the following method:
If called for a dotted name, it will try to evaluate anything without obvious
side-effects (functions will not be evaluated, but it can generate calls to
:meth:`__getattr__`) up to the last part, and find matches for the rest via the
- :func:`dir` function.
+ :func:`dir` function. Any exception raised during the evaluation of the
+ expression is caught, silenced and :const:`None` is returned.
diff --git a/Doc/library/tk.rst b/Doc/library/tk.rst
index 8451f6d..944687b 100644
--- a/Doc/library/tk.rst
+++ b/Doc/library/tk.rst
@@ -22,11 +22,12 @@ classes. In addition, the internal module :mod:`_tkinter` provides a threadsafe
mechanism which allows Python and Tcl to interact.
:mod:`Tkinter`'s chief virtues are that it is fast, and that it usually comes
-bundled with Python. Although it has been used to create some very good
-applications, including IDLE, its standard documentation is weak (but there
-are some good books and tutorials), and it has an outdated look and
-feel. For more modern, better documented, and much more extensive GUI
-libraries, see the :ref:`other-gui-packages` section.
+bundled with Python. Although its standard documentation is weak, good
+material is available, which includes: references, tutorials, a book and
+others. :mod:`Tkinter` is also famous for having an outdated look and feel,
+which has been vastly improved in Tk 8.5. Nevertheless, there are many other
+GUI libraries that you could be interested in. For more information about
+alternatives, see the :ref:`other-gui-packages` section.
.. toctree::
diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst
index 8972c06..82383bf 100644
--- a/Doc/library/zipimport.rst
+++ b/Doc/library/zipimport.rst
@@ -59,17 +59,14 @@ zipimporter Objects
.. class:: zipimporter(archivepath)
- Create a new zipimporter instance. *archivepath* must be a path to a ZIP file.
+ Create a new zipimporter instance. *archivepath* must be a path to a ZIP
+ file, or to a specific path within a ZIP file. For example, an *archivepath*
+ of :file:`foo/bar.zip/lib` will look for modules in the :file:`lib` directory
+ inside the ZIP file :file:`foo/bar.zip` (provided that it exists).
+
:exc:`ZipImportError` is raised if *archivepath* doesn't point to a valid ZIP
archive.
- *archivepath* can also contain a path within the ZIP file -- the importer
- object will then look under that path instead of the ZIP file root. For
- example, an *archivepath* of :file:`foo/bar.zip/lib` will look for modules
- in the :file:`lib` directory inside the ZIP file :file:`foo/bar.zip`
- (provided that it exists).
-
-
.. method:: find_module(fullname[, path])
Search for a module specified by *fullname*. *fullname* must be the fully
@@ -114,13 +111,19 @@ zipimporter Objects
.. attribute:: archive
- The file name of the importer's associated ZIP file.
+ The file name of the importer's associated ZIP file, without a possible
+ subpath.
.. attribute:: prefix
- The path within the ZIP file where modules are searched; see
- :class:`zipimporter` for details.
+ The subpath within the ZIP file where modules are searched. This is the
+ empty string for zipimporter objects which point to the root of the ZIP
+ file.
+
+ The :attr:`archive` and :attr:`prefix` attributes, when combined with a
+ slash, equal the original *archivepath* argument given to the
+ :class:`zipimporter` constructor.
.. _zipimport-examples: