diff --git a/pykat/exceptions.py b/pykat/exceptions.py index e268327a669ddbc43dbde8d72046f3dcd6f1c967..1c28f65d51eb8d9c22190930da4220e635503a38 100644 --- a/pykat/exceptions.py +++ b/pykat/exceptions.py @@ -26,5 +26,6 @@ class FinesseRunError(BasePyKatException) : self.__err = err self.__kat = kat - BasePyKatException.__init__(self, "Finesse returned an error running {1}: {0}".format(self.__err, self.__kat)) + BasePyKatException.__init__(self, "Finesse error (file {1}):\n{0}".format(self.__err, self.__kat)) + #BasePyKatException.__init__(self, "{0}".format(self.__err)) diff --git a/pykat/finesse.py b/pykat/finesse.py index a39e583a8c4bfcf02e150138c9f4e469af05f12c..385404b5da9cffda60f276203e0f283938d2f6ce 100644 --- a/pykat/finesse.py +++ b/pykat/finesse.py @@ -225,7 +225,7 @@ class kat(object): warnings.warn("found block {0} before block {1} ended".format(newTag, self.__currentTag)) if newTag in self.__blocks: - raise pkex.BasePyKatException("Block `{0}` has already been read") + raise pkex.BasePyKatException("Block `{0}` has already been read").format(newTag) self.__blocks[newTag] = Block(newTag) # create new list to store all references to components in block self.__currentTag = newTag @@ -577,8 +577,9 @@ class kat(object): for key in self.__blocks: objs = self.__blocks[key].contents - - out.append("%%% FTblock " + key + "\n") + + if key != NO_BLOCK: + out.append("%%% FTblock " + key + "\n") for obj in objs: if isinstance(obj, str): @@ -593,8 +594,9 @@ class kat(object): out.append(t + "\n") else: out.append(txt + "\n") - - out.append("%%% FTend " + key + "\n") + + if key != NO_BLOCK: + out.append("%%% FTend " + key + "\n") if self.noxaxis != None and self.noxaxis == True: out.append("noxaxis\n") diff --git a/pykat/param.py b/pykat/param.py index 9a13f0b458619c810dfd3ae9931f01a2c3447cbf..058a5330936f481250d8677981a847c779b0045e 100644 --- a/pykat/param.py +++ b/pykat/param.py @@ -164,4 +164,4 @@ class AttrParam(Param): rtn.extend(super(AttrParam, self).getFinesseText()) - return rtn \ No newline at end of file + return rtn