summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2013-12-31 18:10:24 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2013-12-31 18:10:24 (GMT)
commit1cb4f607d1b397e678dc9f3d6b535d36c9d48d3c (patch)
tree88f30d8cbf5b32344197baf1d0c9907922bebc53 /Doc
parentfced3ec2db437097e45e1311c321a74cf96a4a06 (diff)
parent340a692283f2d7ebac27c68690b3f752f5ad845a (diff)
downloadcpython-1cb4f607d1b397e678dc9f3d6b535d36c9d48d3c.zip
cpython-1cb4f607d1b397e678dc9f3d6b535d36c9d48d3c.tar.gz
cpython-1cb4f607d1b397e678dc9f3d6b535d36c9d48d3c.tar.bz2
Merge with 3.3
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/datamodel.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 0e936c6..c09a578 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1583,7 +1583,7 @@ Notes on using *__slots__*
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