Merge branch 'develop'

impl/enqueue.py

@@ -49,14 +49,20 @@ def enqueue(
     ref_id_model = create_ref_id_model(si_model)
 
     queue_model_list = [ezidapp.models.async_queue.SearchIndexerQueue]
-    if updateExternalServices:
-        queue_model_list.extend(
-            (
-                ezidapp.models.async_queue.BinderQueue,
-                ezidapp.models.async_queue.CrossrefQueue,
-                ezidapp.models.async_queue.DataciteQueue,
+    # Do not add reserved identifiers to binder, crossref, or datacite queues
+    # When the identifier entry is updated to not be reserved, then the various
+    # external services will be called as appropriate.
+    # See https://github.com/CDLUC3/ezid/blob/v2.0.6/impl/backproc.py#L117 for
+    # historical implementation
+    if not si_model.isReserved:
+        if updateExternalServices:
+            queue_model_list.extend(
+                (
+                    ezidapp.models.async_queue.BinderQueue,
+                    ezidapp.models.async_queue.CrossrefQueue,
+                    ezidapp.models.async_queue.DataciteQueue,
+                )
             )
-        )
     for queue_model in queue_model_list:
         _enqueue_identifier(queue_model, ref_id_model, operation_label)
 

impl/ui.py

@@ -194,7 +194,8 @@ def tombstone(request):
             c2 = lxml.etree.SubElement(row, "td", attrib={"class": "dcms_value"})
             c2.text = status
             root.append(row)
-            md = lxml.etree.tostring(root)
+            # lxml tostring returns bytes
+            md = lxml.etree.tostring(root).decode()
     if not htmlMode:
         # This echoes the Merritt hack above.
         if m["_profile"] == "erc" and m.get("erc", "").strip() != "":