Do not unnecessarily map unimplemented manifest fields to an OrderedDict instance

Signed-off-by: Ritiek Malhotra <[email protected]>

Author: ritiek

src/packagedcode/cargo.py

@@ -110,13 +110,6 @@ def build_package(package_data):
     if description:
         description = description.strip()
 
-    # TODO: Remove this ordered_dict_map once cargo.py is able to handle
-    # the appropriate data (source_packages, dependencies, etc..)
-    # At the moment, this is only useful for making tests pass
-    ordered_dict_map = {}
-    for key in ('source_packages', 'dependencies', 'keywords'):
-        ordered_dict_map[key] = OrderedDict()
-
     authors = core_package_data.get('authors')
     parties = list(party_mapper(authors, party_role='author'))
 
@@ -125,7 +118,6 @@ def build_package(package_data):
         version=version,
         description=description,
         parties=parties,
-        **ordererd_dict_map,
     )
 
     return package

tests/packagedcode/data/cargo/clap/Cargo.toml.expected

@@ -17,7 +17,7 @@
      "url": null
    }
  ],
- "keywords": {},
+ "keywords": [],
  "homepage_url": null,
  "download_url": null,
  "size": null,
@@ -33,9 +33,9 @@
  "declared_license": null,
  "notice_text": null,
  "manifest_path": null,
- "dependencies": {},
+ "dependencies": [],
  "contains_source_code": null,
- "source_packages": {},
+ "source_packages": [],
  "purl": "pkg:cargo/[email protected]",
  "repository_homepage_url": "https://crates.io/crates/clap",
  "repository_download_url": "https://crates.io/api/v1/crates/clap/2.32.0/download",

tests/packagedcode/data/cargo/clippy/Cargo.toml.expected

@@ -45,7 +45,7 @@
      "url": null
    }
  ],
- "keywords": {},
+ "keywords": [],
  "homepage_url": null,
  "download_url": null,
  "size": null,
@@ -61,9 +61,9 @@
  "declared_license": null,
  "notice_text": null,
  "manifest_path": null,
- "dependencies": {},
+ "dependencies": [],
  "contains_source_code": null,
- "source_packages": {},
+ "source_packages": [],
  "purl": "pkg:cargo/[email protected]",
  "repository_homepage_url": "https://crates.io/crates/clippy",
  "repository_download_url": "https://crates.io/api/v1/crates/clippy/0.0.212/download",

tests/packagedcode/data/cargo/mdbook/Cargo.toml.expected

@@ -31,7 +31,7 @@
      "url": null
    }
  ],
- "keywords": {},
+ "keywords": [],
  "homepage_url": null,
  "download_url": null,
  "size": null,
@@ -47,9 +47,9 @@
  "declared_license": null,
  "notice_text": null,
  "manifest_path": null,
- "dependencies": {},
+ "dependencies": [],
  "contains_source_code": null,
- "source_packages": {},
+ "source_packages": [],
  "purl": "pkg:cargo/[email protected]",
  "repository_homepage_url": "https://crates.io/crates/mdbook",
  "repository_download_url": "https://crates.io/api/v1/crates/mdbook/0.2.4-alpha.0/download",

tests/packagedcode/data/cargo/rustfmt/Cargo.toml.expected

@@ -24,7 +24,7 @@
       "url": null
    }
  ],
- "keywords": {},
+ "keywords": [],
  "homepage_url": null,
  "download_url": null,
  "size": null,
@@ -40,9 +40,9 @@
  "declared_license": null,
  "notice_text": null,
  "manifest_path": null,
- "dependencies": {},
+ "dependencies": [],
  "contains_source_code": null,
- "source_packages": {},
+ "source_packages": [],
  "purl": "pkg:cargo/[email protected]",
  "repository_homepage_url": "https://crates.io/crates/rustfmt-nightly",
  "repository_download_url": "https://crates.io/api/v1/crates/rustfmt-nightly/1.0.3/download",

tests/packagedcode/data/cargo/rustup/Cargo.toml.expected

@@ -17,7 +17,7 @@
       "url": null
     }
  ],
- "keywords": {},
+ "keywords": [],
  "homepage_url": null,
  "download_url": null,
  "size": null,
@@ -33,9 +33,9 @@
  "declared_license": null,
  "notice_text": null,
  "manifest_path": null,
- "dependencies": {},
+ "dependencies": [],
  "contains_source_code": null,
- "source_packages": {},
+ "source_packages": [],
  "purl": "pkg:cargo/[email protected]",
  "repository_homepage_url": "https://crates.io/crates/rustup",
  "repository_download_url": "https://crates.io/api/v1/crates/rustup/1.17.0/download",