From: Éric Araujo <merwok@netwok.org>
Date: Sat, 10 Sep 2011 02:56:44 +0000 (+0200)
Subject: Merge fix for #8933 from 3.2
X-Git-Tag: v3.3.0a1~1544^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92ffc500d1b218d533953c8b7a79733902125f9c;p=thirdparty%2FPython%2Fcpython.git

Merge fix for #8933 from 3.2
---

92ffc500d1b218d533953c8b7a79733902125f9c
diff --cc Misc/NEWS
index 84b6be3151a8,12ac26eb2458..67b8cf85a199
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -274,12 -80,6 +274,16 @@@ Core and Builtin
  Library
  -------
  
++- Issue #8933: distutils' PKG-INFO files will now correctly report
++  Metadata-Version: 1.1 instead of 1.0 if a Classifier or Download-URL field is
++  present.
++
 +- Issue #12567: Add curses.unget_wch() function. Push a character so the next
 +  get_wch() will return it.
 +
 +- Issue #9561: distutils and packaging now writes egg-info files using UTF-8,
 +  instead of the locale encoding.
 +
  - Issue #8286: The distutils command sdist will print a warning message instead
    of crashing when an invalid path is given in the manifest template.