From 53a0041585814c2279198ba0a28842297d627779 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chmielewski@allegrogroup.com>
Date: Fri, 1 Aug 2014 17:47:01 +0200
Subject: [PATCH 1/3] Test for #3

---
 tests/system_provided_packages/README.md   |  1 +
 tests/system_provided_packages/Vagrantfile | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 tests/system_provided_packages/README.md
 create mode 100644 tests/system_provided_packages/Vagrantfile

diff --git a/tests/system_provided_packages/README.md b/tests/system_provided_packages/README.md
new file mode 100644
index 000000000..c476bbcba
--- /dev/null
+++ b/tests/system_provided_packages/README.md
@@ -0,0 +1 @@
+Fire `vagrant up` to check if `pex` imports system wide site-packages.
diff --git a/tests/system_provided_packages/Vagrantfile b/tests/system_provided_packages/Vagrantfile
new file mode 100644
index 000000000..787602402
--- /dev/null
+++ b/tests/system_provided_packages/Vagrantfile
@@ -0,0 +1,23 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+$install_packages = <<SCRIPT
+which pex && exit 0
+sudo apt-get install -y python-pip python-gtk2
+sudo pip install pex wheel
+SCRIPT
+
+$import_gobject = <<SCRIPT
+echo "import gobject" > import_gobject.py
+export PEX_VERBOSE=1
+pex --inherit-path -- import_gobject.py
+SCRIPT
+
+Vagrant.configure(2) do |config|
+
+  config.vm.box = "ubuntu/trusty64"
+
+  config.vm.provision "shell", inline: $install_packages
+
+  config.vm.provision "shell", inline: $import_gobject
+end

From ebdc6b8d28fd8c0d9d70df2a412dfc90df048b53 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 29 Aug 2014 22:34:23 +0200
Subject: [PATCH 2/3] Testing development version from current dir instead of
 pip one

---
 tests/system_provided_packages/Vagrantfile | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/tests/system_provided_packages/Vagrantfile b/tests/system_provided_packages/Vagrantfile
index 787602402..42b6baffa 100644
--- a/tests/system_provided_packages/Vagrantfile
+++ b/tests/system_provided_packages/Vagrantfile
@@ -2,13 +2,19 @@
 # vi: set ft=ruby :
 
 $install_packages = <<SCRIPT
-which pex && exit 0
+which pip && exit 0
 sudo apt-get install -y python-pip python-gtk2
-sudo pip install pex wheel
+sudo pip install wheel
 SCRIPT
 
 $import_gobject = <<SCRIPT
-echo "import gobject" > import_gobject.py
+cd /pex_src
+sudo python setup.py install
+cd
+cat > import_gobject.py << __EOF
+import gobject
+print gobject.__file__
+__EOF
 export PEX_VERBOSE=1
 pex --inherit-path -- import_gobject.py
 SCRIPT
@@ -17,6 +23,8 @@ Vagrant.configure(2) do |config|
 
   config.vm.box = "ubuntu/trusty64"
 
+  config.vm.synced_folder "../../", "/pex_src"
+
   config.vm.provision "shell", inline: $install_packages
 
   config.vm.provision "shell", inline: $import_gobject

From 9db2de6daac22a3b245cc243d1dcb46b008580b6 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 29 Aug 2014 22:35:06 +0200
Subject: [PATCH 3/3] --inherit-path makes system site packages visible for pex

---
 pex/pex.py | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/pex/pex.py b/pex/pex.py
index 690acf21f..06ecb9ed5 100644
--- a/pex/pex.py
+++ b/pex/pex.py
@@ -116,8 +116,21 @@ def minimum_sys_modules(cls, site_libs):
 
     return new_modules
 
+  def minimum_sys_path(self, site_libs):
+    sys_path = OrderedSet(sys.path)
+
+    if not self._pex_info.inherit_path:
+        sys_path = list(sys_path - self._scrub_paths(site_libs))
+
+    scrub_from_importer_cache = filter(
+      lambda key: any(key.startswith(path) for path in sys_path),
+      sys.path_importer_cache.keys())
+    scrubbed_importer_cache = dict((key, value) for (key, value) in sys.path_importer_cache.items()
+      if key not in scrub_from_importer_cache)
+    return sys_path, scrubbed_importer_cache
+
   @classmethod
-  def minimum_sys_path(cls, site_libs):
+  def _scrub_paths(cls, site_libs):
     site_distributions = OrderedSet()
     for path_element in sys.path:
       if any(path_element.startswith(site_lib) for site_lib in site_libs):
@@ -132,31 +145,24 @@ def minimum_sys_path(cls, site_libs):
       TRACER.log('Scrubbing from user site: %s' % path)
 
     scrub_paths = site_distributions | user_site_distributions
-    scrubbed_sys_path = list(OrderedSet(sys.path) - scrub_paths)
-    scrub_from_importer_cache = filter(
-      lambda key: any(key.startswith(path) for path in scrub_paths),
-      sys.path_importer_cache.keys())
-    scrubbed_importer_cache = dict((key, value) for (key, value) in sys.path_importer_cache.items()
-      if key not in scrub_from_importer_cache)
-    return scrubbed_sys_path, scrubbed_importer_cache
+    return scrub_paths
 
-  @classmethod
-  def minimum_sys(cls):
+  def minimum_sys(self):
     """Return the minimum sys necessary to run this interpreter, a la python -S.
 
     :returns: (sys.path, sys.path_importer_cache, sys.modules) tuple of a
       bare python installation.
     """
-    site_libs = set(cls._site_libs())
+    site_libs = set(self._site_libs())
     for site_lib in site_libs:
       TRACER.log('Found site-library: %s' % site_lib)
-    for extras_path in cls._extras_paths():
+    for extras_path in self._extras_paths():
       TRACER.log('Found site extra: %s' % extras_path)
       site_libs.add(extras_path)
     site_libs = set(os.path.normpath(path) for path in site_libs)
 
-    sys_modules = cls.minimum_sys_modules(site_libs)
-    sys_path, sys_path_importer_cache = cls.minimum_sys_path(site_libs)
+    sys_modules = self.minimum_sys_modules(site_libs)
+    sys_path, sys_path_importer_cache = self.minimum_sys_path(site_libs)
 
     return sys_path, sys_path_importer_cache, sys_modules
 
@@ -178,9 +184,8 @@ def patch(working_set):
     finally:
       patch(old_working_set)
 
-  @classmethod
   @contextmanager
-  def patch_sys(cls):
+  def patch_sys(self):
     """Patch sys with all site scrubbed."""
     def patch_dict(old_value, new_value):
       old_value.clear()
@@ -193,7 +198,7 @@ def patch_all(path, path_importer_cache, modules):
 
     old_sys_path, old_sys_path_importer_cache, old_sys_modules = (
         sys.path[:], sys.path_importer_cache.copy(), sys.modules.copy())
-    new_sys_path, new_sys_path_importer_cache, new_sys_modules = cls.minimum_sys()
+    new_sys_path, new_sys_path_importer_cache, new_sys_modules = self.minimum_sys()
 
     patch_all(new_sys_path, new_sys_path_importer_cache, new_sys_modules)