From c66e92f020a391d461b594d6104f61a3abadb940 Mon Sep 17 00:00:00 2001 From: Greg Noel Date: Mon, 26 Apr 2010 18:49:06 +0000 Subject: http://scons.tigris.org/issues/show_bug.cgi?id=2345 Apply all the remaining changes from the fixers. --- bench/is_types.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'bench') diff --git a/bench/is_types.py b/bench/is_types.py index 0353dc8a..b47c3812 100644 --- a/bench/is_types.py +++ b/bench/is_types.py @@ -5,9 +5,13 @@ # src/engine/SCons/Util.py. import types -from UserDict import UserDict -from UserList import UserList -from UserString import UserString +try: + from collections import UserDict, UserList, UserString +except ImportError: + # No 'collections' module or no UserFoo in collections + exec('from UserDict import UserDict') + exec('from UserList import UserList') + exec('from UserString import UserString') InstanceType = types.InstanceType DictType = dict @@ -25,19 +29,17 @@ else: # User* type. def original_is_Dict(e): - return isinstance(e, dict) or isinstance(e, UserDict) + return isinstance(e, (dict,UserDict)) def original_is_List(e): - return isinstance(e, list) or isinstance(e, UserList) + return isinstance(e, (list,UserList)) if UnicodeType is not None: def original_is_String(e): - return isinstance(e, str) \ - or isinstance(e, unicode) \ - or isinstance(e, UserString) + return isinstance(e, (str,unicode,UserString)) else: def original_is_String(e): - return isinstance(e, str) or isinstance(e, UserString) + return isinstance(e, (str,UserString)) -- cgit v1.2.1