bpo-31462: Remove trailing whitespaces. (#3564)

This commit is contained in:
Serhiy Storchaka 2017-09-14 09:38:36 +03:00 committed by GitHub
parent 312ffead1e
commit 13ad3b7a82
21 changed files with 62 additions and 62 deletions

View File

@ -11,7 +11,7 @@
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include <intrin.h> #include <intrin.h>
#include <immintrin.h> #include <immintrin.h>
#endif #endif
@ -223,7 +223,7 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
result; \ result; \
}) })
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
/* _Interlocked* functions provide a full memory barrier and are therefore /* _Interlocked* functions provide a full memory barrier and are therefore
enough for acq_rel and seq_cst. If the HLE variants aren't available enough for acq_rel and seq_cst. If the HLE variants aren't available
in hardware they will fall back to a full memory barrier as well. in hardware they will fall back to a full memory barrier as well.
@ -249,7 +249,7 @@ typedef struct _Py_atomic_int {
} _Py_atomic_int; } _Py_atomic_int;
#if defined(_M_X64) #if defined(_M_X64)
#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \ #define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \
switch (ORDER) { \ switch (ORDER) { \
case _Py_memory_order_acquire: \ case _Py_memory_order_acquire: \
@ -312,7 +312,7 @@ inline intptr_t _Py_atomic_load_64bit(volatile uintptr_t* value, int order) {
break; break;
} }
} }
return old; return old;
} }
#else #else
@ -347,7 +347,7 @@ inline int _Py_atomic_load_32bit(volatile int* value, int order) {
break; break;
} }
} }
return old; return old;
} }
#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \ #define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
@ -379,7 +379,7 @@ typedef struct _Py_atomic_int {
} _Py_atomic_int; } _Py_atomic_int;
#if defined(_M_ARM64) #if defined(_M_ARM64)
#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \ #define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \
switch (ORDER) { \ switch (ORDER) { \
case _Py_memory_order_acquire: \ case _Py_memory_order_acquire: \
@ -442,7 +442,7 @@ inline intptr_t _Py_atomic_load_64bit(volatile uintptr_t* value, int order) {
break; break;
} }
} }
return old; return old;
} }
#else #else
@ -477,13 +477,13 @@ inline int _Py_atomic_load_32bit(volatile int* value, int order) {
break; break;
} }
} }
return old; return old;
} }
#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \ #define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \
if (sizeof(*ATOMIC_VAL._value) == 8) { \ if (sizeof(*ATOMIC_VAL._value) == 8) { \
_Py_atomic_store_64bit(ATOMIC_VAL._value, NEW_VAL, ORDER) } else { \ _Py_atomic_store_64bit(ATOMIC_VAL._value, NEW_VAL, ORDER) } else { \
_Py_atomic_store_32bit(ATOMIC_VAL._value, NEW_VAL, ORDER) } _Py_atomic_store_32bit(ATOMIC_VAL._value, NEW_VAL, ORDER) }
#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \ #define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \
( \ ( \

View File

@ -717,7 +717,7 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
fs.st_mtime, datetime.timezone.utc) fs.st_mtime, datetime.timezone.utc)
# remove microseconds, like in If-Modified-Since # remove microseconds, like in If-Modified-Since
last_modif = last_modif.replace(microsecond=0) last_modif = last_modif.replace(microsecond=0)
if last_modif <= ims: if last_modif <= ims:
self.send_response(HTTPStatus.NOT_MODIFIED) self.send_response(HTTPStatus.NOT_MODIFIED)
self.end_headers() self.end_headers()
@ -727,7 +727,7 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
self.send_response(HTTPStatus.OK) self.send_response(HTTPStatus.OK)
self.send_header("Content-type", ctype) self.send_header("Content-type", ctype)
self.send_header("Content-Length", str(fs[6])) self.send_header("Content-Length", str(fs[6]))
self.send_header("Last-Modified", self.send_header("Last-Modified",
self.date_time_string(fs.st_mtime)) self.date_time_string(fs.st_mtime))
self.end_headers() self.end_headers()
return f return f

View File

@ -27,9 +27,9 @@ IDLEfork ChangeLog
* INSTALLATION, setup.py: INSTALLATION: Remove the coexist.patch * INSTALLATION, setup.py: INSTALLATION: Remove the coexist.patch
instructions instructions
**************** setup.py: **************** setup.py:
Remove the idles script, add some words on IDLE Fork to the Remove the idles script, add some words on IDLE Fork to the
long_description, and clean up some line spacing. long_description, and clean up some line spacing.
@ -42,30 +42,30 @@ IDLEfork ChangeLog
* PyShell.py, idle, idles: Implement idle command interface as * PyShell.py, idle, idles: Implement idle command interface as
suggested by GvR [idle-dev] 16 July **************** PyShell: Added suggested by GvR [idle-dev] 16 July **************** PyShell: Added
functionality: functionality:
usage: idle.py [-c command] [-d] [-i] [-r script] [-s] [-t title] usage: idle.py [-c command] [-d] [-i] [-r script] [-s] [-t title]
[arg] ... [arg] ...
idle file(s) (without options) edit the file(s) idle file(s) (without options) edit the file(s)
-c cmd run the command in a shell -d enable the -c cmd run the command in a shell -d enable the
debugger -i open an interactive shell -i file(s) open a debugger -i open an interactive shell -i file(s) open a
shell and also an editor window for each file -r script run a file shell and also an editor window for each file -r script run a file
as a script in a shell -s run $IDLESTARTUP or as a script in a shell -s run $IDLESTARTUP or
$PYTHONSTARTUP before anything else -t title set title of shell $PYTHONSTARTUP before anything else -t title set title of shell
window window
Remaining arguments are applied to the command (-c) or script (-r). Remaining arguments are applied to the command (-c) or script (-r).
****************** idles: Removed the idles script, not needed ****************** idles: Removed the idles script, not needed
****************** idle: Removed the IdleConf references, not ****************** idle: Removed the IdleConf references, not
required anymore required anymore
2001-07-16 17:08 kbk 2001-07-16 17:08 kbk
* INSTALLATION, coexist.patch: Added installation instructions. * INSTALLATION, coexist.patch: Added installation instructions.
Added a patch which modifies idlefork so that it can co-exist with Added a patch which modifies idlefork so that it can co-exist with
"official" IDLE in the site-packages directory. This patch is not "official" IDLE in the site-packages directory. This patch is not
necessary if only idlefork IDLE is installed. See INSTALLATION for necessary if only idlefork IDLE is installed. See INSTALLATION for
@ -74,7 +74,7 @@ IDLEfork ChangeLog
2001-07-16 15:50 kbk 2001-07-16 15:50 kbk
* idles: Add a script "idles" which opens a Python Shell window. * idles: Add a script "idles" which opens a Python Shell window.
The default behaviour of idlefork idle is to open an editor window The default behaviour of idlefork idle is to open an editor window
instead of a shell. Complex expressions may be run in a fresh instead of a shell. Complex expressions may be run in a fresh
environment by selecting "run". There are times, however, when a environment by selecting "run". There are times, however, when a
@ -90,7 +90,7 @@ IDLEfork ChangeLog
* PyShell.py, setup.py: Add a script "idles" which opens a Python * PyShell.py, setup.py: Add a script "idles" which opens a Python
Shell window. Shell window.
The default behaviour of idlefork idle is to open an editor window The default behaviour of idlefork idle is to open an editor window
instead of a shell. Complex expressions may be run in a fresh instead of a shell. Complex expressions may be run in a fresh
environment by selecting "run". There are times, however, when a environment by selecting "run". There are times, however, when a
@ -110,13 +110,13 @@ IDLEfork ChangeLog
* setup.py: Installing Idle to site-packages via Distutils does not * setup.py: Installing Idle to site-packages via Distutils does not
copy the Idle help.txt file. copy the Idle help.txt file.
Ref SF Python Patch 422471 Ref SF Python Patch 422471
2001-07-14 15:26 kbk 2001-07-14 15:26 kbk
* keydefs.py: py-cvs-2001_07_13 (Rev 1.3) merge * keydefs.py: py-cvs-2001_07_13 (Rev 1.3) merge
"Make copy, cut and paste events case insensitive. Reported by "Make copy, cut and paste events case insensitive. Reported by
Patrick K. O'Brien on idle-dev. (Should other bindings follow Patrick K. O'Brien on idle-dev. (Should other bindings follow
suit?)" --GvR suit?)" --GvR
@ -124,7 +124,7 @@ IDLEfork ChangeLog
2001-07-14 15:21 kbk 2001-07-14 15:21 kbk
* idle.py: py-cvs-2001_07_13 (Rev 1.4) merge * idle.py: py-cvs-2001_07_13 (Rev 1.4) merge
"Move the action of loading the configuration to the IdleConf "Move the action of loading the configuration to the IdleConf
module rather than the idle.py script. This has advantages and module rather than the idle.py script. This has advantages and
disadvantages; the biggest advantage being that we can more easily disadvantages; the biggest advantage being that we can more easily
@ -133,21 +133,21 @@ IDLEfork ChangeLog
2001-07-14 15:18 kbk 2001-07-14 15:18 kbk
* extend.txt: py-cvs-2001_07_13 (Rev 1.4) merge * extend.txt: py-cvs-2001_07_13 (Rev 1.4) merge
"Quick update to the extension mechanism (extend.py is gone, long "Quick update to the extension mechanism (extend.py is gone, long
live config.txt)" --GvR live config.txt)" --GvR
2001-07-14 15:15 kbk 2001-07-14 15:15 kbk
* StackViewer.py: py-cvs-2001_07_13 (Rev 1.16) merge * StackViewer.py: py-cvs-2001_07_13 (Rev 1.16) merge
"Refactored, with some future plans in mind. This now uses the new "Refactored, with some future plans in mind. This now uses the new
gotofileline() method defined in FileList.py" --GvR gotofileline() method defined in FileList.py" --GvR
2001-07-14 15:10 kbk 2001-07-14 15:10 kbk
* PyShell.py: py-cvs-2001_07_13 (Rev 1.34) merge * PyShell.py: py-cvs-2001_07_13 (Rev 1.34) merge
"Amazing. A very subtle change in policy in descr-branch actually "Amazing. A very subtle change in policy in descr-branch actually
found a bug here. Here's the deal: Class PyShell derives from found a bug here. Here's the deal: Class PyShell derives from
class OutputWindow. Method PyShell.close() wants to invoke its class OutputWindow. Method PyShell.close() wants to invoke its
@ -166,19 +166,19 @@ IDLEfork ChangeLog
2001-07-14 14:59 kbk 2001-07-14 14:59 kbk
* PyParse.py: py-cvs-2001_07_13 (Rel 1.9) merge * PyParse.py: py-cvs-2001_07_13 (Rel 1.9) merge
"Taught IDLE's autoident parser that "yield" is a keyword that "Taught IDLE's autoident parser that "yield" is a keyword that
begins a stmt. Along w/ the preceding change to keyword.py, making begins a stmt. Along w/ the preceding change to keyword.py, making
all this work w/ a future-stmt just looks harder and harder." all this work w/ a future-stmt just looks harder and harder."
--tim_one --tim_one
(From Rel 1.8: "Hack to make this still work with Python 1.5.2. (From Rel 1.8: "Hack to make this still work with Python 1.5.2.
;-( " --fdrake) ;-( " --fdrake)
2001-07-14 14:51 kbk 2001-07-14 14:51 kbk
* IdleConf.py: py-cvs-2001_07_13 (Rel 1.7) merge * IdleConf.py: py-cvs-2001_07_13 (Rel 1.7) merge
"Move the action of loading the configuration to the IdleConf "Move the action of loading the configuration to the IdleConf
module rather than the idle.py script. This has advantages and module rather than the idle.py script. This has advantages and
disadvantages; the biggest advantage being that we can more easily disadvantages; the biggest advantage being that we can more easily
@ -187,11 +187,11 @@ IDLEfork ChangeLog
2001-07-14 14:45 kbk 2001-07-14 14:45 kbk
* FileList.py: py-cvs-2000_07_13 (Rev 1.9) merge * FileList.py: py-cvs-2000_07_13 (Rev 1.9) merge
"Delete goodname() method, which is unused. Add gotofileline(), a "Delete goodname() method, which is unused. Add gotofileline(), a
convenience method which I intend to use in a variant. Rename convenience method which I intend to use in a variant. Rename
test() to _test()." --GvR test() to _test()." --GvR
This was an interesting merge. The join completely missed removing This was an interesting merge. The join completely missed removing
goodname(), which was adjacent, but outside of, a small conflict. goodname(), which was adjacent, but outside of, a small conflict.
I only caught it by comparing the 1.1.3.2/1.1.3.3 diff. CVS ain't 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
2001-07-14 10:13 kbk 2001-07-14 10:13 kbk
* PyShell.py: cvs-py-rel2_1 (Rev 1.29 - 1.33) merge * PyShell.py: cvs-py-rel2_1 (Rev 1.29 - 1.33) merge
Merged the following py-cvs revs without conflict: 1.29 Reduce Merged the following py-cvs revs without conflict: 1.29 Reduce
copyright text output at startup 1.30 Delay setting sys.args until copyright text output at startup 1.30 Delay setting sys.args until
Tkinter is fully initialized 1.31 Whitespace normalization 1.32 Tkinter is fully initialized 1.31 Whitespace normalization 1.32
Turn syntax warning into error when interactive 1.33 Fix warning Turn syntax warning into error when interactive 1.33 Fix warning
initialization bug initialization bug
Note that module is extensively modified wrt py-cvs Note that module is extensively modified wrt py-cvs
2001-07-14 06:33 kbk 2001-07-14 06:33 kbk
@ -317,14 +317,14 @@ IDLEfork ChangeLog
2001-07-13 13:35 kbk 2001-07-13 13:35 kbk
* EditorWindow.py: py-cvs-rel2_1 (Rev 1.33 - 1.37) merge * EditorWindow.py: py-cvs-rel2_1 (Rev 1.33 - 1.37) merge
VP IDLE version depended on VP's ExecBinding.py and spawn.py to get VP IDLE version depended on VP's ExecBinding.py and spawn.py to get
the path to the Windows Doc directory (relative to python.exe). the path to the Windows Doc directory (relative to python.exe).
Removed this conflicting code in favor of py-cvs updates which on Removed this conflicting code in favor of py-cvs updates which on
Windows use a hard coded path relative to the location of this Windows use a hard coded path relative to the location of this
module. py-cvs updates include support for webbrowser.py. Module module. py-cvs updates include support for webbrowser.py. Module
still has BrowserControl.py for 1.5.2 support. still has BrowserControl.py for 1.5.2 support.
At this point, the differences wrt py-cvs relate to menu At this point, the differences wrt py-cvs relate to menu
functionality. functionality.
@ -1194,7 +1194,7 @@ Wed Mar 10 05:18:02 1999 Guido van Rossum <guido@cnri.reston.va.us>
====================================================================== ======================================================================
Python release 1.5.2b2, IDLE version 0.3 Python release 1.5.2b2, IDLE version 0.3
====================================================================== ======================================================================
Wed Feb 17 22:47:41 1999 Guido van Rossum <guido@cnri.reston.va.us> Wed Feb 17 22:47:41 1999 Guido van Rossum <guido@cnri.reston.va.us>
* NEWS.txt: News in 0.3. * 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>
====================================================================== ======================================================================
Python release 1.5.2b1, IDLE version 0.2 Python release 1.5.2b1, IDLE version 0.2
====================================================================== ======================================================================
Fri Jan 8 17:26:02 1999 Guido van Rossum <guido@cnri.reston.va.us> Fri Jan 8 17:26:02 1999 Guido van Rossum <guido@cnri.reston.va.us>
* README.txt, NEWS.txt: What's new in this release. * README.txt, NEWS.txt: What's new in this release.

View File

@ -206,7 +206,7 @@ Window
<open windows> # windows <open windows> # windows
Help Help
About IDLE # eEW.about_dialog, help_about.AboutDialog About IDLE # eEW.about_dialog, help_about.AboutDialog
--- ---
IDLE Help # eEW.help_dialog, helpshow_idlehelp IDLE Help # eEW.help_dialog, helpshow_idlehelp
Python Doc # eEW.python_docs Python Doc # eEW.python_docs
@ -230,7 +230,7 @@ Help
<No menu> <No menu>
Center Insert # eEW.center_insert_event Center Insert # eEW.center_insert_event
CODE STYLE -- Generally PEP 8. CODE STYLE -- Generally PEP 8.
import import

View File

@ -164,7 +164,7 @@ python -m idlelib.idle_test.htest
5. Test Coverage 5. Test Coverage
Install the coverage package into your Python 3.6 site-packages Install the coverage package into your Python 3.6 site-packages
directory. (Its exact location depends on the OS). directory. (Its exact location depends on the OS).
> python3 -m pip install coverage > python3 -m pip install coverage
(On Windows, replace 'python3 with 'py -3.6' or perhaps just 'python'.) (On Windows, replace 'python3 with 'py -3.6' or perhaps just 'python'.)

View File

@ -10,7 +10,7 @@ python$target:::function-entry
/self->trace/ /self->trace/
{ {
printf("%d\t%*s:", timestamp, 15, probename); printf("%d\t%*s:", timestamp, 15, probename);
printf("%*s", self->indent, ""); printf("%*s", self->indent, "");
printf("%s:%s:%d\n", basename(copyinstr(arg0)), copyinstr(arg1), arg2); printf("%s:%s:%d\n", basename(copyinstr(arg0)), copyinstr(arg1), arg2);
self->indent++; self->indent++;
} }
@ -20,7 +20,7 @@ python$target:::function-return
{ {
self->indent--; self->indent--;
printf("%d\t%*s:", timestamp, 15, probename); printf("%d\t%*s:", timestamp, 15, probename);
printf("%*s", self->indent, ""); printf("%*s", self->indent, "");
printf("%s:%s:%d\n", basename(copyinstr(arg0)), copyinstr(arg1), arg2); printf("%s:%s:%d\n", basename(copyinstr(arg0)), copyinstr(arg1), arg2);
} }

View File

@ -2018,7 +2018,7 @@ class TestSignatureObject(unittest.TestCase):
((('args', ..., ..., 'var_positional'),), ...)) ((('args', ..., ..., 'var_positional'),), ...))
self.assertEqual(self.signature(A.f3), self.assertEqual(self.signature(A.f3),
((('args', ..., ..., 'var_positional'),), ...)) ((('args', ..., ..., 'var_positional'),), ...))
self.assertEqual(self.signature(A.f4), self.assertEqual(self.signature(A.f4),
((('args', ..., ..., 'var_positional'), ((('args', ..., ..., 'var_positional'),
('kwargs', ..., ..., 'var_keyword')), ...)) ('kwargs', ..., ..., 'var_keyword')), ...))
@cpython_only @cpython_only

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
# Tests for the 'tokenize' module. # Tests for the 'tokenize' module.
# Large bits stolen from test_grammar.py. # Large bits stolen from test_grammar.py.
# Comments # Comments
"#" "#"

View File

@ -52,7 +52,7 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
set -l old_status $status set -l old_status $status
# Prompt override? # Prompt override?
if test -n "__VENV_PROMPT__" if test -n "__VENV_PROMPT__"
printf "%s%s" "__VENV_PROMPT__" (set_color normal) printf "%s%s" "__VENV_PROMPT__" (set_color normal)
else else
# ...Otherwise, prepend env # ...Otherwise, prepend env

View File

@ -26,7 +26,7 @@
* http://lxr.mozilla.org/seamonkey/source/modules/libimg/png/mozpngconf.h#115 * http://lxr.mozilla.org/seamonkey/source/modules/libimg/png/mozpngconf.h#115
* *
* The list of relevant exported symbols can be had with this command: * The list of relevant exported symbols can be had with this command:
* *
nm pyexpat.so \ nm pyexpat.so \
| grep -v " [a-zBUA] " \ | grep -v " [a-zBUA] " \
| grep -v "_fini\|_init\|initpyexpat" | grep -v "_fini\|_init\|initpyexpat"

View File

@ -199,7 +199,7 @@ typedef union sock_addr {
#ifdef HAVE_SOCKADDR_ALG #ifdef HAVE_SOCKADDR_ALG
struct sockaddr_alg alg; struct sockaddr_alg alg;
#endif #endif
#ifdef AF_VSOCK #ifdef AF_VSOCK
struct sockaddr_vm vm; struct sockaddr_vm vm;
#endif #endif
} sock_addr_t; } sock_addr_t;

View File

@ -151,7 +151,7 @@ cell_set_contents(PyCellObject *op, PyObject *obj)
} }
static PyGetSetDef cell_getsetlist[] = { static PyGetSetDef cell_getsetlist[] = {
{"cell_contents", (getter)cell_get_contents, {"cell_contents", (getter)cell_get_contents,
(setter)cell_set_contents, NULL}, (setter)cell_set_contents, NULL},
{NULL} /* sentinel */ {NULL} /* sentinel */
}; };

View File

@ -23,7 +23,7 @@
Unlike the dictionary implementation, the lookkey function can return Unlike the dictionary implementation, the lookkey function can return
NULL if the rich comparison returns an error. NULL if the rich comparison returns an error.
Use cases for sets differ considerably from dictionaries where looked-up Use cases for sets differ considerably from dictionaries where looked-up
keys are more likely to be present. In contrast, sets are primarily keys are more likely to be present. In contrast, sets are primarily
about membership testing where the presence of an element is not known in about membership testing where the presence of an element is not known in

View File

@ -46,7 +46,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file,
/*[clinic end generated code: output=48f9563db34aedb3 input=4c774f2d05770bc6]*/ /*[clinic end generated code: output=48f9563db34aedb3 input=4c774f2d05770bc6]*/
{ {
INPUT_RECORD *rec = NULL; INPUT_RECORD *rec = NULL;
if (!PyWindowsConsoleIO_Check(file)) { if (!PyWindowsConsoleIO_Check(file)) {
PyErr_SetString(PyExc_TypeError, "expected raw console object"); PyErr_SetString(PyExc_TypeError, "expected raw console object");
return NULL; return NULL;
@ -59,7 +59,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file,
if (!rec) if (!rec)
goto error; goto error;
memset(rec, 0, sizeof(INPUT_RECORD) * size); memset(rec, 0, sizeof(INPUT_RECORD) * size);
INPUT_RECORD *prec = rec; INPUT_RECORD *prec = rec;
for (DWORD i = 0; i < size; ++i, ++p, ++prec) { for (DWORD i = 0; i < size; ++i, ++p, ++prec) {
prec->EventType = KEY_EVENT; prec->EventType = KEY_EVENT;
@ -80,7 +80,7 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file,
} }
PyMem_Free((void*)rec); PyMem_Free((void*)rec);
Py_RETURN_NONE; Py_RETURN_NONE;
error: error:
if (rec) if (rec)

View File

@ -359,7 +359,7 @@ msvcrt_ungetch_impl(PyObject *module, char char_value)
/*[clinic end generated code: output=c6942a0efa119000 input=22f07ee9001bbf0f]*/ /*[clinic end generated code: output=c6942a0efa119000 input=22f07ee9001bbf0f]*/
{ {
int res; int res;
_Py_BEGIN_SUPPRESS_IPH _Py_BEGIN_SUPPRESS_IPH
res = _ungetch(char_value); res = _ungetch(char_value);
_Py_END_SUPPRESS_IPH _Py_END_SUPPRESS_IPH

View File

@ -127,7 +127,7 @@ static int test_forced_io_encoding(void)
/* ********************************************************* /* *********************************************************
* List of test cases and the function that implements it. * List of test cases and the function that implements it.
* *
* Names are compared case-sensitively with the first * Names are compared case-sensitively with the first
* argument. If no match is found, or no first argument was * argument. If no match is found, or no first argument was
* provided, the names of all test cases are printed and * provided, the names of all test cases are printed and
@ -135,7 +135,7 @@ static int test_forced_io_encoding(void)
* *
* The int returned from test functions is used as the exit * The int returned from test functions is used as the exit
* code, and test_capi treats all non-zero exit codes as a * code, and test_capi treats all non-zero exit codes as a
* failed test. * failed test.
*********************************************************/ *********************************************************/
struct TestCase struct TestCase
{ {

View File

@ -8,4 +8,4 @@ test:
$(PYTHON) ../freeze.py -o $(OUTDIR) ok.py $(PYTHON) ../freeze.py -o $(OUTDIR) ok.py
make -C $(OUTDIR) make -C $(OUTDIR)
$(OUTDIR)/ok $(OUTDIR)/ok

2
aclocal.m4 vendored
View File

@ -170,7 +170,7 @@ if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED _PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi fi
# Put the nasty error message in config.log where it belongs # Put the nasty error message in config.log where it belongs