From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 10 Aug 2016 15:00:33 +0000 (+0100)
Subject: persist_data: Fix py3 update stack overflow
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88c5beca705efa7df4a96fb2aaf3f13c336ac328;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

persist_data: Fix py3 update stack overflow

Revision d0f904d407f57998419bd9c305ce53e5eaa36b24 accidentally broke
items() and values() and made them cause stack overflows. Undo that
breakage.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/persist_data.py b/lib/bb/persist_data.py
index 403f3a541e4..bb6deca5262 100644
--- a/lib/bb/persist_data.py
+++ b/lib/bb/persist_data.py
@@ -131,14 +131,14 @@ class SQLTable(collections.MutableMapping):
         return [row[1] for row in data]
 
     def values(self):
-        return list(self.values())
+        return list(self.itervalues())
 
     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.items())
+        return list(self.iteritems())
 
     def iteritems(self):
         return self._execute("SELECT * FROM %s;" % self.table)