From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 23 Apr 2016 22:55:09 +0000 (+0300)
Subject: Issue #26089: Remove duplicate field 'license' from DistributionMetadata
X-Git-Tag: v3.6.0a1~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce18d8c2f4ea8bbdc51ab4512d73f1ffe5b5901a;p=thirdparty%2FPython%2Fcpython.git

Issue #26089: Remove duplicate field 'license' from DistributionMetadata

It was renamed to 'license' in 178d19cff163.

Patch by Augustin Laville.
---

diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
index ffb33ff645a8..62a24516cfaf 100644
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -1018,8 +1018,7 @@ class DistributionMetadata:
                          "maintainer", "maintainer_email", "url",
                          "license", "description", "long_description",
                          "keywords", "platforms", "fullname", "contact",
-                         "contact_email", "license", "classifiers",
-                         "download_url",
+                         "contact_email", "classifiers", "download_url",
                          # PEP 314
                          "provides", "requires", "obsoletes",
                          )