Fix Python3 compatibility

This patch fixes memory persistence's "get_key_values" method to ensure
it also returns a list on Python 3 instead of an iterable.

It also fixes unit test get_key_values for memory persistence.
This commit is contained in:
Gorka Eguileor 2018-11-06 18:03:45 +01:00
parent d39092b4c3
commit e2c10eebdf
2 changed files with 2 additions and 2 deletions

View File

@ -70,7 +70,7 @@ class MemoryPersistence(persistence_base.PersistenceDriverBase):
def get_key_values(self, key=None):
try:
result = ([self.key_values[key]] if key
else self.key_values.values())
else list(self.key_values.values()))
except KeyError:
return []
return result

View File

@ -63,4 +63,4 @@ class TestMemoryPersistence(base.BasePersistenceTest):
expected = [cinderlib.KeyValue('key', 'value')]
self.persistence.set_key_value(expected[0])
self.assertTrue('key' in self.persistence.key_values)
self.assertEqual(expected, self.persistence.key_values.values())
self.assertEqual(expected, list(self.persistence.key_values.values()))