#253: Pypi: add author object mapper and update the test to make sure the build passes

Author: Li

src/packagedcode/pypi.py

@@ -32,6 +32,7 @@
 from commoncode import fileutils
 from packagedcode.models import AssertedLicense
 from packagedcode.models import PythonPackage
+from packagedcode import models
 
 
 """
@@ -76,7 +77,7 @@ def parse_pkg_info(location):
         asserted_licenses=[AssertedLicense(license=infos.get('License'))],
         # FIXME: what about Party objects and email?
         # FIXME: what about maintainers?
-        authors=[infos.get('Author')],
+        authors=[models.Party(type=models.party_person, name=infos.get('Author'))],
     )
     return package
 
@@ -122,15 +123,14 @@ def parse_metadata(location):
     """
     if not location or not location.endswith('metadata.json'):
         return
-
     parent_dir = fileutils.parent_directory(location)
     # FIXME: is the absence of these two files a show stopper?
     if not all(os.path.exists(os.path.join(parent_dir, fname))
-               for fname in ('METADATA' 'DESCRIPTION.rst')):
+               for fname in ('METADATA', 'DESCRIPTION.rst')):
         return
     # FIXME: wrap in a with statement
     infos = json.loads(open(location, 'rb').read())
-
+    print(infos)
     homepage_url = None
     authors = []
     if infos['extensions']:
@@ -141,7 +141,7 @@ def parse_metadata(location):
             pass
         try:
             for contact in infos['extensions']['python.details']['contacts']:
-                authors.append(contact['name'])
+                authors.append(models.Party(type=models.party_person, name=contact['name'],))
         except:
             # FIXME: why catch all expections?
             pass
@@ -169,7 +169,7 @@ def parse(location):
             homepage_url=get_attribute(location, 'url'),
             description=get_attribute(location, 'description'),
             version=get_attribute(location, 'version'),
-            authors=[get_attribute(location, 'author')],
+            authors=[models.Party(type=models.party_person, name=get_attribute(location, 'author'))],
             asserted_licenses=[AssertedLicense(license=get_attribute(location, 'license'))],
         )
         return package

tests/packagedcode/test_pypi.py

@@ -41,7 +41,7 @@ def test_parse(self):
         package = pypi.parse(test_file)
         assert 'scancode-toolkit' == package.name
         assert '1.5.0' == package.version
-        assert 'ScanCode' == package.authors[0]
+        assert 'ScanCode' == package.authors[0].name
         assert 'ScanCode is a tool to scan code for license, copyright and other interesting facts.' == package.description
         assert 'https://github.com/nexB/scancode-toolkit' == package.homepage_url
 
@@ -54,13 +54,14 @@ def test_get_attribute(self):
         assert 'ScanCode' == pypi.get_attribute(test_file, 'author')
 
     def test_parse_metadata(self):
-        test_file = self.get_test_loc('pypi/metadata.json')
+        test_folder = self.get_test_loc('pypi')
+        test_file = os.path.join(test_folder, 'metadata.json')
         package = pypi.parse_metadata(test_file)
         assert 'six' == package.name
         assert '1.10.0' == package.version
         assert 'Python 2 and 3 compatibility utilities' == package.summary
         assert 'MIT' == package.asserted_licenses[0].license
-        assert ['Benjamin Peterson'] == package.authors
+        assert 'Benjamin Peterson' == package.authors[0].name
         assert 'http://pypi.python.org/pypi/six/' == package.homepage_url
 
     def test_parse_pkg_info(self):
@@ -71,4 +72,4 @@ def test_parse_pkg_info(self):
         assert 'Import CSV and Excel files' == package.summary
         assert 'BSD' == package.asserted_licenses[0].license
         assert 'http://nexb.com' == package.homepage_url
-        assert ['Francois Granade'] == package.authors
+        assert 'Francois Granade' == package.authors[0].name