Skip to content

Commit 31bceb2

Browse files
committed
[OMCSessionCmd] fix all try ... except ... usages - check for OMCSessionException
1 parent 510917e commit 31bceb2

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

OMPython/OMCSession.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,11 @@ def getClassComment(self, className):
186186
try:
187187
return self._ask(question='getClassComment', opt=[className])
188188
except pyparsing.ParseException as ex:
189-
logger.warning("Method 'getClassComment' failed for %s", className)
190-
logger.warning('OMTypedParser error: %s', ex.msg)
189+
logger.warning("Method 'getClassComment(%s)' failed; OMTypedParser error: %s",
190+
className, ex.msg)
191191
return 'No description available'
192+
except OMCSessionException:
193+
raise
192194

193195
def getNthComponent(self, className, comp_id):
194196
""" returns with (type, name, description) """
@@ -217,13 +219,18 @@ def getParameterNames(self, className):
217219
logger.warning('OMPython error: %s', ex)
218220
# FIXME: OMC returns with a different structure for empty parameter set
219221
return []
222+
except OMCSessionException:
223+
raise
220224

221225
def getParameterValue(self, className, parameterName):
222226
try:
223227
return self._ask(question='getParameterValue', opt=[className, parameterName])
224228
except pyparsing.ParseException as ex:
225-
logger.warning('OMTypedParser error: %s', ex.msg)
229+
logger.warning("Method 'getParameterValue(%s, %s)' failed; OMTypedParser error: %s",
230+
className, parameterName, ex.msg)
226231
return ""
232+
except OMCSessionException:
233+
raise
227234

228235
def getComponentModifierNames(self, className, componentName):
229236
return self._ask(question='getComponentModifierNames', opt=[className, componentName])

0 commit comments

Comments
 (0)