Use project_on_sys_path context from Setuptools 22.0.1.

2 files changed, 8 insertions, 2 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index 48dce72..09d1d5e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+4.0
+===
+
+* Drop support for Setuptools before Setuptools 22.0.1.
+
 3.0.1
 =====
 
diff --git a/ptr.py b/ptr.py
index b238a1e..e270ff8 100644
--- a/ptr.py
+++ b/ptr.py
@@ -188,7 +188,8 @@ class PyTest(orig.test):
 			return
 		paths = map(_operator.attrgetter('location'), installed_dists)
 		with self.paths_on_pythonpath(paths):
-			self.with_project_on_sys_path(self.run_tests)
+			with self.project_on_sys_path():
+				return self.run_tests()
 
 	@property
 	def _argv(self):
@@ -196,7 +197,7 @@ class PyTest(orig.test):
 
 	def run_tests(self):
 		"""
-		Invoke pytest, replacing argv.
+		Invoke pytest, replacing argv. Return result code.
 		"""
 		with _save_argv(_sys.argv[:1] + self.addopts):
 			result_code = __import__('pytest').main()