Fix pex-tool#139: PEX_SCRIPT fails for scripts from not-zip-safe eggs.

h/t @palexander for doing the heavy lifting to figure out what was going on
here.

Author: wickman

CHANGES.rst

@@ -11,6 +11,12 @@ CHANGES
   the `PythonInterpreter` class.
   Fixes `#144 <https://github.com/pantsbuild/pex/issues/144>`_.
 
+* Bug fix: PEX_SCRIPT failed when the script was from a not-zip-safe egg.
+  Original PR `#139 <https://github.com/pantsbuild/pex/pull/139>`_.
+
+* Bug fix: `sys.exit` called without arguments would cause `None` to be printed on stderr since pex 1.0.1.
+  `#143 <https://github.com/pantsbuild/pex/pull/143>`_.
+
 -----
 1.0.2
 -----

pex/finders.py

@@ -262,9 +262,19 @@ def get_script_from_whl(name, dist):
 
 
 def get_script_from_distribution(name, dist):
-  if isinstance(dist._provider, FixedEggMetadata):
+  # PathMetadata: exploded distribution on disk.
+  if isinstance(dist._provider, pkg_resources.PathMetadata):
+    if dist.egg_info.endswith('EGG-INFO'):
+      return get_script_from_egg(name, dist)
+    elif dist.egg_info.endswith('.dist-info'):
+      return get_script_from_whl(name, dist)
+    else:
+      return None, None
+  # FixedEggMetadata: Zipped egg
+  elif isinstance(dist._provider, FixedEggMetadata):
     return get_script_from_egg(name, dist)
-  elif isinstance(dist._provider, (WheelMetadata, pkg_resources.PathMetadata)):
+  # WheelMetadata: Zipped whl (in theory should not experience this at runtime.)
+  elif isinstance(dist._provider, WheelMetadata):
     return get_script_from_whl(name, dist)
   return None, None
 

pex/pex.py

@@ -392,7 +392,7 @@ def execute_content(cls, name, content, argv0=None):
     try:
       ast = compile(content, name, 'exec', flags=0, dont_inherit=1)
     except SyntaxError:
-      die('Unable to parse %s.  PEX script support only supports Python scripts.')
+      die('Unable to parse %s.  PEX script support only supports Python scripts.' % name)
     old_name, old_file = globals().get('__name__'), globals().get('__file__')
     try:
       old_argv0, sys.argv[0] = sys.argv[0], argv0

tests/test_pex.py

@@ -120,17 +120,19 @@ def test_minimum_sys_modules():
   assert tainted_module.__path__ == ['good_path']
 
 
+@pytest.mark.parametrize('zip_safe', (False, True))
 @pytest.mark.parametrize('project_name', ('my_project', 'my-project'))
 @pytest.mark.parametrize('installer_impl', (EggInstaller, WheelInstaller))
-def test_pex_script(installer_impl, project_name):
-  with make_installer(name=project_name, installer_impl=installer_impl) as installer:
+def test_pex_script(installer_impl, project_name, zip_safe):
+  kw = dict(name=project_name, installer_impl=installer_impl, zip_safe=zip_safe)
+  with make_installer(**kw) as installer:
     bdist = DistributionHelper.distribution_from_path(installer.bdist())
 
     env_copy = os.environ.copy()
     env_copy['PEX_SCRIPT'] = 'hello_world'
     so, rc = run_simple_pex_test('', env=env_copy)
     assert rc == 1, so.decode('utf-8')
-    assert b'Could not find' in so
+    assert b'Could not find script hello_world' in so
 
     so, rc = run_simple_pex_test('', env=env_copy, dists=[bdist])
     assert rc == 0, so.decode('utf-8')