summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-10-05 21:39:44 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-10-05 21:39:44 (GMT)
commitc1ae25471720fb0745da5ac02d20b28a14ad1469 (patch)
treec29db2ffd09684e73e7152e32665ab0837f9c039 /Objects
parentb32a8111c9da3ef8f690246d488ff8d23d5bd206 (diff)
parent488d244e1ab9e50c5b7e83904897d8e068546086 (diff)
downloadcpython-c1ae25471720fb0745da5ac02d20b28a14ad1469.zip
cpython-c1ae25471720fb0745da5ac02d20b28a14ad1469.tar.gz
cpython-c1ae25471720fb0745da5ac02d20b28a14ad1469.tar.bz2
#19068: merge with 3.3.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/complexobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 5747450..64e7b44 100644
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -681,7 +681,7 @@ complex_conjugate(PyObject *self)
PyDoc_STRVAR(complex_conjugate_doc,
"complex.conjugate() -> complex\n"
"\n"
-"Returns the complex conjugate of its argument. (3-4j).conjugate() == 3+4j.");
+"Return the complex conjugate of its argument. (3-4j).conjugate() == 3+4j.");
static PyObject *
complex_getnewargs(PyComplexObject *v)
@@ -693,7 +693,7 @@ complex_getnewargs(PyComplexObject *v)
PyDoc_STRVAR(complex__format__doc,
"complex.__format__() -> str\n"
"\n"
-"Converts to a string according to format_spec.");
+"Convert to a string according to format_spec.");
static PyObject *
complex__format__(PyObject* self, PyObject* args)