Merge license list 3.5

pombredanne · pombredanne · commit 5bb18ecdb569 · 2019-08-28T10:16:56.000+02:00
Signed-off-by: Philippe Ombredanne &lt;pombredanne@nexb.com&gt;
diff --git a/spdx/config.py b/spdx/config.py
@@ -35,7 +35,7 @@ def load_license_list(file_name):
     licenses_map = {}
     with codecs.open(file_name, 'rb', encoding='utf-8') as lics:
         licenses = json.load(lics)
-        version, _, _ = licenses['licenseListVersion'].split('-')
+        version = licenses['licenseListVersion'].split('.')
         for lic in licenses['licenses']:
             if lic.get('isDeprecatedLicenseId'):
                 continue
@@ -55,7 +55,7 @@ def load_exception_list(file_name):
     exceptions_map = {}
     with codecs.open(file_name, 'rb', encoding='utf-8') as excs:
         exceptions = json.load(excs)
-        version, _, _ = exceptions['licenseListVersion'].split('-')
+        version = exceptions['licenseListVersion'].split('.')
         for exc in exceptions['exceptions']:
             if exc.get('isDeprecatedLicenseId'):
                 continue
@@ -66,8 +66,8 @@ def load_exception_list(file_name):
     return version, exceptions_map
 
 
-_version, LICENSE_MAP = load_license_list(_licenses)
-LICENSE_LIST_VERSION = Version.from_str(_version)
+(_major, _minor), LICENSE_MAP = load_license_list(_licenses)
+LICENSE_LIST_VERSION = Version(major=_major, minor=_minor)
 
-_version, EXCEPTION_MAP = load_exception_list(_exceptions)
-EXCEPTION_LIST_VERSION = Version.from_str(_version)
+(_major, _minor), EXCEPTION_MAP = load_exception_list(_exceptions)
+EXCEPTION_LIST_VERSION = Version(major=_major, minor=_minor)
diff --git a/tests/test_document.py b/tests/test_document.py
@@ -403,7 +403,6 @@ def test_from_identifier(self):
 
 
 class TestException(TestCase):
-    maxDiff = None
 
     def test_exception_list(self):
         assert EXCEPTION_MAP['Linux Syscall Note'] == 'Linux-syscall-note'
