From 95c20ff7ed66d69c35b144a5427632febf5b7e90 Mon Sep 17 00:00:00 2001 From: Lauri Himanen <lauri.himanen@aalto.fi> Date: Thu, 19 Oct 2017 14:42:24 +0300 Subject: [PATCH] Fixed nomadcore and parser imports in setup_paths.py. --- parser/parser-vasp/vaspparser/setup_paths.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/parser/parser-vasp/vaspparser/setup_paths.py b/parser/parser-vasp/vaspparser/setup_paths.py index e0a0fb0..1202df8 100644 --- a/parser/parser-vasp/vaspparser/setup_paths.py +++ b/parser/parser-vasp/vaspparser/setup_paths.py @@ -1,6 +1,18 @@ -import sys, os, os.path +""" +Setups the python-common library in the PYTHONPATH system variable. +""" +import sys +import os +import os.path + baseDir = os.path.dirname(os.path.abspath(__file__)) -commonDir = os.path.normpath(os.path.join(baseDir,"../../../../python-common/common/python")) +commonDir = os.path.normpath(os.path.join(baseDir, "../../../../../python-common/common/python")) +parserDir = os.path.normpath(os.path.join(baseDir, "../../parser-vasp")) -if not commonDir in sys.path: - sys.path.insert(0, commonDir) +# Using sys.path.insert(1, ...) instead of sys.path.insert(0, ...) based on +# this discusssion: +# http://stackoverflow.com/questions/10095037/why-use-sys-path-appendpath-instead-of-sys-path-insert1-path +if commonDir not in sys.path: + sys.path.insert(1, commonDir) +if parserDir not in sys.path: + sys.path.insert(1, parserDir) -- GitLab