[Python-checkins] cpython (merge 3.5 -> default): merge

Tue Sep 13 02:39:11 EDT 2016

https://hg.python.org/cpython/rev/81ecf0daca46
changeset: 103746:81ecf0daca46
parent: 103744:5e2780908857
parent: 103745:5d93a9b4f0e8
user: Raymond Hettinger <python at rcn.com>
date: Mon Sep 12 23:39:05 2016 -0700
summary:
 merge
files:
 Doc/library/stdtypes.rst | 12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -3875,17 +3875,17 @@
 Test whether the set is a proper superset of *other*, that is, ``set >=
 other and set != other``.
 
- .. method:: union(other, ...)
+ .. method:: union(*others)
 set | other | ...
 
 Return a new set with elements from the set and all others.
 
- .. method:: intersection(other, ...)
+ .. method:: intersection(*others)
 set & other & ...
 
 Return a new set with elements common to the set and all others.
 
- .. method:: difference(other, ...)
+ .. method:: difference(*others)
 set - other - ...
 
 Return a new set with elements in the set that are not in the others.
@@ -3935,17 +3935,17 @@
 The following table lists operations available for :class:`set` that do not
 apply to immutable instances of :class:`frozenset`:
 
- .. method:: update(other, ...)
+ .. method:: update(*others)
 set |= other | ...
 
 Update the set, adding elements from all others.
 
- .. method:: intersection_update(other, ...)
+ .. method:: intersection_update(*others)
 set &= other & ...
 
 Update the set, keeping only elements found in it and all others.
 
- .. method:: difference_update(other, ...)
+ .. method:: difference_update(*others)
 set -= other | ...
 
 Update the set, removing elements found in others.
-- 
Repository URL: https://hg.python.org/cpython
