Skip to content

Commit

Permalink
[3.10] Remove trailing spaces (GH-28709)
Browse files Browse the repository at this point in the history
  • Loading branch information
serhiy-storchaka authored and pablogsal committed Oct 3, 2021
1 parent 2c47b80 commit edf190b
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Include/internal/pycore_code.h
Expand Up @@ -3,7 +3,7 @@
#ifdef __cplusplus
extern "C" {
#endif

typedef struct {
PyObject *ptr; /* Cached pointer (borrowed reference) */
uint64_t globals_ver; /* ma_version of global dict */
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_syntax.py
Expand Up @@ -1298,7 +1298,7 @@ def _check_error(self, code, errtext,
self.assertEqual(err.end_lineno, end_lineno)
if end_offset is not None:
self.assertEqual(err.end_offset, end_offset)

else:
self.fail("compile() did not raise SyntaxError")

Expand Down Expand Up @@ -1438,7 +1438,7 @@ def test_kwargs_last3(self):
self._check_error("int(**{'base': 10}, *['2'])",
"iterable argument unpacking follows "
"keyword argument unpacking")

def test_generator_in_function_call(self):
self._check_error("foo(x, y for y in range(3) for z in range(2) if z , p)",
"Generator expression must be parenthesized",
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_time.py
Expand Up @@ -1062,7 +1062,7 @@ def test_clock_functions(self):
clock_names = [
"CLOCK_MONOTONIC", "clock_gettime", "clock_gettime_ns", "clock_settime",
"clock_settime_ns", "clock_getres"]

if mac_ver >= (10, 12):
for name in clock_names:
self.assertTrue(hasattr(time, name), f"time.{name} is not available")
Expand Down
2 changes: 1 addition & 1 deletion Lib/typing.py
Expand Up @@ -99,7 +99,7 @@
'NamedTuple', # Not really a type.
'TypedDict', # Not really a type.
'Generator',

# Other concrete types.
'BinaryIO',
'IO',
Expand Down
2 changes: 1 addition & 1 deletion Modules/_bisectmodule.c
Expand Up @@ -240,7 +240,7 @@ _bisect_insort_left_impl(PyObject *module, PyObject *a, PyObject *x,
{
PyObject *result, *key_x;
Py_ssize_t index;

if (key == Py_None) {
index = internal_bisect_left(a, x, lo, hi, key);
} else {
Expand Down
2 changes: 1 addition & 1 deletion Modules/_ctypes/_ctypes_test.c
Expand Up @@ -1034,7 +1034,7 @@ EXPORT (HRESULT) KeepObject(IUnknown *punk)

static struct PyModuleDef_Slot _ctypes_test_slots[] = {
{0, NULL}
};
};

static struct PyModuleDef _ctypes_testmodule = {
PyModuleDef_HEAD_INIT,
Expand Down
2 changes: 1 addition & 1 deletion Modules/_json.c
Expand Up @@ -321,7 +321,7 @@ raise_errmsg(const char *msg, PyObject *s, Py_ssize_t end)
if (decoder == NULL) {
return;
}

_Py_IDENTIFIER(JSONDecodeError);
PyObject *JSONDecodeError = _PyObject_GetAttrId(decoder, &PyId_JSONDecodeError);
Py_DECREF(decoder);
Expand Down
2 changes: 1 addition & 1 deletion Modules/termios.c
Expand Up @@ -1004,7 +1004,7 @@ static void termiosmodule_free(void *m) {
termiosmodule_clear((PyObject *)m);
}

static int
static int
termios_exec(PyObject *mod)
{
struct constant *constant = termios_constants;
Expand Down
2 changes: 1 addition & 1 deletion Objects/exceptions.c
Expand Up @@ -1503,7 +1503,7 @@ SyntaxError_init(PySyntaxErrorObject *self, PyObject *args, PyObject *kwds)
&self->end_lineno, &self->end_offset)) {
Py_DECREF(info);
return -1;
}
}

Py_INCREF(self->filename);
Py_INCREF(self->lineno);
Expand Down
2 changes: 1 addition & 1 deletion Objects/genericaliasobject.c
Expand Up @@ -576,7 +576,7 @@ static PyGetSetDef ga_properties[] = {
};

/* A helper function to create GenericAlias' args tuple and set its attributes.
* Returns 1 on success, 0 on failure.
* Returns 1 on success, 0 on failure.
*/
static inline int
setup_ga(gaobject *alias, PyObject *origin, PyObject *args) {
Expand Down
2 changes: 1 addition & 1 deletion Objects/obmalloc.c
Expand Up @@ -3035,7 +3035,7 @@ _PyObject_DebugMallocStats(FILE *out)

fputc('\n', out);

/* Account for what all of those arena bytes are being used for. */
/* Account for what all of those arena bytes are being used for. */
total = printone(out, "# bytes in allocated blocks", allocated_bytes);
total += printone(out, "# bytes in available blocks", available_bytes);

Expand Down
2 changes: 1 addition & 1 deletion Parser/tokenizer.h
Expand Up @@ -83,7 +83,7 @@ struct tok_state {
int async_def_nl; /* =1 if the outermost 'async def' had at least one
NEWLINE token after it. */
/* How to proceed when asked for a new token in interactive mode */
enum interactive_underflow_t interactive_underflow;
enum interactive_underflow_t interactive_underflow;
};

extern struct tok_state *PyTokenizer_FromString(const char *, int);
Expand Down
4 changes: 2 additions & 2 deletions Python/bootstrap_hash.c
Expand Up @@ -25,7 +25,7 @@
# include <sanitizer/msan_interface.h>
#endif

#if defined(__APPLE__) && defined(__has_builtin)
#if defined(__APPLE__) && defined(__has_builtin)
# if __has_builtin(__builtin_available)
# define HAVE_GETENTRYPY_GETRANDOM_RUNTIME __builtin_available(macOS 10.12, iOS 10.10, tvOS 10.0, watchOS 3.0, *)
# endif
Expand Down Expand Up @@ -221,7 +221,7 @@ py_getrandom(void *buffer, Py_ssize_t size, int blocking, int raise)

#if defined(__APPLE__) && defined(__has_attribute) && __has_attribute(availability)
static int
py_getentropy(char *buffer, Py_ssize_t size, int raise)
py_getentropy(char *buffer, Py_ssize_t size, int raise)
__attribute__((availability(macos,introduced=10.12)))
__attribute__((availability(ios,introduced=10.0)))
__attribute__((availability(tvos,introduced=10.0)))
Expand Down
2 changes: 1 addition & 1 deletion Tools/c-analyzer/c_parser/_state_machine.py
Expand Up @@ -23,7 +23,7 @@ def parse(srclines):
if isinstance(srclines, str): # a filename
raise NotImplementedError



# This only handles at most 10 nested levels.
#MATCHED_PARENS = textwrap.dedent(rf'''
Expand Down
2 changes: 1 addition & 1 deletion Tools/c-analyzer/c_parser/preprocessor/__init__.py
Expand Up @@ -91,7 +91,7 @@ def get_file_preprocessor(filename):
macros = list(_resolve_file_values(filename, file_macros))
if file_incldirs:
incldirs = [v for v, in _resolve_file_values(filename, file_incldirs)]

def preprocess(**kwargs):
if file_macros and 'macros' not in kwargs:
kwargs['macros'] = macros
Expand Down

0 comments on commit edf190b

Please sign in to comment.