diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-28 18:23:34 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-28 18:23:34 +0200 |
commit | 72c39ad485d174c2e8e1fef34b8e9e392a94458a (patch) | |
tree | c61b2af2b3861f6bffb4955e0733687c337cb35a /engine/SCons/Debug.py | |
parent | daa63b77a7e2963e59a238e0dca7ceffce91ee99 (diff) |
Imported Upstream version 2.4.0upstream/2.4.0
Diffstat (limited to 'engine/SCons/Debug.py')
-rw-r--r-- | engine/SCons/Debug.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/engine/SCons/Debug.py b/engine/SCons/Debug.py index 8adf7ca..0aa077d 100644 --- a/engine/SCons/Debug.py +++ b/engine/SCons/Debug.py @@ -28,12 +28,13 @@ needed by most users. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Debug.py rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog" +__revision__ = "src/engine/SCons/Debug.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog" import os import sys import time import weakref +import inspect # Global variable that gets set to 'True' by the Main script, # when the creation of class instances should get tracked. @@ -46,7 +47,12 @@ def logInstanceCreation(instance, name=None): name = instance.__class__.__name__ if name not in tracked_classes: tracked_classes[name] = [] - tracked_classes[name].append(weakref.ref(instance)) + if hasattr(instance, '__dict__'): + tracked_classes[name].append(weakref.ref(instance)) + else: + # weakref doesn't seem to work when the instance + # contains only slots... + tracked_classes[name].append(instance) def string_to_classes(s): if s == '*': @@ -66,7 +72,10 @@ def listLoggedInstances(classes, file=sys.stdout): for classname in string_to_classes(classes): file.write('\n%s:\n' % classname) for ref in tracked_classes[classname]: - obj = ref() + if inspect.isclass(ref): + obj = ref() + else: + obj = ref if obj is not None: file.write(' %s\n' % repr(obj)) |