Merge remote-tracking branch 'upstream/master'

Author: amercader

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.10.0
+current_version = 0.11.1
 commit = True
 tag = True
 

README.md

@@ -1,4 +1,4 @@
-# Flask Babel - 0.10.0
+# Flask Babel - 0.11.1
 
 [![Build Status](https://travis-ci.org/python-babel/flask-babel.svg?branch=master)](https://travis-ci.org/python-babel/flask-babel)
 [![PyPI](https://img.shields.io/pypi/v/flask-babel.svg?maxAge=2592000)](https://pypi.python.org/pypi/Flask-Babel)

docs/conf.py

@@ -49,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.10.0'
+version = '0.11.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.10.0'
+release = '0.11.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

flask_babel/__init__.py

@@ -11,11 +11,6 @@
 from __future__ import absolute_import
 import os
 
-# this is a workaround for a snow leopard bug that babel does not
-# work around :)
-if os.environ.get('LC_CTYPE', '').lower() == 'utf-8':
-    os.environ['LC_CTYPE'] = 'en_US.utf-8'
-
 from datetime import datetime
 from contextlib import contextmanager
 from flask import current_app, request
@@ -30,7 +25,8 @@
     timezone = pytz.timezone
     UTC = pytz.UTC
 
-from flask_babel._compat import string_types, text_type
+from flask_babel._compat import string_types
+from flask_babel.speaklater import LazyString
 
 
 class Babel(object):
@@ -128,7 +124,7 @@ def localeselector(self, f):
         time.  If `None` is returned, the locale falls back to the one from
         the configuration.
 
-        This has to return the locale as string (eg: ``'de_AT'``, ''`en_US`'')
+        This has to return the locale as string (eg: ``'de_AT'``, ``'en_US'``)
         """
         assert self.locale_selector_func is None, \
             'a localeselector function is already registered'
@@ -217,19 +213,27 @@ def get_translations():
     """
     ctx = _get_current_context()
 
+    if ctx is None:
+        return support.NullTranslations()
+
     translations = getattr(ctx, 'babel_translations', None)
     if translations is None:
         translations = support.Translations()
 
         babel = current_app.extensions['babel']
         for dirname in babel.translation_directories:
-            translations.merge(
-                support.Translations.load(
+            catalog = support.Translations.load(
                     dirname,
                     [get_locale()],
                     babel.domain
                 )
-            )
+            translations.merge(catalog)
+            # FIXME: Workaround for merge() being really, really stupid. It
+            # does not copy _info, plural(), or any other instance variables
+            # populated by GNUTranslations. We probably want to stop using
+            # `support.Translations.merge` entirely.
+            if hasattr(catalog, 'plural'):
+                translations.plural = catalog.plural
 
         ctx.babel_translations = translations
 
@@ -437,10 +441,9 @@ def format_time(time=None, format=None, rebase=True):
 
 
 def format_timedelta(datetime_or_timedelta, granularity='second',
-                     add_direction=False):
+                     add_direction=False, threshold=0.85):
     """Format the elapsed time from the given date to now or the given
-    timedelta.  This currently requires an unreleased development
-    version of Babel.
+    timedelta.
 
     This function is also available in the template context as filter
     named `timedeltaformat`.
@@ -450,6 +453,7 @@ def format_timedelta(datetime_or_timedelta, granularity='second',
     return dates.format_timedelta(
         datetime_or_timedelta,
         granularity,
+        threshold=threshold,
         add_direction=add_direction,
         locale=get_locale()
     )
@@ -601,21 +605,6 @@ def npgettext(context, singular, plural, num, **variables):
     return s if not variables else s % variables
 
 
-def make_json_lazy_string(func, *args, **kwargs):
-    """Like :method:`speaklater.make_lazy_string` but returns a subclass
-    that provides an :method:`__html__` method.  That method is used by
-    :class:`flask.json.JSONEncoder` to serialize objects of unrecognized
-    types.
-    """
-    from speaklater import _LazyString
-
-    class JsonLazyString(_LazyString):
-        def __html__(self):
-            return text_type(self)
-
-    return JsonLazyString(func, args, kwargs)
-
-
 def lazy_gettext(string, **variables):
     """Like :func:`gettext` but the string returned is lazy which means
     it will be translated when it is used as an actual string.
@@ -628,7 +617,7 @@ def lazy_gettext(string, **variables):
         def index():
             return unicode(hello)
     """
-    return make_json_lazy_string(gettext, string, **variables)
+    return LazyString(gettext, string, **variables)
 
 
 def lazy_pgettext(context, string, **variables):
@@ -637,7 +626,7 @@ def lazy_pgettext(context, string, **variables):
 
     .. versionadded:: 0.7
     """
-    return make_json_lazy_string(pgettext, context, string, **variables)
+    return LazyString(pgettext, context, string, **variables)
 
 
 def _get_current_context():

flask_babel/speaklater.py

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+from flask_babel._compat import text_type
+
+
+class LazyString(object):
+    def __init__(self, func, *args, **kwargs):
+        self._func = func
+        self._args = args
+        self._kwargs = kwargs
+
+    def __getattr__(self, attr):
+        if attr == "__setstate__":
+            raise AttributeError(attr)
+        string = text_type(self)
+        if hasattr(string, attr):
+            return getattr(string, attr)
+        raise AttributeError(attr)
+
+    def __repr__(self):
+        return "l'{0}'".format(text_type(self))
+
+    def __str__(self):
+        return text_type(self._func(*self._args, **self._kwargs))
+
+    def __len__(self):
+        return len(text_type(self))
+
+    def __getitem__(self, key):
+        return text_type(self)[key]
+
+    def __iter__(self):
+        return iter(text_type(self))
+
+    def __contains__(self, item):
+        return item in text_type(self)
+
+    def __add__(self, other):
+        return text_type(self) + other
+
+    def __radd__(self, other):
+        return other + text_type(self)
+
+    def __mul__(self, other):
+        return text_type(self) * other
+
+    def __rmul__(self, other):
+        return other * text_type(self)
+
+    def __lt__(self, other):
+        return text_type(self) < other
+
+    def __le__(self, other):
+        return text_type(self) <= other
+
+    def __eq__(self, other):
+        return text_type(self) == other
+
+    def __ne__(self, other):
+        return text_type(self) != other
+
+    def __gt__(self, other):
+        return text_type(self) > other
+
+    def __ge__(self, other):
+        return text_type(self) >= other
+
+    def __html__(self):
+        return text_type(self)
+
+    def __hash__(self):
+        return hash(text_type(self))
+
+    def __mod__(self, other):
+        return text_type(self) % other
+
+    def __rmod__(self, other):
+        return other + text_type(self)

setup.py

@@ -20,7 +20,7 @@
 
 setup(
     name='Flask-Babel',
-    version='0.10.0',
+    version='0.11.1',
     url='http://github.com/python-babel/flask-babel',
     license='BSD',
     author='Armin Ronacher',
@@ -33,7 +33,6 @@
     install_requires=[
         'Flask',
         'Babel>=2.3',
-        'speaklater>=1.2',
         'Jinja2>=2.5'
     ],
     classifiers=[

tests/tests.py

@@ -5,10 +5,12 @@
 import os
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 
+import pickle
+
 import unittest
 from decimal import Decimal
 import flask
-from datetime import datetime
+from datetime import datetime, timedelta
 import flask_babel as babel
 from flask_babel import gettext, ngettext, lazy_gettext, get_translations
 from babel.support import NullTranslations
@@ -76,18 +78,35 @@ def test_different_domain(self):
 
             assert gettext(u'Good bye') == 'Auf Wiedersehen'
 
+    def test_lazy_old_style_formatting(self):
+        lazy_string = lazy_gettext(u'Hello %(name)s')
+        assert lazy_string % {u'name': u'test'} == u'Hello test'
+
+        lazy_string = lazy_gettext(u'test')
+        assert u'Hello %s' % lazy_string == u'Hello test'
+
+    def test_lazy_pickling(self):
+        lazy_string = lazy_gettext(u'Foo')
+        pickled = pickle.dumps(lazy_string)
+        unpickled = pickle.loads(pickled)
+
+        assert unpickled == lazy_string
+
 
 class DateFormattingTestCase(unittest.TestCase):
 
     def test_basics(self):
         app = flask.Flask(__name__)
         babel.Babel(app)
         d = datetime(2010, 4, 12, 13, 46)
+        delta = timedelta(days=6)
 
         with app.test_request_context():
             assert babel.format_datetime(d) == 'Apr 12, 2010, 1:46:00 PM'
             assert babel.format_date(d) == 'Apr 12, 2010'
             assert babel.format_time(d) == '1:46:00 PM'
+            assert babel.format_timedelta(delta) == '1 week'
+            assert babel.format_timedelta(delta, threshold=1) == '6 days'
 
         with app.test_request_context():
             app.config['BABEL_DEFAULT_TIMEZONE'] = 'Europe/Vienna'

tox.ini

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