diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-12 08:30:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-01 15:27:55 +0100 |
commit | d0f904d407f57998419bd9c305ce53e5eaa36b24 (patch) | |
tree | 47488e99b76374cddf1566cb8af3f3c32bd13b76 /lib/bb/persist_data.py | |
parent | bf25f05ce4db11466e62f134f9a6916f886a93d9 (diff) | |
download | bitbake-contrib-d0f904d407f57998419bd9c305ce53e5eaa36b24.tar.gz |
bitbake: Convert to python 3
Various misc changes to convert bitbake to python3 which don't warrant
separation into separate commits.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/persist_data.py')
-rw-r--r-- | lib/bb/persist_data.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/bb/persist_data.py b/lib/bb/persist_data.py index e45042324..403f3a541 100644 --- a/lib/bb/persist_data.py +++ b/lib/bb/persist_data.py @@ -92,9 +92,9 @@ class SQLTable(collections.MutableMapping): self._execute("DELETE from %s where key=?;" % self.table, [key]) def __setitem__(self, key, value): - if not isinstance(key, basestring): + if not isinstance(key, str): raise TypeError('Only string keys are supported') - elif not isinstance(value, basestring): + elif not isinstance(value, str): raise TypeError('Only string values are supported') data = self._execute("SELECT * from %s where key=?;" % @@ -131,14 +131,14 @@ class SQLTable(collections.MutableMapping): return [row[1] for row in data] def values(self): - return list(self.itervalues()) + return list(self.values()) def itervalues(self): data = self._execute("SELECT value FROM %s;" % self.table) return (row[0] for row in data) def items(self): - return list(self.iteritems()) + return list(self.items()) def iteritems(self): return self._execute("SELECT * FROM %s;" % self.table) @@ -178,7 +178,7 @@ class PersistData(object): """ Return a list of key + value pairs for a domain """ - return self.data[domain].items() + return list(self.data[domain].items()) def getValue(self, domain, key): """ |