Merge pull request #366 from qutech/fix/nameless_renaming

Fix renaming for nameless serializable
qutech · Aug 31, 2018 · 12af2df · 12af2df
2 parents 1aebaaf + c730d57
commit 12af2df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/qctoolkit/serialization.py b/qctoolkit/serialization.py
@@ -503,7 +503,7 @@ def renamed(self, new_identifier: str, registry: PulseRegistryType=None) -> 'Ser
         """Returns a copy of the Serializable with its identifier set to new_identifier."""
         data = self.get_serialization_data()
         data.pop(Serializable.type_identifier_name)
-        data.pop(Serializable.identifier_name)
+        data.pop(Serializable.identifier_name, None)
         return self.deserialize(registry=registry, identifier=new_identifier, **data)
 
 

diff --git a/tests/serialization_tests.py b/tests/serialization_tests.py
@@ -203,6 +203,14 @@ def test_renamed(self) -> None:
         registry = dict()
         instance = self.make_instance('hugo', registry=registry)
         renamed_instance = instance.renamed('ilse', registry=registry)
+        self.assertEqual(renamed_instance.identifier, 'ilse')
+        self.assert_equal_instance_except_id(instance, renamed_instance)
+
+    def test_renamed_of_anonymous(self):
+        registry = dict()
+        instance = self.make_instance(None, registry=registry)
+        renamed_instance = instance.renamed('ilse', registry=registry)
+        self.assertEqual(renamed_instance.identifier, 'ilse')
         self.assert_equal_instance_except_id(instance, renamed_instance)
 
     def test_conversion(self):