[Python-checkins] python/dist/src/Lib/distutils dist.py,1.62,1.63

[akuchling@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory sc8-pr-cvs1:/tmp/cvs-serv25442

Modified Files:
	dist.py 
Log Message:
[Bug #693470] 'licence' as an alias for 'license' doesn't work.  
   This patch makes it work again.


Index: dist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/dist.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** dist.py	19 Feb 2003 14:16:01 -0000	1.62
--- dist.py	3 Mar 2003 20:07:27 -0000	1.63
***************
*** 206,209 ****
--- 206,218 ----
                          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!
***************
*** 967,971 ****
                           "license", "description", "long_description",
                           "keywords", "platforms", "fullname", "contact",
!                          "contact_email", "licence", "classifiers",
                           "download_url")
  
--- 976,980 ----
                           "license", "description", "long_description",
                           "keywords", "platforms", "fullname", "contact",
!                          "contact_email", "license", "classifiers",
                           "download_url")