merge 3.2 (#9574)

1 files changed, 7 insertions, 0 deletions

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index e4b14b8..2674ef9 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -243,6 +243,13 @@ are always available.  They are listed here in alphabetical order.
    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`.