1 files changed, 2 insertions, 18 deletions
diff --git a/setuptools/tests/py26compat.py b/setuptools/tests/py26compat.py
index e120e744..c53b4809 100644
--- a/setuptools/tests/py26compat.py
+++ b/setuptools/tests/py26compat.py
@@ -1,27 +1,11 @@
 import sys
-import unittest
 import tarfile
-
-try:
-	# provide skipIf for Python 2.4-2.6
-	skipIf = unittest.skipIf
-except AttributeError:
-	def skipIf(condition, reason):
-		def skipper(func):
-			def skip(*args, **kwargs):
-				return
-			if condition:
-				return skip
-			return func
-		return skipper
+import contextlib
 
 def _tarfile_open_ex(*args, **kwargs):
 	"""
 	Extend result as a context manager.
 	"""
-	res = tarfile.open(*args, **kwargs)
-	res.__exit__ = lambda exc_type, exc_value, traceback: res.close()
-	res.__enter__ = lambda: res
-	return res
+	return contextlib.closing(tarfile.open(*args, **kwargs))
 
 tarfile_open = _tarfile_open_ex if sys.version_info < (2,7) else tarfile.open