summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-06-05 12:52:03 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-06-05 12:52:03 (GMT)
commit3bf9f1a4e969b1649a3b0317fddfad9d0b36043d (patch)
tree70707d00b8662c56c8d85d8a58da51957753d623 /Objects
parentb671c2933689c86a1428917d0e090d1253350f52 (diff)
downloadcpython-3bf9f1a4e969b1649a3b0317fddfad9d0b36043d.zip
cpython-3bf9f1a4e969b1649a3b0317fddfad9d0b36043d.tar.gz
cpython-3bf9f1a4e969b1649a3b0317fddfad9d0b36043d.tar.bz2
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. ........
Diffstat (limited to 'Objects')
-rw-r--r--Objects/typeobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index f496804..4c97264 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();
}