qctoolkit.serialization.PulseStorage: Fixes to __getitem__.

Implementation was inconsistent with _temporary_storage usage in other places.

qctoolkit/serialization.py

@@ -615,12 +615,19 @@ def __init__(self,
                  storage_backend: StorageBackend) -> None:
         self._storage_backend = storage_backend
 
-        self._temporary_storage = dict()
+        self._temporary_storage = dict() # type: Dict[str, StorageEntry]
 
-    def _deserialize(self, identifier) -> Serializable:
-        serialized = self._storage_backend[identifier]
+    def _deserialize(self, serialization: str) -> Serializable:
         decoder = JSONSerializableDecoder(storage=self)
-        return decoder.decode(serialized)
+        serializable = decoder.decode(serialization)
+        return serializable
+
+    def _load_and_deserialize(self, identifier: str) -> StorageEntry:
+        serialization = self._storage_backend[identifier]
+        serializable = self._deserialize(serialization)
+        self._temporary_storage[identifier] = PulseStorage.StorageEntry(serialization=serialization,
+                                                                         serializable=serializable)
+        return self._temporary_storage[identifier]
 
     @property
     def temporary_storage(self) -> Dict[str, StorageEntry]:
@@ -631,8 +638,8 @@ def __contains__(self, identifier) -> bool:
 
     def __getitem__(self, identifier: str) -> Serializable:
         if identifier not in self._temporary_storage:
-            self._temporary_storage[identifier] = self._deserialize(identifier)
-        return self._temporary_storage[identifier]
+            self._load_and_deserialize(identifier)
+        return self._temporary_storage[identifier].serializable
 
     def __setitem__(self, identifier: str, serializable: Serializable) -> None:
         if identifier in self._temporary_storage:

tests/serialization_tests.py

@@ -358,8 +358,8 @@ def setUp(self):
 
     def test_deserialize(self):
         obj = {'my_obj': 'tröt', 'wurst': [12, 3, 4]}
-        self.backend['asd'] = json.dumps(obj)
-        deserialized = self.storage._deserialize('asd')
+        serialized = json.dumps(obj)
+        deserialized = self.storage._deserialize(serialized)
         self.assertEqual(deserialized, obj)
 
     def test_contains(self):
@@ -379,7 +379,7 @@ def test_contains(self):
     def test_getitem(self):
         instance = DummySerializable(identifier='my_id')
 
-        self.storage.temporary_storage['asd'] = instance
+        self.storage.temporary_storage['asd'] = PulseStorage.StorageEntry(serialization='foobar', serializable=instance)
 
         self.assertIs(self.storage['asd'], instance)
         with self.assertRaises(KeyError):