[Checkins] SVN: zope.repositorypolicy/trunk/src/zope/repositorypolicy/project.py - be more lenient about the license name check in setup.py.

Jens Vagelpohl jens at dataflake.org
Wed Mar 17 10:09:05 EDT 2010


Log message for revision 110028:
  - be more lenient about the license name check in setup.py. 
    Everything starting with "ZPL" is now accepted, such as "ZPL", 
    "ZPL 2.1" and even "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)"
  

Changed:
  U   zope.repositorypolicy/trunk/src/zope/repositorypolicy/project.py

-=-
Modified: zope.repositorypolicy/trunk/src/zope/repositorypolicy/project.py
===================================================================
--- zope.repositorypolicy/trunk/src/zope/repositorypolicy/project.py	2010-03-17 13:46:13 UTC (rev 110027)
+++ zope.repositorypolicy/trunk/src/zope/repositorypolicy/project.py	2010-03-17 14:09:05 UTC (rev 110028)
@@ -33,7 +33,7 @@
 class Checker(object):
 
     data_dir = os.path.join(os.path.dirname(__file__), 'data')
-    license_name = 'ZPL 2.1'
+    license_name = 'ZPL'
     copyright_holder = 'Zope Foundation and Contributors'
 
     def __init__(self, working_dir):
@@ -83,7 +83,7 @@
             self.log.append('setup.py: could not extract metadata')
             return
         license = metadata[0].strip()
-        if license != self.license_name:
+        if not license.startswith(self.license_name):
             self.log.append(
                 'setup.py: license not declared as "%s" (found: "%s")' %
                 (self.license_name, license))



More information about the checkins mailing list