Skip to content

Commit c35af30

Browse files
committed
Fixed format and added a small check
1 parent 96f413b commit c35af30

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

javaobj/v2/core.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,11 @@ def _read_content(self, type_code, block_data, class_desc=None):
295295
handler = self.__type_code_handlers[type_code]
296296
except KeyError:
297297
# Look for an external reader
298-
if class_desc and class_desc.data_type == ClassDataType.WRCLASS:
298+
if (
299+
class_desc
300+
and class_desc.name
301+
and class_desc.data_type == ClassDataType.WRCLASS
302+
):
299303
# Return its result immediately
300304
return self._custom_readObject(class_desc.name)
301305

@@ -408,8 +412,7 @@ def _do_classdesc(self, type_code):
408412
# Reference to an already loading class description
409413
previous = self._do_reference()
410414
if not isinstance(previous, JavaClassDesc):
411-
raise ValueError(
412-
"Referenced object is not a class description")
415+
raise ValueError("Referenced object is not a class description")
413416
return previous
414417
elif type_code == TerminalCode.TC_PROXYCLASSDESC:
415418
# Proxy class description
@@ -490,7 +493,8 @@ def _create_instance(self, class_desc):
490493
if instance is not None:
491494
if class_desc.name:
492495
instance.is_external_instance = not self._is_default_supported(
493-
class_desc.name)
496+
class_desc.name
497+
)
494498
return instance
495499

496500
return JavaInstance()

0 commit comments

Comments
 (0)