From bbdaaeaba42a4cf6ed61fed424e253aeb9b29a6a Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Tue, 3 Nov 2015 14:35:46 +0100
Subject: Minor refactorisation of `get_datafile_path()`

---
 libmat/mat.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'libmat/mat.py')

diff --git a/libmat/mat.py b/libmat/mat.py
index 3947606..decbbed 100644
--- a/libmat/mat.py
+++ b/libmat/mat.py
@@ -48,12 +48,11 @@ def get_datafile_path(filename):
     """ Return the path to $filename
     :param string filename:
     """
-    if os.path.isfile(os.path.join(os.path.curdir, 'data', filename)):
-        return os.path.join(os.path.curdir, 'data', filename)
-    elif os.path.isfile(os.path.join('/usr/local/share/mat/', filename)):
-        return os.path.join('/usr/local/share/mat/', filename)
-    elif os.path.isfile(os.path.join('/usr/share/mat/', filename)):
-        return os.path.join('/usr/share/mat/', filename)
+    paths = ['data', '/usr/local/share/mat/', '/usr/share/mat/']
+    for path in paths:
+        filepath = os.path.join(os.path.curdir, path, filename)
+        if os.path.isfile(filepath):
+            return filepath
 
 
 def list_supported_formats():
-- 
cgit v1.3