Branch merge

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:
 

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):