Changeset 14102

Timestamp:

Nov 18, 2019 11:56:46 AM (3 weeks ago)

Author:

randersson

Message:

#5819 Merged r14098 to trunk from branch containing fix for use of newer jpype

Location:

trunk

Files:

• . (modified) (1 prop)
• Python/src/pymodelica/compiler_wrappers.py (modified) (3 diffs)

trunk/Python/src/pymodelica/compiler_wrappers.py

@@ -24 +24 @@
 from .compiler_interface import *
 from .compiler_logging import CompilerLogHandler, LogHandlerThread
-from pymodelica.common import python3_flag
 from pymodelica.common.core import list_to_string
 from .compiler_exceptions import *
-
+from distutils.version import StrictVersion
+jpype_jexception_compatibility = True if StrictVersion(jpype.__version__) >= '0.7.0' else False
 class ModelicaCompiler(object):
     """ 
@@ -40 +40 @@
         Modelica models. A compiler instance can be used multiple times.
         """
-        self._java_exception = jpype.JException if python3_flag else jpype.JavaException
+        self._java_exception = jpype.JException if jpype_jexception_compatibility else jpype.JavaException
         
         try:
@@ -523 +523 @@
             #  we need to compare the raised exception with the reference exception
             #  in different ways.
-            return type(raised_ex) is ref_ex if python3_flag else raised_ex.javaClass() is ref_ex
+            return type(raised_ex) is ref_ex if jpype_jexception_compatibility else raised_ex.javaClass() is ref_ex
 
         if _py_handle_exception(ex, CompilerException):