# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1383326089 0
# Node ID f103c0693fbb677543cca9195233988498cbeaf7
# Parent  ce8024f2783737529f88dd7c31f5658861c3776b# Parent  761641fc16a63cdc1aa633f91147a939b912a135
Merge with stable

diff -r ce8024f27837 -r f103c0693fbb tests/hghave.py
--- a/tests/hghave.py	Mon Oct 07 13:51:33 2013 +0100
+++ b/tests/hghave.py	Fri Nov 01 17:14:49 2013 +0000
@@ -277,6 +277,14 @@
 def has_aix():
     return sys.platform.startswith("aix")
 
+def has_absimport():
+    import __future__
+    from mercurial import util
+    return util.safehasattr(__future__, "absolute_import")
+
+def has_py3k():
+    return 3 == sys.version_info[0]
+
 checks = {
     "true": (lambda: True, "yak shaving"),
     "false": (lambda: False, "nail clipper"),
@@ -318,4 +326,6 @@
     "windows": (has_windows, "Windows"),
     "msys": (has_msys, "Windows with MSYS"),
     "aix": (has_aix, "AIX"),
+    "absimport": (has_absimport, "absolute_import in __future__"),
+    "py3k": (has_py3k, "running with Python 3.x"),
 }