]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Sun, 12 May 2013 10:37:12 +0000 (12:37 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 12 May 2013 10:37:12 +0000 (12:37 +0200)
1  2 
Doc/library/venv.rst
Misc/NEWS

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