Skip to content

Commit 13ad3b7

Browse files
serhiy-storchakaserhiy-storchaka
authored
bpo-31462: Remove trailing whitespaces. (python#3564)
1 parent 312ffea commit 13ad3b7

21 files changed

+62
-62
lines changed

Diff for: ‎Include/pyatomic.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#endif
1212

1313

14-
#if defined(_MSC_VER)
14+
#if defined(_MSC_VER)
1515
#include <intrin.h>
1616
#include <immintrin.h>
1717
#endif
@@ -223,7 +223,7 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
223223
result; \
224224
})
225225

226-
#elif defined(_MSC_VER)
226+
#elif defined(_MSC_VER)
227227
/* _Interlocked* functions provide a full memory barrier and are therefore
228228
enough for acq_rel and seq_cst. If the HLE variants aren't available
229229
in hardware they will fall back to a full memory barrier as well.
@@ -249,7 +249,7 @@ typedef struct _Py_atomic_int {
249249
} _Py_atomic_int;
250250

251251

252-
#if defined(_M_X64)
252+
#if defined(_M_X64)
253253
#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \
254254
switch (ORDER) { \
255255
case _Py_memory_order_acquire: \
@@ -312,7 +312,7 @@ inline intptr_t _Py_atomic_load_64bit(volatile uintptr_t* value, int order) {
312312
break;
313313
}
314314
}
315-
return old;
315+
return old;
316316
}
317317

318318
#else
@@ -347,7 +347,7 @@ inline int _Py_atomic_load_32bit(volatile int* value, int order) {
347347
break;
348348
}
349349
}
350-
return old;
350+
return old;
351351
}
352352

353353
#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
@@ -379,7 +379,7 @@ typedef struct _Py_atomic_int {
379379
} _Py_atomic_int;
380380

381381

382-
#if defined(_M_ARM64)
382+
#if defined(_M_ARM64)
383383
#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \
384384
switch (ORDER) { \
385385
case _Py_memory_order_acquire: \
@@ -442,7 +442,7 @@ inline intptr_t _Py_atomic_load_64bit(volatile uintptr_t* value, int order) {
442442
break;
443443
}
444444
}
445-
return old;
445+
return old;
446446
}
447447

448448
#else
@@ -477,13 +477,13 @@ inline int _Py_atomic_load_32bit(volatile int* value, int order) {
477477
break;
478478
}
479479
}
480-
return old;
480+
return old;
481481
}
482482

483483
#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
484484
if (sizeof(*ATOMIC_VAL._value) == 8) { \
485485
_Py_atomic_store_64bit(ATOMIC_VAL._value, NEW_VAL, ORDER) } else { \
486-
_Py_atomic_store_32bit(ATOMIC_VAL._value, NEW_VAL, ORDER) }
486+
_Py_atomic_store_32bit(ATOMIC_VAL._value, NEW_VAL, ORDER) }
487487

488488
#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
489489
( \

Diff for: ‎Lib/http/server.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ def send_head(self):
717717
fs.st_mtime, datetime.timezone.utc)
718718
# remove microseconds, like in If-Modified-Since
719719
last_modif = last_modif.replace(microsecond=0)
720-
720+
721721
if last_modif <= ims:
722722
self.send_response(HTTPStatus.NOT_MODIFIED)
723723
self.end_headers()
@@ -727,7 +727,7 @@ def send_head(self):
727727
self.send_response(HTTPStatus.OK)
728728
self.send_header("Content-type", ctype)
729729
self.send_header("Content-Length", str(fs[6]))
730-
self.send_header("Last-Modified",
730+
self.send_header("Last-Modified",
731731
self.date_time_string(fs.st_mtime))
732732
self.end_headers()
733733
return f

Diff for: ‎Lib/idlelib/ChangeLog

+28-28
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ IDLEfork ChangeLog
2727

2828
* INSTALLATION, setup.py: INSTALLATION: Remove the coexist.patch
2929
instructions
30-
30+
3131
**************** setup.py:
32-
32+
3333
Remove the idles script, add some words on IDLE Fork to the
3434
long_description, and clean up some line spacing.
3535

@@ -42,30 +42,30 @@ IDLEfork ChangeLog
4242
* PyShell.py, idle, idles: Implement idle command interface as
4343
suggested by GvR [idle-dev] 16 July **************** PyShell: Added
4444
functionality:
45-
45+
4646
usage: idle.py [-c command] [-d] [-i] [-r script] [-s] [-t title]
4747
[arg] ...
48-
48+
4949
idle file(s) (without options) edit the file(s)
50-
50+
5151
-c cmd run the command in a shell -d enable the
5252
debugger -i open an interactive shell -i file(s) open a
5353
shell and also an editor window for each file -r script run a file
5454
as a script in a shell -s run $IDLESTARTUP or
5555
$PYTHONSTARTUP before anything else -t title set title of shell
5656
window
57-
57+
5858
Remaining arguments are applied to the command (-c) or script (-r).
59-
59+
6060
****************** idles: Removed the idles script, not needed
61-
61+
6262
****************** idle: Removed the IdleConf references, not
6363
required anymore
6464

6565
2001-07-16 17:08 kbk
6666

6767
* INSTALLATION, coexist.patch: Added installation instructions.
68-
68+
6969
Added a patch which modifies idlefork so that it can co-exist with
7070
"official" IDLE in the site-packages directory. This patch is not
7171
necessary if only idlefork IDLE is installed. See INSTALLATION for
@@ -74,7 +74,7 @@ IDLEfork ChangeLog
7474
2001-07-16 15:50 kbk
7575

7676
* idles: Add a script "idles" which opens a Python Shell window.
77-
77+
7878
The default behaviour of idlefork idle is to open an editor window
7979
instead of a shell. Complex expressions may be run in a fresh
8080
environment by selecting "run". There are times, however, when a
@@ -90,7 +90,7 @@ IDLEfork ChangeLog
9090

9191
* PyShell.py, setup.py: Add a script "idles" which opens a Python
9292
Shell window.
93-
93+
9494
The default behaviour of idlefork idle is to open an editor window
9595
instead of a shell. Complex expressions may be run in a fresh
9696
environment by selecting "run". There are times, however, when a
@@ -110,21 +110,21 @@ IDLEfork ChangeLog
110110

111111
* setup.py: Installing Idle to site-packages via Distutils does not
112112
copy the Idle help.txt file.
113-
113+
114114
Ref SF Python Patch 422471
115115

116116
2001-07-14 15:26 kbk
117117

118118
* keydefs.py: py-cvs-2001_07_13 (Rev 1.3) merge
119-
119+
120120
"Make copy, cut and paste events case insensitive. Reported by
121121
Patrick K. O'Brien on idle-dev. (Should other bindings follow
122122
suit?)" --GvR
123123

124124
2001-07-14 15:21 kbk
125125

126126
* idle.py: py-cvs-2001_07_13 (Rev 1.4) merge
127-
127+
128128
"Move the action of loading the configuration to the IdleConf
129129
module rather than the idle.py script. This has advantages and
130130
disadvantages; the biggest advantage being that we can more easily
@@ -133,21 +133,21 @@ IDLEfork ChangeLog
133133
2001-07-14 15:18 kbk
134134

135135
* extend.txt: py-cvs-2001_07_13 (Rev 1.4) merge
136-
136+
137137
"Quick update to the extension mechanism (extend.py is gone, long
138138
live config.txt)" --GvR
139139

140140
2001-07-14 15:15 kbk
141141

142142
* StackViewer.py: py-cvs-2001_07_13 (Rev 1.16) merge
143-
143+
144144
"Refactored, with some future plans in mind. This now uses the new
145145
gotofileline() method defined in FileList.py" --GvR
146146

147147
2001-07-14 15:10 kbk
148148

149149
* PyShell.py: py-cvs-2001_07_13 (Rev 1.34) merge
150-
150+
151151
"Amazing. A very subtle change in policy in descr-branch actually
152152
found a bug here. Here's the deal: Class PyShell derives from
153153
class OutputWindow. Method PyShell.close() wants to invoke its
@@ -166,19 +166,19 @@ IDLEfork ChangeLog
166166
2001-07-14 14:59 kbk
167167

168168
* PyParse.py: py-cvs-2001_07_13 (Rel 1.9) merge
169-
169+
170170
"Taught IDLE's autoident parser that "yield" is a keyword that
171171
begins a stmt. Along w/ the preceding change to keyword.py, making
172172
all this work w/ a future-stmt just looks harder and harder."
173173
--tim_one
174-
174+
175175
(From Rel 1.8: "Hack to make this still work with Python 1.5.2.
176176
;-( " --fdrake)
177177

178178
2001-07-14 14:51 kbk
179179

180180
* IdleConf.py: py-cvs-2001_07_13 (Rel 1.7) merge
181-
181+
182182
"Move the action of loading the configuration to the IdleConf
183183
module rather than the idle.py script. This has advantages and
184184
disadvantages; the biggest advantage being that we can more easily
@@ -187,11 +187,11 @@ IDLEfork ChangeLog
187187
2001-07-14 14:45 kbk
188188

189189
* FileList.py: py-cvs-2000_07_13 (Rev 1.9) merge
190-
190+
191191
"Delete goodname() method, which is unused. Add gotofileline(), a
192192
convenience method which I intend to use in a variant. Rename
193193
test() to _test()." --GvR
194-
194+
195195
This was an interesting merge. The join completely missed removing
196196
goodname(), which was adjacent, but outside of, a small conflict.
197197
I only caught it by comparing the 1.1.3.2/1.1.3.3 diff. CVS ain't
@@ -245,13 +245,13 @@ IDLEfork ChangeLog
245245
2001-07-14 10:13 kbk
246246

247247
* PyShell.py: cvs-py-rel2_1 (Rev 1.29 - 1.33) merge
248-
248+
249249
Merged the following py-cvs revs without conflict: 1.29 Reduce
250250
copyright text output at startup 1.30 Delay setting sys.args until
251251
Tkinter is fully initialized 1.31 Whitespace normalization 1.32
252252
Turn syntax warning into error when interactive 1.33 Fix warning
253253
initialization bug
254-
254+
255255
Note that module is extensively modified wrt py-cvs
256256

257257
2001-07-14 06:33 kbk
@@ -317,14 +317,14 @@ IDLEfork ChangeLog
317317
2001-07-13 13:35 kbk
318318

319319
* EditorWindow.py: py-cvs-rel2_1 (Rev 1.33 - 1.37) merge
320-
320+
321321
VP IDLE version depended on VP's ExecBinding.py and spawn.py to get
322322
the path to the Windows Doc directory (relative to python.exe).
323323
Removed this conflicting code in favor of py-cvs updates which on
324324
Windows use a hard coded path relative to the location of this
325325
module. py-cvs updates include support for webbrowser.py. Module
326326
still has BrowserControl.py for 1.5.2 support.
327-
327+
328328
At this point, the differences wrt py-cvs relate to menu
329329
functionality.
330330

@@ -1194,7 +1194,7 @@ Wed Mar 10 05:18:02 1999 Guido van Rossum <guido@cnri.reston.va.us>
11941194
======================================================================
11951195
Python release 1.5.2b2, IDLE version 0.3
11961196
======================================================================
1197-
1197+
11981198
Wed Feb 17 22:47:41 1999 Guido van Rossum <guido@cnri.reston.va.us>
11991199

12001200
* NEWS.txt: News in 0.3.
@@ -1330,7 +1330,7 @@ Sat Jan 9 22:01:33 1999 Guido van Rossum <guido@cnri.reston.va.us>
13301330
======================================================================
13311331
Python release 1.5.2b1, IDLE version 0.2
13321332
======================================================================
1333-
1333+
13341334
Fri Jan 8 17:26:02 1999 Guido van Rossum <guido@cnri.reston.va.us>
13351335

13361336
* README.txt, NEWS.txt: What's new in this release.

Diff for: ‎Lib/idlelib/README.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ Window
206206
<open windows> # windows
207207

208208
Help
209-
About IDLE # eEW.about_dialog, help_about.AboutDialog
209+
About IDLE # eEW.about_dialog, help_about.AboutDialog
210210
---
211211
IDLE Help # eEW.help_dialog, helpshow_idlehelp
212212
Python Doc # eEW.python_docs
@@ -230,7 +230,7 @@ Help
230230
<No menu>
231231
Center Insert # eEW.center_insert_event
232232

233-
233+
234234
CODE STYLE -- Generally PEP 8.
235235

236236
import

Diff for: ‎Lib/idlelib/idle_test/README.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ python -m idlelib.idle_test.htest
164164
5. Test Coverage
165165

166166
Install the coverage package into your Python 3.6 site-packages
167-
directory. (Its exact location depends on the OS).
167+
directory. (Its exact location depends on the OS).
168168
> python3 -m pip install coverage
169169
(On Windows, replace 'python3 with 'py -3.6' or perhaps just 'python'.)
170170

Diff for: ‎Lib/test/dtracedata/call_stack.d

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ python$target:::function-entry
1010
/self->trace/
1111
{
1212
printf("%d\t%*s:", timestamp, 15, probename);
13-
printf("%*s", self->indent, "");
13+
printf("%*s", self->indent, "");
1414
printf("%s:%s:%d\n", basename(copyinstr(arg0)), copyinstr(arg1), arg2);
1515
self->indent++;
1616
}
@@ -20,7 +20,7 @@ python$target:::function-return
2020
{
2121
self->indent--;
2222
printf("%d\t%*s:", timestamp, 15, probename);
23-
printf("%*s", self->indent, "");
23+
printf("%*s", self->indent, "");
2424
printf("%s:%s:%d\n", basename(copyinstr(arg0)), copyinstr(arg1), arg2);
2525
}
2626

Diff for: ‎Lib/test/test_inspect.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2018,7 +2018,7 @@ def test_staticmethod(*args): # NOQA
20182018
((('args', ..., ..., 'var_positional'),), ...))
20192019
self.assertEqual(self.signature(A.f3),
20202020
((('args', ..., ..., 'var_positional'),), ...))
2021-
self.assertEqual(self.signature(A.f4),
2021+
self.assertEqual(self.signature(A.f4),
20222022
((('args', ..., ..., 'var_positional'),
20232023
('kwargs', ..., ..., 'var_keyword')), ...))
20242024
@cpython_only

Diff for: ‎Lib/test/tokenize_tests-latin1-coding-cookie-and-utf8-bom-sig.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: latin1 -*-
2-
# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf'
2+
# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf'
33
# at the start of it. Make sure this is preserved if any changes
44
# are made! Also note that the coding cookie above conflicts with
55
# the presence of a utf-8 BOM signature -- this is intended.

Diff for: ‎Lib/test/tokenize_tests-no-coding-cookie-and-utf8-bom-sig-only.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf'
1+
# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf'
22
# at the start of it. Make sure this is preserved if any changes
33
# are made!
44

Diff for: ‎Lib/test/tokenize_tests-utf8-coding-cookie-and-utf8-bom-sig.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf'
2+
# IMPORTANT: this file has the utf-8 BOM signature '\xef\xbb\xbf'
33
# at the start of it. Make sure this is preserved if any changes
44
# are made!
55

Diff for: ‎Lib/test/tokenize_tests.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Tests for the 'tokenize' module.
2-
# Large bits stolen from test_grammar.py.
2+
# Large bits stolen from test_grammar.py.
33

44
# Comments
55
"#"

Diff for: ‎Lib/venv/scripts/posix/activate.fish

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
5252
set -l old_status $status
5353

5454
# Prompt override?
55-
if test -n "__VENV_PROMPT__"
55+
if test -n "__VENV_PROMPT__"
5656
printf "%s%s" "__VENV_PROMPT__" (set_color normal)
5757
else
5858
# ...Otherwise, prepend env

0 commit comments

Comments
 (0)