--- a/web/test/unittest_viewselector.py	Tue Oct 13 15:09:22 2015 +0200
+++ b/web/test/unittest_viewselector.py	Fri Sep 18 18:04:05 2015 +0200
@@ -477,12 +477,12 @@
 
 
     def test_properties(self):
-        self.assertEqual(sorted(k for k in self.vreg['propertydefs'].iterkeys()
+        self.assertEqual(sorted(k for k in self.vreg['propertydefs']
                                 if k.startswith('ctxcomponents.edit_box')),
                          ['ctxcomponents.edit_box.context',
                           'ctxcomponents.edit_box.order',
                           'ctxcomponents.edit_box.visible'])
-        self.assertEqual([k for k in self.vreg['propertyvalues'].iterkeys()
+        self.assertEqual([k for k in self.vreg['propertyvalues']
                           if not k.startswith('system.version')],
                          [])
         self.assertEqual(self.vreg.property_value('ctxcomponents.edit_box.visible'), True)

--- a/web/views/formrenderers.py	Tue Oct 13 15:09:22 2015 +0200
+++ b/web/views/formrenderers.py	Fri Sep 18 18:04:05 2015 +0200
@@ -241,7 +241,7 @@
         if form.fieldsets_in_order:
             fieldsets = form.fieldsets_in_order
         else:
-            fieldsets = byfieldset.iterkeys()
+            fieldsets = byfieldset
         for fieldset in list(fieldsets):
             try:
                 fields = byfieldset.pop(fieldset)