From ed46c219a9222664b6ef371d1dd6e8956d61e620 Mon Sep 17 00:00:00 2001
From: Aniket21mathur <aniketmathur320@gmail.com>
Date: Sat, 13 Jul 2019 14:45:12 +0530
Subject: [PATCH] Port to six

---
 src/sugar3/activity/activity.py   | 2 +-
 src/sugar3/datastore/datastore.py | 2 +-
 src/sugar3/util.py                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sugar3/activity/activity.py b/src/sugar3/activity/activity.py
index c264163f..4a1d8e40 100644
--- a/src/sugar3/activity/activity.py
+++ b/src/sugar3/activity/activity.py
@@ -1503,7 +1503,7 @@ class _ClientHandler(dbus.service.Object):
     def GetAll(self, interface_name):
         if interface_name in self._prop_getters:
             r = {}
-            for k, v in self._prop_getters[interface_name].items():
+            for k, v in list(self._prop_getters[interface_name].items()):
                 r[k] = v()
             return r
         else:
diff --git a/src/sugar3/datastore/datastore.py b/src/sugar3/datastore/datastore.py
index e1b3f8b9..3dfb8144 100644
--- a/src/sugar3/datastore/datastore.py
+++ b/src/sugar3/datastore/datastore.py
@@ -88,7 +88,7 @@ class DSMetadata(GObject.GObject):
             self._properties = {}
         else:
             if six.PY3:
-                for x, y in properties.items():
+                for x, y in list(properties.items()):
                     try:
                         properties[x] = y.decode()
                     except BaseException:
diff --git a/src/sugar3/util.py b/src/sugar3/util.py
index 8ea5adba..31ed3356 100644
--- a/src/sugar3/util.py
+++ b/src/sugar3/util.py
@@ -208,7 +208,7 @@ class LRU:
         return iter(self.d)
 
     def itervalues(self):
-        for i_, j in self.iteritems():
+        for i_, j in six.iteritems(self):
             yield j
 
     def keys(self):