[Python-checkins] cpython (merge 3.2 -> default): merge 3.2 (#9574)

[mark.dickinson]

http://hg.python.org/cpython/rev/2f48415e917c
changeset:   75519:2f48415e917c
parent:      75516:b7121ab1107c
parent:      75518:a5b073b1cfea
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sat Mar 10 16:11:49 2012 +0000
summary:
  merge 3.2 (#9574)

files:
  Doc/library/functions.rst |  7 +++++++
  1 files changed, 7 insertions(+), 0 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -243,6 +243,13 @@
    the function serves as a numeric conversion function like :func:`int`
    and :func:`float`.  If both arguments are omitted, returns ``0j``.
 
+   .. note::
+
+      When converting from a string, the string must not contain whitespace
+      around the central ``+`` or ``-`` operator.  For example,
+      ``complex('1+2j')`` is fine, but ``complex('1 + 2j')`` raises
+      :exc:`ValueError`.
+
    The complex type is described in :ref:`typesnumeric`.
 
 

-- 
Repository URL: http://hg.python.org/cpython