From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 5 Jun 2010 12:52:03 +0000 (+0000)
Subject: Merged revisions 81744 via svnmerge from
X-Git-Tag: v2.6.6rc1~211
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bf9f1a4e969b1649a3b0317fddfad9d0b36043d;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index f496804e4c32..4c972648aeaf 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3860,7 +3860,7 @@ inherit_slots(PyTypeObject *type, PyTypeObject *base)
                             /* 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();
                     }