diff options
| -rw-r--r-- | Doc/tutorial/controlflow.rst | 3 | ||||
| -rw-r--r-- | Lib/test/test_faulthandler.py | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst index e33a596..cb9597f 100644 --- a/Doc/tutorial/controlflow.rst +++ b/Doc/tutorial/controlflow.rst @@ -184,6 +184,9 @@ following loop, which searches for prime numbers:: 8 equals 2 * 4 9 equals 3 * 3 +(Yes, this is the correct code. Look closely: the ``else`` clause belongs to +the :keyword:`for` loop, **not** the :keyword:`if` statement.) + .. _tut-pass: diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py index c8a8030..331dd2e 100644 --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -112,7 +112,8 @@ faulthandler.enable() faulthandler._read_null() """.strip(), 3, - '(?:Segmentation fault|Bus error)') + # Issue #12700: Read NULL raises SIGILL on Mac OS X Lion + '(?:Segmentation fault|Bus error|Illegal instruction)') def test_sigsegv(self): self.check_fatal_error(""" @@ -192,7 +193,7 @@ faulthandler.enable() faulthandler._read_null(True) """.strip(), 3, - '(?:Segmentation fault|Bus error)') + '(?:Segmentation fault|Bus error|Illegal instruction)') def test_enable_file(self): with temporary_filename() as filename: @@ -203,7 +204,7 @@ faulthandler.enable(output) faulthandler._read_null() """.strip().format(filename=repr(filename)), 4, - '(?:Segmentation fault|Bus error)', + '(?:Segmentation fault|Bus error|Illegal instruction)', filename=filename) def test_enable_single_thread(self): @@ -213,7 +214,7 @@ faulthandler.enable(all_threads=False) faulthandler._read_null() """.strip(), 3, - '(?:Segmentation fault|Bus error)', + '(?:Segmentation fault|Bus error|Illegal instruction)', all_threads=False) def test_disable(self): |