From d5645cf9794e869c7db3554f70d37680f716252a Mon Sep 17 00:00:00 2001 From: marcel Date: Wed, 2 Aug 2017 11:02:24 +0200 Subject: [PATCH] [bugfix] string transformation of None values --- autoPyLoT.py | 7 ++++++- pylot/core/util/utils.py | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/autoPyLoT.py b/autoPyLoT.py index baa56c85..eb1a7d25 100755 --- a/autoPyLoT.py +++ b/autoPyLoT.py @@ -26,6 +26,7 @@ from pylot.core.util.dataprocessing import restitute_data, read_metadata, \ from pylot.core.util.structure import DATASTRUCTURE from pylot.core.util.version import get_git_version as _getVersionString from pylot.core.util.event import Event +from pylot.core.util.utils import real_None __version__ = _getVersionString() @@ -56,6 +57,10 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even ***********************************'''.format(version=_getVersionString()) print(splash) + parameter = real_None(parameter) + inputfile = real_None(inputfile) + eventid = real_None(eventid) + locflag = 1 if input_dict and isinstance(input_dict, dict): if 'parameter' in input_dict: @@ -433,5 +438,5 @@ if __name__ == "__main__": cla = parser.parse_args() - picks = autoPyLoT(inputfile=str(cla.inputfile), fnames=str(cla.fnames), + picks = autoPyLoT(inputfile=str(cla.inputfile), fnames=str(cla.fnames), eventid=str(cla.eventid), savepath=str(cla.spath)) diff --git a/pylot/core/util/utils.py b/pylot/core/util/utils.py index 19440226..e38d6578 100644 --- a/pylot/core/util/utils.py +++ b/pylot/core/util/utils.py @@ -181,6 +181,11 @@ def fnConstructor(s): fn = '_' + fn return fn +def real_None(value): + if value == 'None': + return None + else: + return value def four_digits(year): """