Add Python3 support

flask_babel.py → 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.ext.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

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, )

setup.py

@@ -27,7 +27,7 @@
     author_email='armin.ronacher@active-4.com',
     description='Adds i18n/l10n support to Flask applications',
     long_description=__doc__,
-    py_modules=['flask_babel'],
+    packages=['flask_babel'],
     zip_safe=False,
     platforms='any',
     install_requires=[
@@ -44,6 +44,7 @@
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 3',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ]

tests/tests.py

@@ -11,6 +11,7 @@
 from datetime import datetime
 import flask_babel as babel
 from flask_babel import gettext, ngettext, lazy_gettext
+from flask_babel._compat import text_type
 
 
 class DateFormattingTestCase(unittest.TestCase):
@@ -156,10 +157,10 @@ def test_lazy_gettext(self):
         b = babel.Babel(app, default_locale='de_DE')
         yes = lazy_gettext(u'Yes')
         with app.test_request_context():
-            assert unicode(yes) == 'Ja'
+            assert text_type(yes) == 'Ja'
         app.config['BABEL_DEFAULT_LOCALE'] = 'en_US'
         with app.test_request_context():
-            assert unicode(yes) == 'Yes'
+            assert text_type(yes) == 'Yes'
 
     def test_list_translations(self):
         app = flask.Flask(__name__)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27
+envlist = py26, py27, py33
 
 [testenv]
 deps = pytz>=2013a