From: Georg Brandl <georg@python.org>
Date: Sun, 12 May 2013 10:37:12 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~740
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7025349aa8c09f6910ca985d72a059019129d1f8;p=python

merge with 3.3
---

7025349aa8c09f6910ca985d72a059019129d1f8
diff --cc Misc/NEWS
index e3b860a84f,0d7700f632..5008cb3b62
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -91,6 -49,12 +91,9 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #17732: Ignore distutils.cfg options pertaining to install paths if a
+   virtual environment is active.
+ 
 -- Issue #1159051: Back out a fix for handling corrupted gzip files that
 -  broke backwards compatibility.
 -
  - Issue #17915: Fix interoperability of xml.sax with file objects returned by
    codecs.open().