[Bug #693470] 'licence' as an alias for 'license' doesn't work.

   This patch makes it work again.

diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
index 08e2a4f7d877454903ff7892ed4058611a39e4bc..d313e7d1161073193eb6ce38c4786ae892eed962 100644 (file)
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -205,6 +205,15 @@ class Distribution:
                     for (opt, val) in cmd_options.items():
                         opt_dict[opt] = ("setup script", val)
 
+            if attrs.has_key('licence'):
+                attrs['license'] = attrs['licence']
+                del attrs['licence']
+                msg = "'licence' distribution option is deprecated; use 'license'"
+                if warnings is not None:
+                    warnings.warn(msg)
+                else:
+                    sys.stderr.write(msg + "\n")
+
             # Now work on the rest of the attributes.  Any attribute that's
             # not already defined is invalid!
             for (key,val) in attrs.items():
@@ -966,7 +975,7 @@ class DistributionMetadata:
                          "maintainer", "maintainer_email", "url",
                          "license", "description", "long_description",
                          "keywords", "platforms", "fullname", "contact",
-                         "contact_email", "licence", "classifiers",
+                         "contact_email", "license", "classifiers",
                          "download_url")
 
     def __init__ (self):