diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 11:25:54 +0200 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 11:25:54 +0200 |
| commit | f920539cfcaf32813d390bfa501a08ea8bf8ec89 (patch) | |
| tree | 1b8d1d57e9b38d43d01c28521c2e34aff743adb5 /src/engine/SCons/Util.py | |
| parent | f9b265b27769aff6cff204cea5402d69ead3dda0 (diff) | |
| parent | ba4425ab5227fd9597fccd368bffff6bf1032149 (diff) | |
Merge commit 'upstream/2.1.0'
Diffstat (limited to 'src/engine/SCons/Util.py')
| -rw-r--r-- | src/engine/SCons/Util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py index 1ffbd03..cedd78c 100644 --- a/src/engine/SCons/Util.py +++ b/src/engine/SCons/Util.py @@ -3,7 +3,7 @@ Various utility functions go here. """ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -24,7 +24,7 @@ Various utility functions go here. # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "src/engine/SCons/Util.py 5134 2010/08/16 23:02:40 bdeegan" +__revision__ = "src/engine/SCons/Util.py 5357 2011/09/09 21:31:03 bdeegan" import os import sys @@ -464,7 +464,7 @@ def semi_deepcopy(x): if copier: return copier(x) else: - if hasattr(x, '__semi_deepcopy__'): + if hasattr(x, '__semi_deepcopy__') and callable(x.__semi_deepcopy__): return x.__semi_deepcopy__() elif isinstance(x, UserDict): return x.__class__(_semi_deepcopy_dict(x)) |