[Python-checkins] cpython (merge 3.5 -> default): Closes #26874: Merge with 3.5

[zach.ware]

https://hg.python.org/cpython/rev/c6e285789963
changeset:   101173:c6e285789963
parent:      101170:28c89ebd6e5a
parent:      101172:3edf8aa1ed97
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Thu Apr 28 14:40:08 2016 -0500
summary:
  Closes #26874: Merge with 3.5

files:
  Python/bltinmodule.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -796,7 +796,7 @@
     y: object
     /
 
-Return the tuple ((x-x%y)//y, x%y).  Invariant: div*y + mod == x.
+Return the tuple (x//y, x%y).  Invariant: div*y + mod == x.
 [clinic start generated code]*/
 
 static PyObject *

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