diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2015-05-23 20:16:46 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2015-05-23 20:16:46 (GMT) |
| commit | c7792160ddf8eea5f2a14cf0d957ac9a89615adb (patch) | |
| tree | 8e6991318361b4026907e45be37ffafaeb7e9290 | |
| parent | 1c858c352b8c11419f79f586334c49378726dba8 (diff) | |
| parent | 43cba219d520d6c7449ac2900ca9528efa745c09 (diff) | |
| download | cpython-c7792160ddf8eea5f2a14cf0d957ac9a89615adb.zip cpython-c7792160ddf8eea5f2a14cf0d957ac9a89615adb.tar.gz cpython-c7792160ddf8eea5f2a14cf0d957ac9a89615adb.tar.bz2 | |
Merge with 3.4
| -rw-r--r-- | Doc/library/functions.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index 7bee859..409f6c4 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -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 |