Skip to content

Commit

Permalink
Added bundled std lib to TraditionalClassLoader
Browse files Browse the repository at this point in the history
  • Loading branch information
ronyhe committed Jul 31, 2018
1 parent af98633 commit c4f9b60
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions pyjvm/core/class_loaders.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from pyjvm.core.jvm_types import RootObjectType, ObjectReferenceType, JvmObject
from pyjvm.utils.jawa_conversions import convert_class_file
from pyjvm.utils.utils import path_to_std_lib_as_str


class LoaderEntry:
Expand Down Expand Up @@ -183,8 +184,10 @@ class TraditionalLoader(ClassLoader):

def __init__(self, cp_string):
super().__init__()
# noinspection PyUnresolvedReferences
self._jawa_loader = JawaLoader(*cp_string.split(':'))
parts = [cp.strip() for cp in cp_string.split(':')]
parts = [cp for cp in parts if cp]
parts.insert(0, path_to_std_lib_as_str())
self._jawa_loader = JawaLoader(*parts)

def _load_jvm_class(self, name):
cf = self._jawa_loader[name]
Expand Down

0 comments on commit c4f9b60

Please sign in to comment.