# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1389714675 0
# Node ID 48123437bbc562151d6971732419687ba1420c51
# Parent  c44d24e2fc66ab201a4349121ad6c14430239136# Parent  2a1cad657b6d59e2f1d274461f0fbd208c9e06d7
Merge with stable

diff -r c44d24e2fc66 -r 48123437bbc5 tests/run-tests.py
--- a/tests/run-tests.py	Thu Nov 28 12:59:05 2013 +0000
+++ b/tests/run-tests.py	Tue Jan 14 15:51:15 2014 +0000
@@ -63,7 +63,7 @@
 # subprocess._cleanup can race with any Popen.wait or Popen.poll on py24
 # http://bugs.python.org/issue1731717 for details. We shouldn't be producing
 # zombies but it's pretty harmless even if we do.
-if sys.version_info[1] < 5:
+if sys.version_info < (2, 5):
     subprocess._cleanup = lambda: None
 
 closefds = os.name == 'posix'