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

[zach.ware]

http://hg.python.org/cpython/rev/d85fcf23549e
changeset:   92019:d85fcf23549e
parent:      92017:7ed237478fcc
parent:      92018:de287a94b486
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Aug 05 14:02:11 2014 -0500
summary:
  Closes #22146: Merge with 3.4

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
@@ -69,7 +69,7 @@
     func = PyTuple_GET_ITEM(args, 0); /* Better be callable */
     if (!PyFunction_Check(func)) {
         PyErr_SetString(PyExc_TypeError,
-                        "__build__class__: func must be a function");
+                        "__build_class__: func must be a function");
         return NULL;
     }
     name = PyTuple_GET_ITEM(args, 1);

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