Merge pull request #10132 from hroncok/python3.11.0b4
This commit is contained in:
		
						commit
						cbcb3a356e
					
				| 
						 | 
				
			
			@ -223,7 +223,11 @@ class TestDoctests:
 | 
			
		|||
                "Traceback (most recent call last):",
 | 
			
		||||
                '  File "*/doctest.py", line *, in __run',
 | 
			
		||||
                "    *",
 | 
			
		||||
                *((" *^^^^*",) if sys.version_info >= (3, 11) else ()),
 | 
			
		||||
                *(
 | 
			
		||||
                    (" *^^^^*",)
 | 
			
		||||
                    if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11)
 | 
			
		||||
                    else ()
 | 
			
		||||
                ),
 | 
			
		||||
                '  File "<doctest test_doctest_unexpected_exception.txt[1]>", line 1, in <module>',
 | 
			
		||||
                "ZeroDivisionError: division by zero",
 | 
			
		||||
                "*/test_doctest_unexpected_exception.txt:2: UnexpectedException",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -47,7 +47,7 @@ def test_wrap_session_notify_exception(ret_exc, pytester: Pytester) -> None:
 | 
			
		|||
 | 
			
		||||
    end_lines = (
 | 
			
		||||
        result.stdout.lines[-4:]
 | 
			
		||||
        if sys.version_info >= (3, 11)
 | 
			
		||||
        if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11)
 | 
			
		||||
        else result.stdout.lines[-3:]
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -57,7 +57,7 @@ def test_wrap_session_notify_exception(ret_exc, pytester: Pytester) -> None:
 | 
			
		|||
            'INTERNALERROR>     raise SystemExit("boom")',
 | 
			
		||||
            *(
 | 
			
		||||
                ("INTERNALERROR>     ^^^^^^^^^^^^^^^^^^^^^^^^",)
 | 
			
		||||
                if sys.version_info >= (3, 11)
 | 
			
		||||
                if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11)
 | 
			
		||||
                else ()
 | 
			
		||||
            ),
 | 
			
		||||
            "INTERNALERROR> SystemExit: boom",
 | 
			
		||||
| 
						 | 
				
			
			@ -68,7 +68,7 @@ def test_wrap_session_notify_exception(ret_exc, pytester: Pytester) -> None:
 | 
			
		|||
            'INTERNALERROR>     raise ValueError("boom")',
 | 
			
		||||
            *(
 | 
			
		||||
                ("INTERNALERROR>     ^^^^^^^^^^^^^^^^^^^^^^^^",)
 | 
			
		||||
                if sys.version_info >= (3, 11)
 | 
			
		||||
                if (3, 11, 0, "beta", 4) > sys.version_info >= (3, 11)
 | 
			
		||||
                else ()
 | 
			
		||||
            ),
 | 
			
		||||
            "INTERNALERROR> ValueError: boom",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue