diff options
| author | Noah Doersing <doersino@gmail.com> | 2020-05-01 04:30:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 04:30:10 (GMT) |
| commit | 8bcfd31cc01e068bca78aa42a87c24aea6ebc6b1 (patch) | |
| tree | ced6431f52211f566731e99aa3caffca4ffc6512 | |
| parent | 3e0a6f37dfdd595be737baae00ec0e036a912615 (diff) | |
| download | cpython-8bcfd31cc01e068bca78aa42a87c24aea6ebc6b1.zip cpython-8bcfd31cc01e068bca78aa42a87c24aea6ebc6b1.tar.gz cpython-8bcfd31cc01e068bca78aa42a87c24aea6ebc6b1.tar.bz2 | |
Change 'exception happened' to 'exception occurred' in two places (#19767)
| -rw-r--r-- | Doc/tutorial/errors.rst | 2 | ||||
| -rw-r--r-- | Lib/socketserver.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst index ab23df9..0ce9646 100644 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -67,7 +67,7 @@ The rest of the line provides detail based on the type of exception and what caused it. The preceding part of the error message shows the context where the exception -happened, in the form of a stack traceback. In general it contains a stack +occurred, in the form of a stack traceback. In general it contains a stack traceback listing source lines; however, it will not display lines read from standard input. diff --git a/Lib/socketserver.py b/Lib/socketserver.py index 1ad028f..57c1ae6 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -374,7 +374,7 @@ class BaseServer: """ print('-'*40, file=sys.stderr) - print('Exception happened during processing of request from', + print('Exception occurred during processing of request from', client_address, file=sys.stderr) import traceback traceback.print_exc() |