refactor exceptions (#54)

latticejson/convert.py

@@ -3,7 +3,7 @@
 from typing import Dict, List
 from warnings import warn
 
-from .exceptions import UnknownAttributeWarning, UnknownElementWarning
+from .exceptions import UnknownAttributeWarning, UnknownElementTypeWarning
 from .parse import parse_elegant, parse_madx
 
 NAME_MAP = json.loads((Path(__file__).parent / "map.json").read_text())["map"]
@@ -45,7 +45,7 @@ def _map_names(lattice_data: dict, name_map: dict):
         latticejson_type = name_map.get(other_type)
         if latticejson_type is None:
             elements[name] = ["Drift", {"length": other_attributes.get("L", 0)}]
-            warn(UnknownElementWarning(name, other_type), stacklevel=2)
+            warn(UnknownElementTypeWarning(name, other_type))
             continue
 
         attributes = {}
@@ -55,7 +55,7 @@ def _map_names(lattice_data: dict, name_map: dict):
             if latticejson_key is not None:
                 attributes[latticejson_key] = value
             else:
-                warn(UnknownAttributeWarning(other_key, name), stacklevel=2)
+                warn(UnknownAttributeWarning(other_key, name))
 
     lattices = lattice_data["lattices"]
     lattice_name, main_lattice = lattices.popitem()  # use last lattice as main_lattice

latticejson/exceptions.py

@@ -1,3 +1,13 @@
+import warnings
+
+
+def warning_on_one_line(message, category, filename, lineno, file=None, line=None):
+    return f"{filename}:{lineno}: {category.__name__}: {message}\n"
+
+
+warnings.formatwarning = warning_on_one_line
+
+
 class UndefinedObjectError(Exception):
     """Raised if an object is referenced within a lattice but no definition is found.
 
@@ -7,24 +17,24 @@ class UndefinedObjectError(Exception):
 
     def __init__(self, object_name, lattice_name):
         super().__init__(
-            f"The Object {object_name} is referenced in {lattice_name} "
+            f"The object '{object_name}' is referenced in '{lattice_name}' "
             "but no definition was found!"
         )
 
 
-class UnknownElementWarning(UserWarning):
+class UnknownElementTypeWarning(UserWarning):
     """Raised if there is no equivalent LatticeJSON element."""
 
     def __init__(self, name, type_, *args, **kwargs):
-        message = f"Replacing element {name} ({type_}) with Drift."
+        message = f"Replacing element '{name}' ({type_}) with Drift."
         super().__init__(message, *args, **kwargs)
 
 
 class UnknownAttributeWarning(UserWarning):
     """Raised if there is no equivalent LatticeJSON attribute."""
 
     def __init__(self, attribute, element, *args, **kwargs):
-        message = f"Ignoring attribute {attribute} of {element}."
+        message = f"Ignoring attribute '{attribute}' of '{element}'."
         super().__init__(message, *args, **kwargs)