From a30aa80dcc42bc30de4413f42a8ce2f5cf797bce Mon Sep 17 00:00:00 2001 From: Jerome Carretero Date: Wed, 8 Feb 2012 00:42:08 -0500 Subject: [PATCH] Revert "cleanup" This reverts commit 3fa197298ba8adb7700c8054ae8de8296c3e77ad. Trying to import extras/subprocess first fails on Python 3.{1,2}. --- waflib/Utils.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/waflib/Utils.py b/waflib/Utils.py index 19eed2c7..16b9737a 100644 --- a/waflib/Utils.py +++ b/waflib/Utils.py @@ -11,9 +11,12 @@ through Python versions 2.3 to 3.X and across different platforms (win32, linux, import os, sys, errno, traceback, inspect, re, shutil, datetime, gc try: - from waflib.extras import subprocess -except ImportError: import subprocess +except: + try: + import waflib.extras.subprocess as subprocess + except: + print("The subprocess module is missing (python2.3?):\n try calling 'waf update --files=subprocess'\n or add a copy of subprocess.py to the python libraries") try: from collections import deque