NewStore
diff --git a/‎WORKSPACE
Copy file name to clipboardExpand all lines: WORKSPACE
+10-1 b/‎WORKSPACE
Copy file name to clipboardExpand all lines: WORKSPACE
+10-1
diff --git a/‎rules_python/BUILD
Copy file name to clipboardExpand all lines: rules_python/BUILD
+2-1 b/‎rules_python/BUILD
Copy file name to clipboardExpand all lines: rules_python/BUILD
+2-1
diff --git a/‎rules_python/whl.py
Copy file name to clipboardExpand all lines: rules_python/whl.py
+16-3 b/‎rules_python/whl.py
Copy file name to clipboardExpand all lines: rules_python/whl.py
+16-3
diff --git a/‎rules_python/whl_test.py
Copy file name to clipboardExpand all lines: rules_python/whl_test.py
+10-1 b/‎rules_python/whl_test.py
Copy file name to clipboardExpand all lines: rules_python/whl_test.py
+10-1
@@ -66,14 +66,23 @@ http_file(
 )
 
 http_file(
-    name = "futures_whl",
+    name = "futures_3_1_1_whl",
     sha256 = "c4884a65654a7c45435063e14ae85280eb1f111d94e542396717ba9828c4337f",
     # From https://pypi.python.org/pypi/futures
     url = ("https://pypi.python.org/packages/a6/1c/" +
            "72a18c8c7502ee1b38a604a5c5243aa8c2a64f4bba4e6631b1b8972235dd/" +
            "futures-3.1.1-py2-none-any.whl"),
 )
 
+http_file(
+    name = "futures_2_2_0_whl",
+    sha256 = "9fd22b354a4c4755ad8c7d161d93f5026aca4cfe999bd2e53168f14765c02cd6",
+    # From https://pypi.python.org/pypi/futures/2.2.0
+    url = ("https://pypi.python.org/packages/d7/1d/" +
+           "68874943aa37cf1c483fc61def813188473596043158faa6511c04a038b4/" +
+           "futures-2.2.0-py2.py3-none-any.whl"),
+)
+
 http_file(
     name = "mock_whl",
     sha256 = "5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1",
 
@@ -26,7 +26,8 @@ py_test(
     name = "whl_test",
     srcs = ["whl_test.py"],
     data = [
-        "@futures_whl//file",
+        "@futures_3_1_1_whl//file",
+        "@futures_2_2_0_whl//file",
         "@grpc_whl//file",
         "@mock_whl//file",
     ],
 
@@ -57,8 +57,15 @@ def metadata(self):
     # Extract the structured data from metadata.json in the WHL's dist-info
     # directory.
     with zipfile.ZipFile(self.path(), 'r') as whl:
-      with whl.open(os.path.join(self._dist_info(), 'metadata.json')) as f:
-        return json.loads(f.read().decode("utf-8"))
+      # first check for metadata.json
+      try:
+        with whl.open(os.path.join(self._dist_info(), 'metadata.json')) as f:
+          return json.loads(f.read().decode("utf-8"))
+      except KeyError:
+          pass
+      # fall back to METADATA file (https://www.python.org/dev/peps/pep-0427/)
+      with whl.open(os.path.join(self._dist_info(), 'METADATA')) as f:
+        return self._parse_metadata(f.read().decode("utf-8"))
 
   def name(self):
     return self.metadata().get('name')
@@ -86,6 +93,12 @@ def expand(self, directory):
     with zipfile.ZipFile(self.path(), 'r') as whl:
       whl.extractall(directory)
 
+  # _parse_metadata parses METADATA files according to https://www.python.org/dev/peps/pep-0314/
+  def _parse_metadata(self, content):
+    # TODO: handle fields other than just name
+    name_pattern = re.compile('Name: (.*)')
+    return { 'name': name_pattern.search(content).group(1) }
+
 
 parser = argparse.ArgumentParser(
     description='Unpack a WHL file as a py_library.')
@@ -126,6 +139,6 @@ def main():
          'requirement("%s")' % d
          for d in whl.dependencies()
        ])))
-    
+
 if __name__ == '__main__':
   main()
@@ -35,14 +35,23 @@ def test_grpc_whl(self):
     self.assertEqual('pypi__grpcio_1_6_0', wheel.repository_name())
 
   def test_futures_whl(self):
-    td = TestData('futures_whl/file/futures-3.1.1-py2-none-any.whl')
+    td = TestData('futures_3_1_1_whl/file/futures-3.1.1-py2-none-any.whl')
     wheel = whl.Wheel(td)
     self.assertEqual(wheel.name(), 'futures')
     self.assertEqual(wheel.distribution(), 'futures')
     self.assertEqual(wheel.version(), '3.1.1')
     self.assertEqual(set(wheel.dependencies()), set())
     self.assertEqual('pypi__futures_3_1_1', wheel.repository_name())
 
+  def test_whl_with_METADATA_file(self):
+    td = TestData('futures_2_2_0_whl/file/futures-2.2.0-py2.py3-none-any.whl')
+    wheel = whl.Wheel(td)
+    self.assertEqual(wheel.name(), 'futures')
+    self.assertEqual(wheel.distribution(), 'futures')
+    self.assertEqual(wheel.version(), '2.2.0')
+    self.assertEqual(set(wheel.dependencies()), set())
+    self.assertEqual('pypi__futures_2_2_0', wheel.repository_name())
+
   def test_mock_whl(self):
     td = TestData('mock_whl/file/mock-2.0.0-py2.py3-none-any.whl')
     wheel = whl.Wheel(td)