Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions lume/serializers/base.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
from abc import ABC, abstractmethod


def _module_base(module_name):
"""Top-level package name from a dotted module string.

Accepts a module object as well, so the error path never crashes on a
caller that passes the imported module instead of its name.
"""
name = getattr(module_name, "__name__", module_name)
return str(name).split(".")[0]


class ModuleImportError(Exception):
def __init__(self, module_name, module_version):
self.module_name = module_name
module_base = module_name.split(".")[0]
module_version = module_version
module_base = _module_base(module_name)
self.message = (
f"Unable to import module {module_name}. Object was serialized with {module_version}. "
f"Is a compatible version of {module_base} installed?"
Expand All @@ -17,7 +26,7 @@ class ClassInitError(Exception):
def __init__(self, class_name, module_name, module_version):
self.module_name = module_name
self.class_name = class_name
module_base = module_name.split(".")[0]
module_base = _module_base(module_name)
self.message = (
f"Unable to get {class_name} from {module_name}. Object was serialized with {module_version}. "
f"Is a compatible version of {module_base} installed?"
Expand Down
6 changes: 3 additions & 3 deletions lume/serializers/hdf5.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ def deserialize(cls, filename: str) -> "Base":
except ImportError:
raise ModuleImportError(package_str, package_version)

object_type = getattr(object_import_module, object_name)
object_type = getattr(object_import_module, object_name, None)

if not object_type:
raise ClassInitError(object_name, object_import_module, package_version)
if object_type is None:
raise ClassInitError(object_name, package_str, package_version)

object = object_type()
object.load_archive(f)
Expand Down
Loading