projects
/
osm
/
LCM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing Basic 12 Ns Primitives
[osm/LCM.git]
/
osm_lcm
/
ROclient.py
diff --git
a/osm_lcm/ROclient.py
b/osm_lcm/ROclient.py
index
32dd1bf
..
e3cb7f7
100644
(file)
--- a/
osm_lcm/ROclient.py
+++ b/
osm_lcm/ROclient.py
@@
-190,7
+190,7
@@
class ROClient:
)
if descriptor_format != "json":
try:
)
if descriptor_format != "json":
try:
- return yaml.load(descriptor)
+ return yaml.
safe_
load(descriptor)
except yaml.YAMLError as exc:
error_pos = ""
if hasattr(exc, "problem_mark"):
except yaml.YAMLError as exc:
error_pos = ""
if hasattr(exc, "problem_mark"):
@@
-214,7
+214,7
@@
class ROClient:
def _parse_error_yaml(descriptor):
json_error = None
try:
def _parse_error_yaml(descriptor):
json_error = None
try:
- json_error = yaml.
load(descriptor, Loader=yaml.Loade
r)
+ json_error = yaml.
safe_load(descripto
r)
return json_error["error"]["description"]
except Exception:
return str(json_error or descriptor)
return json_error["error"]["description"]
except Exception:
return str(json_error or descriptor)
@@
-222,7
+222,7
@@
class ROClient:
@staticmethod
def _parse_yaml(descriptor, response=False):
try:
@staticmethod
def _parse_yaml(descriptor, response=False):
try:
- return yaml.
load(descriptor, Loader=yaml.Loade
r)
+ return yaml.
safe_load(descripto
r)
except yaml.YAMLError as exc:
error_pos = ""
if hasattr(exc, "problem_mark"):
except yaml.YAMLError as exc:
error_pos = ""
if hasattr(exc, "problem_mark"):