[Python-checkins] r82344 - in python/branches/release31-maint: Objects/abstract.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Jun 28 21:46:35 2010
New Revision: 82344

Log:
Merged revisions 82342 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82342 | benjamin.peterson | 2010-06-28 14:43:42 -0500 (Mon, 28 Jun 2010) | 1 line
  
  update error message
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Objects/abstract.c

Modified: python/branches/release31-maint/Objects/abstract.c
==============================================================================
--- python/branches/release31-maint/Objects/abstract.c	(original)
+++ python/branches/release31-maint/Objects/abstract.c	Mon Jun 28 21:46:35 2010
@@ -2533,8 +2533,7 @@
     }
     else {
         if (!check_class(cls,
-            "isinstance() arg 2 must be a class, type,"
-            " or tuple of classes and types"))
+            "isinstance() arg 2 must be a type or tuple of types"))
             return -1;
         icls = PyObject_GetAttr(inst, __class__);
         if (icls == NULL) {