Fix dict key sorting in Python 3

CHANGES.rst

@@ -16,6 +16,9 @@ New features:
 
 Bug fixes:
 
+- Fix dict key sorting in Python 3
+  [ale-rt]
+
 - Fix import from Globals that was removed in Zope4
   [pbauer]
 

Products/CMFFormController/FormAction.py

@@ -1,11 +1,13 @@
-from .globalVars import ANY_CONTEXT, ANY_BUTTON
+from .globalVars import ANY_BUTTON
+from .globalVars import ANY_CONTEXT
 from .Key import Key
 from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base
 from App.class_init import InitializeClass
 from OFS.SimpleItem import SimpleItem
 from Products.CMFCore.utils import getToolByName
 
+
 _marker = []
 
 
@@ -187,9 +189,7 @@ def match(self, object_id, status, context_type, button):
     def getFiltered(self, object_id=_marker, status=_marker, context_type=_marker,
                     button=_marker, action_type=_marker, action_arg=_marker):
         filtered = []
-        keys = self.actions.keys()
-        keys.sort()
-        for key in keys:
+        for key in sorted(self.actions):
             action = self.actions[key]
             if object_id != _marker and not action.getObjectId() == object_id:
                 continue

Products/CMFFormController/FormValidator.py

@@ -1,4 +1,5 @@
-from .globalVars import ANY_CONTEXT, ANY_BUTTON
+from .globalVars import ANY_BUTTON
+from .globalVars import ANY_CONTEXT
 from .Key import Key
 from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base
@@ -8,6 +9,7 @@
 
 import six
 
+
 _marker = []
 
 
@@ -143,9 +145,7 @@ def match(self, object_id, context_type, button):
     def getFiltered(self, object_id=_marker, context_type=_marker,
                     button=_marker, validators=_marker):
         filtered = []
-        keys = self.validators.keys()
-        keys.sort()
-        for key in keys:
+        for key in sorted(self.validators):
             validator = self.validators[key]
             if object_id != _marker and not validator.getObjectId() == object_id:
                 continue