From 80ae1d65de7329f655fc3f6367dd8e5532a2b85f Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Fri, 23 Dec 2016 20:03:00 +0000
Subject: [PATCH] Fixes to slightly shitty logic in previous commit
---
fsl/utils/platform.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/fsl/utils/platform.py b/fsl/utils/platform.py
index 21dd92a19..df2677e7c 100644
--- a/fsl/utils/platform.py
+++ b/fsl/utils/platform.py
@@ -280,13 +280,16 @@ class Platform(notifier.Notifier):
"""Changes the value of the :attr:`fsldir` property, and notifies any
registered listeners.
"""
- value = value.strip()
-
- if value == '': value = None
+
+ if value is not None:
+ value = value.strip()
+
+ if value is None: pass
+ elif value == '': value = None
elif not op.exists(value): value = None
elif not op.isdir(value): value = None
- self.__fsldir = value
+ self.__fsldir = value
if value is not None:
os.environ['FSLDIR'] = value
--
GitLab