summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/marshal.rst6
-rw-r--r--Doc/library/stdtypes.rst7
2 files changed, 7 insertions, 6 deletions
diff --git a/Doc/library/marshal.rst b/Doc/library/marshal.rst
index 0cf69b4..bc43184 100644
--- a/Doc/library/marshal.rst
+++ b/Doc/library/marshal.rst
@@ -45,12 +45,6 @@ themselves supported; and recursive lists and dictionaries should not be written
(they will cause infinite loops).
.. warning::
-
- Some unsupported types such as subclasses of builtins will appear to marshal
- and unmarshal correctly, but in fact, their type will change and the
- additional subclass functionality and instance attributes will be lost.
-
-.. warning::
On machines where C's ``long int`` type has more than 32 bits (such as the
DEC Alpha), it is possible to create plain Python integers that are longer
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 9073bca..d6a853b 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1418,6 +1418,13 @@ operations:
Test *x* for non-membership in *s*.
+.. method:: set.isdisjoint(other)
+
+ Return True if the set has no elements in common with *other*.
+ Sets are disjoint if and only if their interesection is the empty set.
+
+ .. versionadded:: 2.6
+
.. method:: set.issubset(other)
set <= other