cpython (merge 3.3 -> default): Merge with 3.3
http://hg.python.org/cpython/rev/b35b204e5d0b changeset: 88233:b35b204e5d0b parent: 88231:751c50136ce3 parent: 88232:8b4d36d0c090 user: Zachary Ware <zachary.ware@gmail.com> date: Tue Dec 31 12:10:24 2013 -0600 summary: Merge with 3.3 files: Doc/reference/datamodel.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1583,7 +1583,7 @@ program undefined. In the future, a check may be added to prevent this. * Nonempty *__slots__* does not work for classes derived from "variable-length" - built-in types such as :class:`int`, :class:`str` and :class:`tuple`. + built-in types such as :class:`int`, :class:`bytes` and :class:`tuple`. * Any non-string iterable may be assigned to *__slots__*. Mappings may also be used; however, in the future, special meaning may be assigned to the values -- Repository URL: http://hg.python.org/cpython
participants (1)
-
zach.ware