From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 5 Dec 2014 09:18:30 +0000 (+0100)
Subject: (Merge 3.4) Issue #22599: Enhance tokenize.open() to be able to call it during
X-Git-Tag: v3.5.0a1~377
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d279b87d81b7cd9471e8373d022451bb00f094f;p=thirdparty%2FPython%2Fcpython.git

(Merge 3.4) Issue #22599: Enhance tokenize.open() to be able to call it during
Python finalization.

Before the module kept a reference to the builtins module, but the module
attributes are cleared during Python finalization. Instead, keep directly a
reference to the open() function.

This enhancement is not perfect, calling tokenize.open() can still fail if
called very late during Python finalization.  Usually, the function is called
by the linecache module which is called to display a traceback or emit a
warning.
---

9d279b87d81b7cd9471e8373d022451bb00f094f
diff --cc Lib/test/test_traceback.py
index e3b28bd55156,c29556354ef4..6bd6fa630330
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@@ -6,6 -6,6 +6,8 @@@ import unittes
  import re
  from test.support import run_unittest, Error, captured_output
  from test.support import TESTFN, unlink, cpython_only
++from test.script_helper import assert_python_ok
++import textwrap
  
  import traceback
  
@@@ -169,6 -169,6 +171,37 @@@ class SyntaxTracebackCases(unittest.Tes
          # Issue #18960: coding spec should has no effect
          do_test("0\n# coding: GBK\n", "h\xe9 ho", 'utf-8', 5)
  
++    def test_print_traceback_at_exit(self):
++        # Issue #22599: Ensure that it is possible to use the traceback module
++        # to display an exception at Python exit
++        code = textwrap.dedent("""
++            import sys
++            import traceback
++
++            class PrintExceptionAtExit(object):
++                def __init__(self):
++                    try:
++                        x = 1 / 0
++                    except Exception:
++                        self.exc_info = sys.exc_info()
++                        # self.exc_info[1] (traceback) contains frames:
++                        # explicitly clear the reference to self in the current
++                        # frame to break a reference cycle
++                        self = None
++
++                def __del__(self):
++                    traceback.print_exception(*self.exc_info)
++
++            # Keep a reference in the module namespace to call the destructor
++            # when the module is unloaded
++            obj = PrintExceptionAtExit()
++        """)
++        rc, stdout, stderr = assert_python_ok('-c', code)
++        expected = [b'Traceback (most recent call last):',
++                    b'  File "<string>", line 8, in __init__',
++                    b'ZeroDivisionError: division by zero']
++        self.assertEqual(stderr.splitlines(), expected)
++
  
  class TracebackFormatTests(unittest.TestCase):