diff options
| author | Erick Wilder <erickwilder@gmail.com> | 2015-09-09 18:58:47 -0300 |
|---|---|---|
| committer | Erick Wilder <erickwilder@gmail.com> | 2015-09-09 18:58:47 -0300 |
| commit | 17d77d0fa8d6e4dd799bbbb1b8bba744788cc647 (patch) | |
| tree | a465e0de2a981ce5575f8775cc7357c88dae17e7 /babel | |
| parent | aa5b28d3c59c2fa811e929cf8158b4f942faf86e (diff) | |
| parent | 2265065a8ded307a7a5e87e948f36b6240e47f0c (diff) | |
| download | babel-17d77d0fa8d6e4dd799bbbb1b8bba744788cc647.tar.gz | |
Merge pull request #193 from erickwilder/issue174/2.x-backport
Backporting #174 bugfix to 2.x version
Diffstat (limited to 'babel')
| -rw-r--r-- | babel/__init__.py | 2 | ||||
| -rw-r--r-- | babel/numbers.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/babel/__init__.py b/babel/__init__.py index 6854931..d889503 100644 --- a/babel/__init__.py +++ b/babel/__init__.py @@ -21,4 +21,4 @@ from babel.core import UnknownLocaleError, Locale, default_locale, \ negotiate_locale, parse_locale, get_locale_identifier -__version__ = '2.0' +__version__ = '2.1' diff --git a/babel/numbers.py b/babel/numbers.py index 587d640..d7a20d1 100644 --- a/babel/numbers.py +++ b/babel/numbers.py @@ -134,6 +134,10 @@ def get_territory_currencies(territory, start_date=None, end_date=None, result = [] for currency_code, start, end, is_tender in curs: + if start: + start = date_(*start) + if end: + end = date_(*end) if ((is_tender and tender) or \ (not is_tender and non_tender)) and _is_active(start, end): if include_details: |