[Python-checkins] cpython (merge 3.3 -> default): #19068: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/c1abbeae5c8a
changeset:   85975:c1abbeae5c8a
parent:      85973:b2c752eff474
parent:      85974:54213ef5bb19
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Oct 06 00:39:44 2013 +0300
summary:
  #19068: merge with 3.3.

files:
  Objects/complexobject.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Objects/complexobject.c b/Objects/complexobject.c
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -681,7 +681,7 @@
 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 @@
 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)

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