Merge pull request #3 from PyO3/fix-py

Fix metadata parsing for packages with vendored packages

Author: messense

src/distribution.rs

@@ -222,7 +222,23 @@ impl Distribution {
                 archive.by_name(file1)?.read_to_end(&mut buf)?;
                 Metadata::parse(&buf)
             }
-            _ => Err(Error::MultipleMetadataFiles(metadata_files)),
+            _ => {
+                let top_level_files: Vec<_> = metadata_files
+                    .iter()
+                    .filter(|f| {
+                        let path = Path::new(f);
+                        path.components().count() == 2
+                    })
+                    .collect();
+                if top_level_files.len() == 1 {
+                    let mut buf = Vec::new();
+                    archive
+                        .by_name(&top_level_files[0])?
+                        .read_to_end(&mut buf)?;
+                    return Metadata::parse(&buf);
+                }
+                Err(Error::MultipleMetadataFiles(metadata_files))
+            }
         }
     }
 }

tests/fixtures/py-1.11.0-py2.py3-none-any.whl

@@ -12,6 +12,16 @@ fn test_parse_wheel() {
     assert_eq!(dist.python_version(), "py2.py3");
 }
 
+#[test]
+fn test_parse_wheel_with_vendored_pkgs() {
+    let dist = Distribution::new("tests/fixtures/py-1.11.0-py2.py3-none-any.whl").unwrap();
+    assert_eq!(dist.r#type(), DistributionType::Wheel);
+    let metadata = dist.metadata();
+    assert_eq!(metadata.metadata_version, "2.1");
+    assert_eq!(metadata.name, "py");
+    assert_eq!(dist.python_version(), "py2.py3");
+}
+
 #[test]
 fn test_parse_egg() {
     let dist = Distribution::new("tests/fixtures/build-0.4.0-py3.9.egg").unwrap();