Merged in embray/setuptools (pull request #167)

Possible fix for #207

1 files changed, 13 insertions, 0 deletions

diff --git a/setuptools/tests/contexts.py b/setuptools/tests/contexts.py
index 8c9a2d3e..ae28c7c3 100644
--- a/setuptools/tests/contexts.py
+++ b/setuptools/tests/contexts.py
@@ -6,6 +6,7 @@ import contextlib
 import site
 
 from setuptools.extern import six
+import pkg_resources
 
 
 @contextlib.contextmanager
@@ -78,6 +79,18 @@ def save_user_site_setting():
 
 
 @contextlib.contextmanager
+def save_pkg_resources_state():
+    pr_state = pkg_resources.__getstate__()
+    # also save sys.path
+    sys_path = sys.path[:]
+    try:
+        yield pr_state, sys_path
+    finally:
+        sys.path[:] = sys_path
+        pkg_resources.__setstate__(pr_state)
+
+
+@contextlib.contextmanager
 def suppress_exceptions(*excs):
     try:
         yield