Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Remove trailing spaces #31695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 4 Lib/asyncio/sslproto.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ def get_read_buffer_size(self):
return self._ssl_protocol._get_read_buffer_size()

def get_write_buffer_limits(self):
"""Get the high and low watermarks for write flow control.
Return a tuple (low, high) where low and high are
"""Get the high and low watermarks for write flow control.
Return a tuple (low, high) where low and high are
positive number of bytes."""
return self._ssl_protocol._transport.get_write_buffer_limits()

Expand Down
4 changes: 2 additions & 2 deletions 4 Lib/asyncio/transports.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ def get_write_buffer_size(self):
raise NotImplementedError

def get_write_buffer_limits(self):
"""Get the high and low watermarks for write flow control.
Return a tuple (low, high) where low and high are
"""Get the high and low watermarks for write flow control.
Return a tuple (low, high) where low and high are
positive number of bytes."""
raise NotImplementedError

Expand Down
2 changes: 1 addition & 1 deletion 2 Lib/codeop.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
# The following flags match the values from Include/cpython/compile.h
# Caveat emptor: These flags are undocumented on purpose and depending
# on their effect outside the standard library is **unsupported**.
PyCF_DONT_IMPLY_DEDENT = 0x200
PyCF_DONT_IMPLY_DEDENT = 0x200
PyCF_ALLOW_INCOMPLETE_INPUT = 0x4000

def _maybe_compile(compiler, source, filename, symbol):
Expand Down
2 changes: 1 addition & 1 deletion 2 Lib/concurrent/futures/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ def wait(fs, timeout=None, return_when=ALL_COMPLETED):
A named 2-tuple of sets. The first set, named 'done', contains the
futures that completed (is finished or cancelled) before the wait
completed. The second set, named 'not_done', contains uncompleted
futures. Duplicate futures given to *fs* are removed and will be
futures. Duplicate futures given to *fs* are removed and will be
returned only once.
"""
fs = set(fs)
Expand Down
2 changes: 1 addition & 1 deletion 2 Lib/importlib/_bootstrap_external.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ def _write_atomic(path, data, mode=0o666):
# Python 3.11a5 3481 (Use inline cache for BINARY_OP)
# Python 3.11a5 3482 (Use inline caching for UNPACK_SEQUENCE and LOAD_GLOBAL)
# Python 3.11a5 3483 (Use inline caching for COMPARE_OP and BINARY_SUBSCR)
# Python 3.11a5 3484 (Use inline caching for LOAD_ATTR, LOAD_METHOD, and
# Python 3.11a5 3484 (Use inline caching for LOAD_ATTR, LOAD_METHOD, and
# STORE_ATTR)
# Python 3.11a5 3485 (Add an oparg to GET_AWAITABLE)

Expand Down
4 changes: 2 additions & 2 deletions 4 Lib/test/test_asyncio/test_sendfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ async def wait_closed(self):
class SendfileBase:

# 256 KiB plus small unaligned to buffer chunk
# Newer versions of Windows seems to have increased its internal
# buffer and tries to send as much of the data as it can as it
# Newer versions of Windows seems to have increased its internal
# buffer and tries to send as much of the data as it can as it
# has some form of buffering for this which is less than 256KiB
# on newer server versions and Windows 11.
# So DATA should be larger than 256 KiB to make this test reliable.
Expand Down
4 changes: 2 additions & 2 deletions 4 Lib/test/test_syntax.py
Original file line number Diff line number Diff line change
Expand Up @@ -1630,8 +1630,8 @@ def fib(n):
self.assertEqual(compile(s1, '<string>', 'exec'), compile(s2, '<string>', 'exec'))
except SyntaxError:
self.fail("Indented statement over multiple lines is valid")
def test_continuation_bad_indentation(self):

def test_continuation_bad_indentation(self):
# Check that code that breaks indentation across multiple lines raises a syntax error

code = r"""\
Expand Down
10 changes: 5 additions & 5 deletions 10 Lib/test/test_tokenize.py
Original file line number Diff line number Diff line change
Expand Up @@ -2511,8 +2511,8 @@ def get_tokens(string):

self.assertRaises(SyntaxError, get_tokens, "("*1000+"a"+")"*1000)
self.assertRaises(SyntaxError, get_tokens, "]")
def test_continuation_lines_indentation(self):

def test_continuation_lines_indentation(self):
def get_tokens(string):
return [(kind, string) for (kind, string, *_) in _generate_tokens_from_c_tokenizer(string)]

Expand Down Expand Up @@ -2551,7 +2551,7 @@ def fib(n):
'''Print a Fibonacci series up to n.'''
a, b = 0, 1
""")

self.assertEqual(get_tokens(code), get_tokens(code_no_cont))

code = dedent("""
Expand All @@ -2572,7 +2572,7 @@ def fib(n):
pass
pass
""")

self.assertEqual(get_tokens(code), get_tokens(code_no_cont))

code = dedent("""
Expand Down Expand Up @@ -2609,7 +2609,7 @@ def fib(n):
""")

self.assertEqual(get_tokens(code), get_tokens(code_no_cont))


if __name__ == "__main__":
unittest.main()
4 changes: 2 additions & 2 deletions 4 Lib/test/test_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -2930,8 +2930,8 @@ def fun(x: a):

def test_forward_repr(self):
self.assertEqual(repr(List['int']), "typing.List[ForwardRef('int')]")
self.assertEqual(repr(List[ForwardRef('int', module='mod')]),
"typing.List[ForwardRef('int', module='mod')]")
self.assertEqual(repr(List[ForwardRef('int', module='mod')]),
"typing.List[ForwardRef('int', module='mod')]")

def test_union_forward(self):

Expand Down
3 changes: 2 additions & 1 deletion 3 Modules/_blake2/blake2s_impl.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#endif

#include "Python.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the changes in this file accidental?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a generated file. After regenerating all I got this.

#include "pycore_strhex.h" // _Py_strhex()
#include "pycore_strhex.h" // _Py_strhex()

#include "../hashlib.h"
#include "blake2ns.h"
Expand All @@ -37,6 +37,7 @@
#include "impl/blake2s-ref.c"
#endif


extern PyType_Spec blake2s_type_spec;

typedef struct {
Expand Down
2 changes: 1 addition & 1 deletion 2 Python/fileutils.c
Original file line number Diff line number Diff line change
Expand Up @@ -2093,7 +2093,7 @@ join_relfile(wchar_t *buffer, size_t bufsize,
const wchar_t *dirname, const wchar_t *relfile)
{
#ifdef MS_WINDOWS
if (FAILED(PathCchCombineEx(buffer, bufsize, dirname, relfile,
if (FAILED(PathCchCombineEx(buffer, bufsize, dirname, relfile,
PATHCCH_ALLOW_LONG_PATHS))) {
return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion 2 Python/specialize.c
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@ _Py_Specialize_LoadMethod(PyObject *owner, _Py_CODEUNIT *instr, PyObject *name)
PyTypeObject *owner_cls = Py_TYPE(owner);

if (PyModule_CheckExact(owner)) {
assert(INLINE_CACHE_ENTRIES_LOAD_ATTR <=
assert(INLINE_CACHE_ENTRIES_LOAD_ATTR <=
INLINE_CACHE_ENTRIES_LOAD_METHOD);
int err = specialize_module_load_attr(owner, instr, name, LOAD_METHOD,
LOAD_METHOD_MODULE);
Expand Down
4 changes: 2 additions & 2 deletions 4 Tools/scripts/freeze_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
FROZEN_ONLY = os.path.join(ROOT_DIR, 'Tools', 'freeze', 'flag.py')

STDLIB_DIR = os.path.join(ROOT_DIR, 'Lib')
# If FROZEN_MODULES_DIR or DEEPFROZEN_MODULES_DIR is changed then the
# If FROZEN_MODULES_DIR or DEEPFROZEN_MODULES_DIR is changed then the
# .gitattributes and .gitignore files needs to be updated.
FROZEN_MODULES_DIR = os.path.join(ROOT_DIR, 'Python', 'frozen_modules')
DEEPFROZEN_MODULES_DIR = os.path.join(ROOT_DIR, 'Python', 'deepfreeze')
Expand Down Expand Up @@ -732,4 +732,4 @@ def main():


if __name__ == '__main__':
main()
main()
Morty Proxy This is a proxified and sanitized view of the page, visit original site.