Merge "sort when using groupby"

1 files changed, 4 insertions, 3 deletions

diff --git a/oslo_messaging/notify/dispatcher.py b/oslo_messaging/notify/dispatcher.py
index 83b3fe4..dedb7e2 100644
--- a/oslo_messaging/notify/dispatcher.py
+++ b/oslo_messaging/notify/dispatcher.py
@@ -16,6 +16,7 @@
 
 import itertools
 import logging
+import operator
 
 import six
 
@@ -118,9 +119,9 @@ class BatchNotificationDispatcher(NotificationDispatcher):
         """Dispatch notification messages to the appropriate endpoint method.
         """
 
-        messages_grouped = itertools.groupby((
-            self._extract_user_message(m)
-            for m in incoming), lambda x: x[0])
+        messages_grouped = itertools.groupby(sorted(
+            (self._extract_user_message(m) for m in incoming),
+            key=operator.itemgetter(0)), operator.itemgetter(0))
 
         requeues = set()
         for priority, messages in messages_grouped: