Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2015-05-23 16:16:46 -04:00
commit c7792160dd
1 changed files with 1 additions and 1 deletions

View File

@ -249,7 +249,7 @@ are always available. They are listed here in alphabetical order.
.. class:: complex([real[, imag]])
Return a complex number with the value *real* + *imag*\*j or convert a string
Return a complex number with the value *real* + *imag*\*1j or convert a string
or number to a complex number. If the first parameter is a string, it will
be interpreted as a complex number and the function must be called without a
second parameter. The second parameter can never be a string. Each argument