Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/proxy_default' into…
Browse files Browse the repository at this point in the history
… proxy_default
  • Loading branch information
Thrameos committed Oct 19, 2024
2 parents 3026af0 + feeda0c commit 1efd1d8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions jpype/_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@ def startJVM(
if classpath:
extra_jvm_args += (f'-Djava.class.path={_handleClassPath(classpath)}', )

supportLib = os.path.join(os.path.dirname(os.path.dirname(__file__)),"org.jpype.jar")
supportLib = os.path.join(os.path.dirname(os.path.dirname(__file__)), "org.jpype.jar")
if not os.path.exists(supportLib):
raise RuntimeError("Unable to find org.jpype.jar support library at "+supportLib)
extra_jvm_args += ('-javaagent:'+supportLib,)
raise RuntimeError("Unable to find org.jpype.jar support library at " + supportLib)
extra_jvm_args += ('-javaagent:' + supportLib,)

try:
import locale
Expand Down

0 comments on commit 1efd1d8

Please sign in to comment.