------------------------------------------------------------------------
r11773 | jomae | 2013-04-10 13:48:46 +0200 (Wed, 10 Apr 2013) | 4 lines

1.0.2dev: follow-up to r11691, `get_known_locales()` works with Babel 1.0dev

`babel.localedata.list` has been renamed to `locale_identifiers` in [babel:r599/trunk].


Index: trac/util/datefmt.py
===================================================================
--- trac/util/datefmt.py	(revision 11772)
+++ trac/util/datefmt.py	(revision 11773)
@@ -26,6 +26,11 @@
 
 try:
     import babel
+except ImportError:
+    babel = None
+    def get_known_locales():
+        return []
+else:
     from babel import Locale
     from babel.core import LOCALE_ALIASES
     from babel.dates import (
@@ -36,13 +41,11 @@
         get_time_format, get_month_names,
         get_period_names, get_day_names
     )
-    from babel.localedata import list as get_known_locales
+    try:
+        from babel.localedata import list as get_known_locales
+    except ImportError:
+        from babel.localedata import locale_identifiers as get_known_locales
 
-except ImportError:
-    babel = None
-    def get_known_locales():
-        return []
-
 from trac.core import TracError
 from trac.util.text import to_unicode, getpreferredencoding
 from trac.util.translation import _, ngettext

------------------------------------------------------------------------