# HG changeset patch
# User cmlenz
# Date 1182375734 0
# Node ID e043fa423aceec39c08f152a1513b76218441b35
# Parent  ea2229649f2857a8f968b00576777b0ad3c95812
Ported [157] to 0.8.x branch.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
  * The character set specified in PO template files is now respected when
    creating new catalog files based on that template. This allows the use of
    characters outside the ASCII range in POT files (ticket #17).
+ * The default ordering of messages in generated POT files, which is based on
+   the order those messages are found when walking the source tree, is no
+   longer subject to differences between platforms; directory and file names
+   are now always sorted alphabetically.
 
 
 Version 0.8
diff --git a/babel/messages/extract.py b/babel/messages/extract.py
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -125,6 +125,8 @@
         for subdir in dirnames:
             if subdir.startswith('.') or subdir.startswith('_'):
                 dirnames.remove(subdir)
+        dirnames.sort()
+        filenames.sort()
         for filename in filenames:
             filename = relpath(
                 os.path.join(root, filename).replace(os.sep, '/'),