# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1392037722 -3600
# Node ID 89668f3ba3bc308526d4c50051e3c548629c7819
# Parent  0af7748569a8b43142ffd951d4291b42833eb439# Parent  8caca8a82e37be71ea4b715b07ee850220cf5059
Merge with stable

diff -r 0af7748569a8 -r 89668f3ba3bc tests/hghave.py
--- a/tests/hghave.py	Tue Feb 04 00:22:20 2014 +0100
+++ b/tests/hghave.py	Mon Feb 10 14:08:42 2014 +0100
@@ -248,6 +248,9 @@
     except ImportError:
         return False
 
+def has_python243():
+    return sys.version_info >= (2, 4, 3)
+
 def has_outer_repo():
     # failing for other reasons than 'no repo' imply that there is a repo
     return not matchoutput('hg root 2>&1',
@@ -320,6 +323,7 @@
     "p4": (has_p4, "Perforce server and client"),
     "pyflakes": (has_pyflakes, "Pyflakes python linter"),
     "pygments": (has_pygments, "Pygments source highlighting library"),
+    "python243": (has_python243, "python >= 2.4.3"),
     "root": (has_root, "root permissions"),
     "serve": (has_serve, "platform and python can manage 'hg serve -d'"),
     "ssl": (has_ssl, "python >= 2.6 ssl module and python OpenSSL"),