Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
pykat
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sebastian Steinlechner
pykat
Commits
8fdb337c
Commit
8fdb337c
authored
11 years ago
by
Andreas Freise
Browse files
Options
Downloads
Patches
Plain Diff
fixing problems with Block reading/writing.
parent
464d25cc
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
pykat/exceptions.py
+2
-1
2 additions, 1 deletion
pykat/exceptions.py
pykat/finesse.py
+7
-5
7 additions, 5 deletions
pykat/finesse.py
pykat/param.py
+1
-1
1 addition, 1 deletion
pykat/param.py
with
10 additions
and
7 deletions
pykat/exceptions.py
+
2
−
1
View file @
8fdb337c
...
...
@@ -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))
This diff is collapsed.
Click to expand it.
pykat/finesse.py
+
7
−
5
View file @
8fdb337c
...
...
@@ -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
...
...
@@ -578,6 +578,7 @@ class kat(object):
for
key
in
self
.
__blocks
:
objs
=
self
.
__blocks
[
key
].
contents
if
key
!=
NO_BLOCK
:
out
.
append
(
"
%%% FTblock
"
+
key
+
"
\n
"
)
for
obj
in
objs
:
...
...
@@ -594,6 +595,7 @@ class kat(object):
else
:
out
.
append
(
txt
+
"
\n
"
)
if
key
!=
NO_BLOCK
:
out
.
append
(
"
%%% FTend
"
+
key
+
"
\n
"
)
if
self
.
noxaxis
!=
None
and
self
.
noxaxis
==
True
:
...
...
This diff is collapsed.
Click to expand it.
pykat/param.py
+
1
−
1
View file @
8fdb337c
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment