diff options
| author | Larry Hastings <larry@hastings.org> | 2014-03-16 04:13:56 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2014-03-16 04:13:56 (GMT) |
| commit | 3732ed24145c1ac77e99bcf85bccda3af095e696 (patch) | |
| tree | 432a243f5f4d9720ec0cc202ee969f6175e450b7 /Doc/faq | |
| parent | b6b6a6d587d267cbad490232d08faebd30fdb7e2 (diff) | |
| download | cpython-3732ed24145c1ac77e99bcf85bccda3af095e696.zip cpython-3732ed24145c1ac77e99bcf85bccda3af095e696.tar.gz cpython-3732ed24145c1ac77e99bcf85bccda3af095e696.tar.bz2 | |
Merge in all documentation changes since branching 3.4.0rc1.
Diffstat (limited to 'Doc/faq')
| -rw-r--r-- | Doc/faq/general.rst | 3 | ||||
| -rw-r--r-- | Doc/faq/library.rst | 1 | ||||
| -rw-r--r-- | Doc/faq/programming.rst | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index da2c933..6f4733f 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -471,7 +471,8 @@ that is written in Python using Tkinter. PythonWin is a Windows-specific IDE. Emacs users will be happy to know that there is a very good Python mode for Emacs. All of these programming environments provide syntax highlighting, auto-indenting, and access to the interactive interpreter while coding. Consult -http://www.python.org/editors/ for a full list of Python editing environments. +`the Python wiki <https://wiki.python.org/moin/PythonEditors>`_ for a full list +of Python editing environments. If you want to discuss Python's use in education, you may be interested in joining `the edu-sig mailing list diff --git a/Doc/faq/library.rst b/Doc/faq/library.rst index 34e2fdf..5f4ff17 100644 --- a/Doc/faq/library.rst +++ b/Doc/faq/library.rst @@ -513,6 +513,7 @@ For data that is more regular (e.g. a homogeneous list of ints or floats), you can also use the :mod:`array` module. .. note:: + To read and write binary data, it is mandatory to open the file in binary mode (here, passing ``"rb"`` to :func:`open`). If you use ``"r"`` instead (the default), the file will be open in text mode diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 79c7289..d514a80 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1103,6 +1103,7 @@ Use a list comprehension:: result = [obj.method() for obj in mylist] +.. _faq-augmented-assignment-tuple-error: Why does a_tuple[i] += ['item'] raise an exception when the addition works? --------------------------------------------------------------------------- |