[Patch #969907] Add traceback to warning output

diff --git a/Lib/cookielib.py b/Lib/cookielib.py
index f2cc13297600bc1a2afa8289891d187c3f72ee9b..a5e84e39f28541157d05698a9672d6b5c7a32ed9 100644 (file)
--- a/Lib/cookielib.py
+++ b/Lib/cookielib.py
@@ -49,10 +49,11 @@ def reraise_unmasked_exceptions(unmasked=()):
     if issubclass(etype, unmasked):
         raise
     # swallowed an exception
-    import warnings
-    warnings.warn("cookielib bug!", stacklevel=2)
-    import traceback
-    traceback.print_exc()
+    import warnings, traceback, StringIO
+    f = StringIO.StringIO()
+    traceback.print_exc(None, f)
+    msg = f.getvalue()
+    warnings.warn("cookielib bug!\n%s" % msg, stacklevel=2)
 
 
 # Date/time conversion