Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 14 Jan 2014 15:51:15 +0000
changeset 1314 48123437bbc5
parent 1312 c44d24e2fc66 (current diff)
parent 1313 2a1cad657b6d (diff)
child 1322 95880c8fedb6
Merge with stable
--- 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'