Updated Flask-Babel to 0.9

main/lib/flask_babel.py → main/lib/flask_babel/__init__.py

@@ -5,7 +5,7 @@
 
     Implements i18n/l10n support for Flask applications based on Babel.
 
-    :copyright: (c) 2010 by Armin Ronacher.
+    :copyright: (c) 2013 by Armin Ronacher, Daniel Neuhäuser.
     :license: BSD, see LICENSE for more details.
 """
 from __future__ import absolute_import
@@ -28,6 +28,8 @@
     timezone = pytz.timezone
     UTC = pytz.UTC
 
+from flask_babel._compat import string_types
+
 
 class Babel(object):
     """Central controller class that can be used to configure how
@@ -235,7 +237,7 @@ def get_timezone():
             if rv is None:
                 tzinfo = babel.default_timezone
             else:
-                if isinstance(rv, basestring):
+                if isinstance(rv, string_types):
                     tzinfo = timezone(rv)
                 else:
                     tzinfo = rv

main/lib/flask_babel/_compat.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+"""
+    flask.ext.babel._compat
+    ~~~~~~~~~~~~~~~~~~~~~~~
+
+    :copyright: (c) 2013 by Armin Ronacher, Daniel Neuhäuser.
+    :license: BSD, see LICENSE for more details.
+"""
+import sys
+
+
+PY2 = sys.version_info[0] == 2
+
+
+if PY2:
+    text_type = unicode
+    string_types = (str, unicode)
+else:
+    text_type = str
+    string_types = (str, )