[Python-checkins] r81745 - in python/branches/release26-maint: Objects/typeobject.c

[mark.dickinson]

Author: mark.dickinson
Date: Sat Jun  5 14:52:03 2010
New Revision: 81745

Log:
Merged revisions 81744 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81744 | mark.dickinson | 2010-06-05 13:51:21 +0100 (Sat, 05 Jun 2010) | 1 line
  
  Fix comment typo.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Objects/typeobject.c

Modified: python/branches/release26-maint/Objects/typeobject.c
==============================================================================
--- python/branches/release26-maint/Objects/typeobject.c	(original)
+++ python/branches/release26-maint/Objects/typeobject.c	Sat Jun  5 14:52:03 2010
@@ -3860,7 +3860,7 @@
                             /* XXX This isn't right.  If the warning is turned
                                into an exception, we should be communicating
                                the error back to the caller, but figuring out
-                               how to clean-up in that case is tricky.  See
+                               how to clean up in that case is tricky.  See
                                issue 8627 for more. */
                             PyErr_Clear();
                     }