diff --git a/fsl/data/image.py b/fsl/data/image.py
index 93c3b08e778d2260e68b34c779874ca26dc7fc45..0ad84953fbbde0b85137639febef14ccd467bcdc 100644
--- a/fsl/data/image.py
+++ b/fsl/data/image.py
@@ -351,7 +351,8 @@ class Image(Nifti1, props.HasProperties):
def __del__(self):
"""Prints a log message. """
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
def __hash__(self):
diff --git a/fsl/data/model.py b/fsl/data/model.py
index a336304ba509965ecb9b91e1bc139b4c842eaf65..2d87e39474df16e272f8095341d8a08e89ae3d5d 100644
--- a/fsl/data/model.py
+++ b/fsl/data/model.py
@@ -71,7 +71,8 @@ class Model(object):
def __del__(self):
"""Prints a log message."""
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
def __repr__(self):
diff --git a/fsl/data/tensorimage.py b/fsl/data/tensorimage.py
index 5e7ba03f9b1d62ef5135314cd82c7876255bc061..838910c8a9438e366a47e83aa1715db900b96b3a 100644
--- a/fsl/data/tensorimage.py
+++ b/fsl/data/tensorimage.py
@@ -121,7 +121,8 @@ class TensorImage(fslimage.Nifti1):
def __del__(self):
- log.memory('{}.del({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del({})'.format(type(self).__name__, id(self)))
def V1(self): return self.__v1
diff --git a/fsl/fsleyes/displaycontext/display.py b/fsl/fsleyes/displaycontext/display.py
index fcdbfdc0ed34c717f152d31a644ba9afd40f3035..b85ae494c753e146a5cab1b0663aaeb1765bb1ab 100644
--- a/fsl/fsleyes/displaycontext/display.py
+++ b/fsl/fsleyes/displaycontext/display.py
@@ -175,7 +175,8 @@ class Display(props.SyncableHasProperties):
def __del__(self):
"""Prints a log message."""
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
def getOverlay(self):
@@ -421,7 +422,8 @@ class DisplayOpts(props.SyncableHasProperties, actions.ActionProvider):
def __del__(self):
"""Prints a log message."""
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
def destroy(self):
diff --git a/fsl/fsleyes/displaycontext/displaycontext.py b/fsl/fsleyes/displaycontext/displaycontext.py
index f52082a455fe8ef04571ef3e4ea29bae834f9bfe..abc3ccb45e79567079e0a786b34e28a10ca0da31 100644
--- a/fsl/fsleyes/displaycontext/displaycontext.py
+++ b/fsl/fsleyes/displaycontext/displaycontext.py
@@ -262,7 +262,8 @@ class DisplayContext(props.SyncableHasProperties):
def __del__(self):
"""Prints a log message."""
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
def destroy(self):
diff --git a/fsl/fsleyes/editor/editor.py b/fsl/fsleyes/editor/editor.py
index 6b145db99b441af78972f1601e4d23082b92b588..5834e0611a99c5ebf090de6e11aa84b9ffc6e723 100644
--- a/fsl/fsleyes/editor/editor.py
+++ b/fsl/fsleyes/editor/editor.py
@@ -138,7 +138,8 @@ class Editor(props.HasProperties):
def __del__(self):
"""Prints a log message."""
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
def destroy(self):
diff --git a/fsl/fsleyes/editor/selection.py b/fsl/fsleyes/editor/selection.py
index 231ee23af2bf9c1bcb37b510947c3c4d19488b92..431b7f354c9a2b1764f9354a237b405bb778ae10 100644
--- a/fsl/fsleyes/editor/selection.py
+++ b/fsl/fsleyes/editor/selection.py
@@ -124,7 +124,8 @@ class Selection(props.HasProperties):
def __del__(self):
"""Prints a log message."""
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
diff --git a/fsl/fsleyes/gl/globject.py b/fsl/fsleyes/gl/globject.py
index 7acfd421553151da8986d0dde9fa4093f736daab..3c03d030e594c6b14bb1c216246b07a4e20bd83b 100644
--- a/fsl/fsleyes/gl/globject.py
+++ b/fsl/fsleyes/gl/globject.py
@@ -155,7 +155,8 @@ class GLObject(notifier.Notifier):
def __del__(self):
"""Prints a log message."""
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
def ready(self):
diff --git a/fsl/fsleyes/gl/shaders/arbp/program.py b/fsl/fsleyes/gl/shaders/arbp/program.py
index 47d8686025e5266fac0d3f696162c5f9b8cb2fc2..f82efed269260f532280db7b9523ed1e9d42c919 100644
--- a/fsl/fsleyes/gl/shaders/arbp/program.py
+++ b/fsl/fsleyes/gl/shaders/arbp/program.py
@@ -159,7 +159,8 @@ class ARBPShader(object):
def __del__(self):
"""Prints a log message. """
- log.memory('{}.del({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del({})'.format(type(self).__name__, id(self)))
def destroy(self):
diff --git a/fsl/fsleyes/gl/shaders/glsl/program.py b/fsl/fsleyes/gl/shaders/glsl/program.py
index 118569acc5d235c5a015f31a3b10877b2ca1d8e1..49275d54e68b2d3830ad4a546af951d1b629a488 100644
--- a/fsl/fsleyes/gl/shaders/glsl/program.py
+++ b/fsl/fsleyes/gl/shaders/glsl/program.py
@@ -162,7 +162,8 @@ class GLSLShader(object):
def __del__(self):
"""Prints a log message. """
- log.memory('{}.del({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del({})'.format(type(self).__name__, id(self)))
def load(self):
diff --git a/fsl/fsleyes/gl/textures/rendertexturestack.py b/fsl/fsleyes/gl/textures/rendertexturestack.py
index 6ed916c2380cf50e377fe617a6e5308536e984d3..3d662c0d0b0a500bea9d92a983a1b73c992bb143 100644
--- a/fsl/fsleyes/gl/textures/rendertexturestack.py
+++ b/fsl/fsleyes/gl/textures/rendertexturestack.py
@@ -78,7 +78,8 @@ class RenderTextureStack(object):
def __del__(self):
"""Prints a log message."""
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
def destroy(self):
diff --git a/fsl/fsleyes/gl/textures/texture.py b/fsl/fsleyes/gl/textures/texture.py
index 6b97faabbb5fd4c90cf3565d51329ea0d46cf698..b30f3f38e7f109154471b0f7a0c1fdcd2d615c43 100644
--- a/fsl/fsleyes/gl/textures/texture.py
+++ b/fsl/fsleyes/gl/textures/texture.py
@@ -111,7 +111,8 @@ class Texture(object):
def __del__(self):
"""Prints a log message."""
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
def destroy(self):
diff --git a/fsl/fsleyes/overlay.py b/fsl/fsleyes/overlay.py
index 9ce3af588df77f4171573da8739b57f4cc948334..f36c13ff460d3498b3d2e8f8524ec798f11d9e54 100644
--- a/fsl/fsleyes/overlay.py
+++ b/fsl/fsleyes/overlay.py
@@ -288,8 +288,6 @@ def loadOverlays(paths, loadFunc='default', errorFunc='default', saveDir=True):
not an :class:`OverlayList`.
"""
- defaultLoad = loadFunc == 'default'
-
# The default load function updates
# the dialog window created above
def defaultLoadFunc(s):
diff --git a/fsl/fsleyes/plotting/dataseries.py b/fsl/fsleyes/plotting/dataseries.py
index 067d8ab48712c2def4a7741234f1f25a6b9f1663..ef086dda7c3d1e7d38f4c09f160606c32ca4c78f 100644
--- a/fsl/fsleyes/plotting/dataseries.py
+++ b/fsl/fsleyes/plotting/dataseries.py
@@ -63,7 +63,8 @@ class DataSeries(props.HasProperties):
def __del__(self):
"""Prints a log message. """
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
def destroy(self):
diff --git a/fsl/fsleyes/profiles/__init__.py b/fsl/fsleyes/profiles/__init__.py
index c0e8cbc36788acef78c8dae2bdd8b431bbaf103b..34ba05eddd9a0dcae2daf7e9fec17150f1d5f66f 100644
--- a/fsl/fsleyes/profiles/__init__.py
+++ b/fsl/fsleyes/profiles/__init__.py
@@ -309,7 +309,8 @@ class Profile(props.SyncableHasProperties, actions.ActionProvider):
def __del__(self):
"""Prints a log message. """
- log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
+ if log:
+ log.memory('{}.del ({})'.format(type(self).__name__, id(self)))
def destroy(self):