From: Noah Doersing <doersino@gmail.com>
Date: Fri, 1 May 2020 04:30:10 +0000 (+0200)
Subject: Change 'exception happened' to 'exception occurred' in two places (#19767)
X-Git-Tag: v3.9.0b1~227
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bcfd31cc01e068bca78aa42a87c24aea6ebc6b1;p=thirdparty%2FPython%2Fcpython.git

Change 'exception happened' to 'exception occurred' in two places (#19767)
---

diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index ab23df9f3ff9..0ce96466e8c2 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 1ad028fa4d08..57c1ae6e9e8b 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()