tests/hghave.py
changeset 46097 1b5e0d0bdb05
parent 45987 d42809b6b10f
child 46163 ebcc52046096
--- a/tests/hghave.py	Sat Dec 05 23:35:55 2020 +0100
+++ b/tests/hghave.py	Tue Dec 08 12:43:18 2020 -0500
@@ -886,17 +886,16 @@
         return False
 
 
-@check("py2virtualenv", "Python2 virtualenv support")
-def has_py2virtualenv():
-    if sys.version_info[0] != 2:
-        return False
-
+@check("virtualenv", "virtualenv support")
+def has_virtualenv():
     try:
         import virtualenv
 
-        virtualenv.ACTIVATE_SH
-        return True
-    except ImportError:
+        # --no-site-package became the default in 1.7 (Nov 2011), and the
+        # argument was removed in 20.0 (Feb 2020).  Rather than make the
+        # script complicated, just ignore ancient versions.
+        return int(virtualenv.__version__.split('.')[0]) > 1
+    except (AttributeError, ImportError, IndexError):
         return False