Skip to content

Commit 45d1ba7

Browse files
[3.13] gh-141623: operator.rst: don't use term "bitwise" (GH-141846) (GH-151080)
(cherry picked from commit bd5fa31) Co-authored-by: Doron Behar <doron.behar@gmail.com>
1 parent 619a12b commit 45d1ba7

1 file changed

Lines changed: 18 additions & 13 deletions

File tree

Doc/library/operator.rst

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ The mathematical and bitwise operations are the most numerous:
9898
.. function:: and_(a, b)
9999
__and__(a, b)
100100

101-
Return the bitwise and of *a* and *b*.
101+
Return ``a & b``.
102102

103103

104104
.. function:: floordiv(a, b)
@@ -122,13 +122,13 @@ The mathematical and bitwise operations are the most numerous:
122122
__inv__(obj)
123123
__invert__(obj)
124124

125-
Return the bitwise inverse of the number *obj*. This is equivalent to ``~obj``.
125+
Return ``~obj``.
126126

127127

128128
.. function:: lshift(a, b)
129129
__lshift__(a, b)
130130

131-
Return *a* shifted left by *b*.
131+
Return ``a << b``.
132132

133133

134134
.. function:: mod(a, b)
@@ -140,7 +140,7 @@ The mathematical and bitwise operations are the most numerous:
140140
.. function:: mul(a, b)
141141
__mul__(a, b)
142142

143-
Return ``a * b``, for *a* and *b* numbers.
143+
Return ``a * b``.
144144

145145

146146
.. function:: matmul(a, b)
@@ -160,25 +160,25 @@ The mathematical and bitwise operations are the most numerous:
160160
.. function:: or_(a, b)
161161
__or__(a, b)
162162

163-
Return the bitwise or of *a* and *b*.
163+
Return ``a | b``.
164164

165165

166166
.. function:: pos(obj)
167167
__pos__(obj)
168168

169-
Return *obj* positive (``+obj``).
169+
Return ``+obj``.
170170

171171

172172
.. function:: pow(a, b)
173173
__pow__(a, b)
174174

175-
Return ``a ** b``, for *a* and *b* numbers.
175+
Return ``a ** b``.
176176

177177

178178
.. function:: rshift(a, b)
179179
__rshift__(a, b)
180180

181-
Return *a* shifted right by *b*.
181+
Return ``a >> b``.
182182

183183

184184
.. function:: sub(a, b)
@@ -197,7 +197,7 @@ The mathematical and bitwise operations are the most numerous:
197197
.. function:: xor(a, b)
198198
__xor__(a, b)
199199

200-
Return the bitwise exclusive or of *a* and *b*.
200+
Return ``a ^ b``.
201201

202202

203203
Operations which work with sequences (some of them with mappings too) include:
@@ -391,13 +391,18 @@ Python syntax and the functions in the :mod:`operator` module.
391391
+-----------------------+-------------------------+---------------------------------------+
392392
| Division | ``a // b`` | ``floordiv(a, b)`` |
393393
+-----------------------+-------------------------+---------------------------------------+
394-
| Bitwise And | ``a & b`` | ``and_(a, b)`` |
394+
| Bitwise And, or | ``a & b`` | ``and_(a, b)`` |
395+
| Intersection | | |
395396
+-----------------------+-------------------------+---------------------------------------+
396-
| Bitwise Exclusive Or | ``a ^ b`` | ``xor(a, b)`` |
397+
| Bitwise Exclusive Or, | ``a ^ b`` | ``xor(a, b)`` |
398+
| or Symmetric | | |
399+
| Difference | | |
397400
+-----------------------+-------------------------+---------------------------------------+
398-
| Bitwise Inversion | ``~ a`` | ``invert(a)`` |
401+
| Bitwise Inversion, or | ``~ a`` | ``invert(a)`` |
402+
| Complement | | |
399403
+-----------------------+-------------------------+---------------------------------------+
400-
| Bitwise Or | ``a | b`` | ``or_(a, b)`` |
404+
| Bitwise Or, or | ``a | b`` | ``or_(a, b)`` |
405+
| Union | | |
401406
+-----------------------+-------------------------+---------------------------------------+
402407
| Exponentiation | ``a ** b`` | ``pow(a, b)`` |
403408
+-----------------------+-------------------------+---------------------------------------+

0 commit comments

Comments
 (0)