Index: /main/waeup.sirp/trunk/src/waeup/sirp/imagestorage.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/imagestorage.py	(revision 6979)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/imagestorage.py	(revision 6980)
@@ -58,5 +58,5 @@
         blobs that has to be called explicitly, for instance in tests.
         """
-        key_list = self.keys()
+        key_list = list(self.keys())
         for key in key_list:
             item = self[key]
Index: /main/waeup.sirp/trunk/src/waeup/sirp/testing.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/testing.py	(revision 6979)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/testing.py	(revision 6980)
@@ -290,5 +290,5 @@
     if collector is None:
         return
-    keys = collector.keys()
+    keys = list(collector.keys())
     for key in keys:
         del collector[key]
Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py	(revision 6979)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.py	(revision 6980)
@@ -41,5 +41,6 @@
         """Delete a course referrer denoted by its code.
         """
-        for key in self.keys():
+        keys = list(self.keys()) # create list copy
+        for key in keys:
             if self[key].getCourseCode() != code:
                 continue
