Briq
/
jaydebeapi
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support JPype versions before 0.6

master
baztian 2019-07-08 22:12:58 +02:00
parent 909429cf60
commit 6a03f63dd8
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jaydebeapi/__init__.py
View File

@ -173,10 +173,19 @@ def _jdbc_connect_jpype(jclassname, url, driver_args, jars, libs):
# jvm_path = ('/usr/lib/jvm/java-6-openjdk' # jvm_path = ('/usr/lib/jvm/java-6-openjdk'
# '/jre/lib/i386/client/libjvm.so') # '/jre/lib/i386/client/libjvm.so')
jvm_path = jpype.getDefaultJVMPath() jvm_path = jpype.getDefaultJVMPath()
if jpype.__version__.startswith("0.6"): jpype_ver = 0.
if hasattr(jpype, '__version__'):
try:
ver_match = re.match('\d+\.\d+', jpype.__version__)
if ver_match:
jpype_ver = float(ver_match.group(0))
except ValueError:
pass
if jpype_ver < 0.7:
jpype.startJVM(jvm_path, *args) jpype.startJVM(jvm_path, *args)
else: else:
jpype.startJVM(jvm_path, *args, ignoreUnrecognized=True, convertStrings=True) jpype.startJVM(jvm_path, *args, ignoreUnrecognized=True,
convertStrings=True)
if not jpype.isThreadAttachedToJVM(): if not jpype.isThreadAttachedToJVM():
jpype.attachThreadToJVM() jpype.attachThreadToJVM()
if _jdbc_name_to_const is None: if _jdbc_name_to_const is None: