Merged revisions 70956 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70956 | brett.cannon | 2009-04-01 09:00:34 -0700 (Wed, 01 Apr 2009) | 5 lines

  The cgitb module had imports in its functions. This can cause deadlock with the
  import lock if called from within a thread that was triggered by an import.

  Partially fixes issue #1665206.
........
2 files changed