Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
rls1801 report: meltdown and spectremeltdown static content edits.
[csit.git]
/
resources
/
tools
/
presentation
/
specification_parser.py
diff --git
a/resources/tools/presentation/specification_parser.py
b/resources/tools/presentation/specification_parser.py
index
7ee6dbb
..
501f9f1
100644
(file)
--- a/
resources/tools/presentation/specification_parser.py
+++ b/
resources/tools/presentation/specification_parser.py
@@
-486,7
+486,7
@@
class Specification(object):
pass
# add data sets to the elements:
pass
# add data sets to the elements:
- if isinstance(element
["data"]
, str):
+ if isinstance(element
.get("data", None)
, str):
data_set = element["data"]
try:
element["data"] = self.configuration["data-sets"][data_set]
data_set = element["data"]
try:
element["data"] = self.configuration["data-sets"][data_set]
@@
-515,7
+515,7
@@
class Specification(object):
element["layout"].pop("layout")
try:
for key, val in (self.configuration["plot-layouts"]
element["layout"].pop("layout")
try:
for key, val in (self.configuration["plot-layouts"]
- [layout]):
+ [layout]
.items()
):
element["layout"][key] = val
except KeyError:
raise PresentationError("Layout {0} is not defined in "
element["layout"][key] = val
except KeyError:
raise PresentationError("Layout {0} is not defined in "
@@
-558,9
+558,6
@@
class Specification(object):
self._parse_output()
self._parse_static()
self._parse_elements()
self._parse_output()
self._parse_static()
self._parse_elements()
- print(self.tables)
- print(self.files)
- print(self.plots)
logging.debug("Specification: \n{}".
format(pformat(self._specification)))
logging.debug("Specification: \n{}".
format(pformat(self._specification)))