Skip to content

Commit a8672dd

Browse files
committed
Revert "allow walking not-yet-classloaded java packages during import"
This reverts commit cb4843e.
1 parent 392ee71 commit a8672dd

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

graalpython/lib-graalpython/java.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ def __getattr__(key, default=None):
6565
try:
6666
return type(modname + key)
6767
except KeyError:
68-
# allow walking through not-yet-classloaded packages
69-
return JavaPackageLoader._create_module(loadname)
68+
pass
7069
raise AttributeError(key)
7170
return __getattr__
7271
else:
@@ -133,20 +132,12 @@ class JavaImportFinder:
133132
def find_spec(fullname, path, target=None):
134133
if JavaPackageLoader.is_java_package(fullname):
135134
return _frozen_importlib.ModuleSpec(fullname, JavaPackageLoader, is_package=True)
136-
elif path == __path__:
137-
try:
138-
# do not rely on name conventions. check if it's a type,
139-
# otherwise treat it as a not-yet-classloaded package
140-
type(fullname)
141-
return _frozen_importlib.ModuleSpec(fullname, JavaTypeLoader, is_package=False)
142-
except KeyError:
143-
return _frozen_importlib.ModuleSpec(fullname, JavaPackageLoader, is_package=True)
144135
else:
145136
try:
146137
type(fullname)
147138
return _frozen_importlib.ModuleSpec(fullname, JavaTypeLoader, is_package=False)
148139
except KeyError:
149-
pass # when importing from the implicit top-level java module, we only allow types
140+
pass
150141
else:
151142
@staticmethod
152143
def find_spec(fullname, path, target=None):

0 commit comments

Comments
 (0)