From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 15 Feb 2013 19:22:22 +0000 (+0200)
Subject: #17143: merge with 3.3.
X-Git-Tag: v3.4.0a1~1375
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10f89329adac0a405b5416727c0df6bd4ba6a17d;p=python

#17143: merge with 3.3.
---

10f89329adac0a405b5416727c0df6bd4ba6a17d
diff --cc Misc/NEWS
index f4ac978f0a,ba2188637f..846c59f859
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -253,14 -178,11 +253,17 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #17143: Fix a missing import in the trace module.  Initial patch by
+   Berker Peksag.
+ 
 +- Issue #15220: email.feedparser's line splitting algorithm is now simpler and
 +  faster.
 +
  - Issue #16743: Fix mmap overflow check on 32 bit Windows.
  
 +- Issue #16996: webbrowser module now uses shutil.which() to find a
 +  web-browser on the executable search path.
 +
  - Issue #16800: tempfile.gettempdir() no longer left temporary files when
    the disk is full.  Original patch by Amir Szekely.