Print assembly ID if we have it

Don't use id(asmb) in Python error message, as
that won't the help the user identify the
assembly. Use the mmCIF ID instead if it has one.

Author: benmwebb

ihm/dumper.py

@@ -1802,6 +1802,8 @@ class _AssemblyChecker:
     def __init__(self):
         # Map from Assembly id to set of Asym ids
         self._asmb_asyms = {}
+        # Map from Assembly id to Assembly object
+        self._asmb_from_id = {}
 
         # Map from Assembly id to set of all represented Asym ids (in models)
         self._asmb_model_asyms = {}
@@ -1812,6 +1814,7 @@ def add_model_asyms(self, model, seen_asym_ids):
         # If this is the first time we've seen this assembly, get its
         # declared set of asym IDs
         if id(asmb) not in self._asmb_asyms:
+            self._asmb_from_id[id(asmb)] = asmb
             asyms = frozenset(x._id for x in asmb if hasattr(x, 'entity'))
             self._asmb_asyms[id(asmb)] = asyms
         # Add asym IDs from model
@@ -1827,9 +1830,12 @@ def get_extra_asyms():
             for asmb_id, asyms in self._asmb_asyms.items():
                 extra = asyms - self._asmb_model_asyms[asmb_id]
                 if extra:
+                    asmb = self._asmb_from_id[asmb_id]
+                    asmb_id = ("ID %s" % asmb._id
+                               if hasattr(asmb, '_id') else asmb)
                     yield asmb_id, ", ".join(sorted(extra))
 
-        err = "; ".join("assembly ID %s, asym IDs %s" % extra
+        err = "; ".join("%s, asym IDs %s" % extra
                         for extra in get_extra_asyms())
         if err:
             raise ValueError(

test/test_dumper.py

@@ -2817,6 +2817,7 @@ def test_model_dumper_assembly_asym_check(self):
             _get_dumper_output(dumper, system)
         self.assertIn("reference asym IDs that don't have coordinates",
                       str(cm.exception))
+        self.assertIn("ID 99, asym IDs X", str(cm.exception))
         # Should work though if checks are disabled
         _ = _get_dumper_output(dumper, system, check=False)