From 0b79fc9ed1d3fc979b6613f9cf1c06263d352778 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Mon, 20 Jun 2016 15:18:06 +0200
Subject: [PATCH] Bugfix in fsl.utils.platform, importing itself instead of
built-in platform module.
---
fsl/utils/platform.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/fsl/utils/platform.py b/fsl/utils/platform.py
index e54440d8a..7736b6812 100644
--- a/fsl/utils/platform.py
+++ b/fsl/utils/platform.py
@@ -15,10 +15,21 @@ import logging
import os
import sys
-import platform as builtin_platform
+import importlib
import fsl.utils.notifier as notifier
+# An annoying consequence of using
+# a system-module name for our own
+# module is that we can't import
+# it directly (as it will attempt
+# to import itself, i.e. this module).
+#
+# This is only necessary in Python 2.x
+# (as python 3 disallows relative
+# imports).
+builtin_platform = importlib.import_module('platform')
+
log = logging.getLogger(__name__)
--
GitLab