From f1e1cb213860aee44f2e20f93c1bb6a31ed01892 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 26 Jul 2013 18:15:02 +0200
Subject: [PATCH 001/489] Ready for 2.0-dev

---
 babel/__init__.py | 2 +-
 setup.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index 617726bc2..addf71aec 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
      negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '1.0'
+__version__ = '2.0-dev'
diff --git a/setup.py b/setup.py
index 680c5fc12..22a0f5389 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def run(self):
 
 setup(
     name='Babel',
-    version='1.0',
+    version='2.0-dev',
     description='Internationalization utilities',
     long_description=\
 """A collection of tools for internationalizing Python applications.""",

From 1bd7c37053991be20116d665456a449c67dbc57d Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 26 Jul 2013 18:15:20 +0200
Subject: [PATCH 002/489] Bump major numbers in release script

---
 scripts/make-release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/make-release.py b/scripts/make-release.py
index 137460795..5afd0a327 100755
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -49,7 +49,7 @@ def bump_version(version):
         parts = map(int, version.split('.'))
     except ValueError:
         fail('Current version is not numeric')
-    parts[-1] += 1
+    parts[0] += 1
     return '.'.join(map(str, parts))
 
 

From 559da009e6c0677f5ece7927693acbd9b1802669 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 26 Jul 2013 19:45:16 +0200
Subject: [PATCH 003/489] Edgewall -> Babel Team

---
 docs/conf.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 4a0f8b689..b1467c74b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -43,7 +43,7 @@
 
 # General information about the project.
 project = u'Babel'
-copyright = u'2013, Edgewall Software'
+copyright = u'2013, The Babel Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -194,7 +194,7 @@
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'Babel.tex', u'Babel Documentation',
-   u'Edgewall Software', 'manual'),
+   u'The Babel Team', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -224,7 +224,7 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index_', 'babel', u'Babel Documentation',
-     [u'Edgewall Software'], 1)
+     [u'The Babel Team'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -238,7 +238,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index_', 'Babel', u'Babel Documentation',
-   u'Edgewall Software', 'Babel', 'One line description of project.',
+   u'The Babel Team', 'Babel', 'One line description of project.',
    'Miscellaneous'),
 ]
 

From 5d494ffa0430b0d9d7f0afeee291f876bcb06aba Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Fri, 26 Jul 2013 19:46:26 +0200
Subject: [PATCH 004/489] Added links to sidebar

---
 docs/_templates/sidebar-links.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/_templates/sidebar-links.html b/docs/_templates/sidebar-links.html
index 666ddc611..856aa1bab 100644
--- a/docs/_templates/sidebar-links.html
+++ b/docs/_templates/sidebar-links.html
@@ -1,3 +1,11 @@
+<h3>Other Formats</h3>
+<p>
+  You can download the documentation in other formats as well:
+</p>
+<ul>
+  <li><a href="http://babel.pocoo.org/docs/babel-docs.pdf">as PDF</a>
+  <li><a href="http://babel.pocoo.org/docs/babel-docs.zip">as zipped HTML</a>
+</ul>
 <h3>Useful Links</h3>
 <ul>
   <li><a href="http://babel.pocoo.org/">Babel Website</a></li>

From 6947cf97d2bf4bb45b31c79b8d3e015a109c0bf2 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sat, 27 Jul 2013 11:56:34 +0200
Subject: [PATCH 005/489] Added 2.0 to the changelog

---
 CHANGES | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES b/CHANGES
index adfcc65e7..9810079e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
 Babel Changelog
 ===============
 
+Version 2.0
+-----------
+
+(release date to be decided, codename to be selected)
+
+
 Version 1.2
 -----------
 

From 8304ea137d8b905cd5853f469eadb87b0a9a988e Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Sun, 28 Jul 2013 23:35:30 +0200
Subject: [PATCH 006/489] Added another testcase for subtag expansion.

---
 tests/test_core.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test_core.py b/tests/test_core.py
index 160515941..b4a1ac575 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -102,6 +102,11 @@ def test_parse_likely_subtags(self):
         assert l.territory == 'CN'
         assert l.script == 'Hans'
 
+        l = Locale.parse('zh_SG')
+        assert l.language == 'zh'
+        assert l.territory == 'SG'
+        assert l.script == 'Hans'
+
         l = Locale.parse('und_AT')
         assert l.language == 'de'
         assert l.territory == 'AT'

From 963801d5a4c18b29b6b49efb97d100e7c223db76 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 29 Jul 2013 11:26:19 +0200
Subject: [PATCH 007/489] Fixed a bug on Python 3 when writing to stdout

---
 CHANGES                    |  2 ++
 babel/messages/frontend.py | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 66202f2dd..6fe47511e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,8 @@ Version 1.3
   This primarily makes ``zh_CN`` work again which was broken
   due to how it was defined in the likely subtags combined with
   our broken resolving.  This fixes #37.
+- Fixed a bug that caused pybabel to break when writing to stdout
+  on Python 3.
 
 Version 1.2
 -----------
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 3cec787dc..144bc98a1 100755
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -35,7 +35,7 @@
 from babel.messages.mofile import write_mo
 from babel.messages.pofile import read_po, write_po
 from babel.util import odict, LOCALTZ
-from babel._compat import string_types, BytesIO
+from babel._compat import string_types, BytesIO, PY2
 
 
 class compile_catalog(Command):
@@ -826,7 +826,7 @@ def extract(self, argv):
                           help='path to the output POT file')
         parser.add_option('-w', '--width', dest='width', type='int',
                           help="set output line width (default 76)")
-        parser.add_option('--no-wrap', dest='no_wrap', action = 'store_true',
+        parser.add_option('--no-wrap', dest='no_wrap', action='store_true',
                           help='do not break long message lines, longer than '
                                'the output line width, into several lines')
         parser.add_option('--sort-output', dest='sort_output',
@@ -921,16 +921,25 @@ def callback(filename, method, options):
                 catalog.add(message, None, [(filepath, lineno)],
                             auto_comments=comments, context=context)
 
+        catalog_charset = catalog.charset
         if options.output not in (None, '-'):
             self.log.info('writing PO template file to %s' % options.output)
             outfile = open(options.output, 'wb')
             close_output = True
         else:
             outfile = sys.stdout
+
+            # This is a bit of a hack on Python 3.  stdout is a text stream so
+            # we need to find the underlying file when we write the PO.  In
+            # later versions of Babel we want the write_po function to accept
+            # text or binary streams and automatically adjust the encoding.
+            if not PY2 and hasattr(outfile, 'buffer'):
+                catalog.charset = outfile.encoding
+                outfile = outfile.buffer.raw
+
             close_output = False
 
         try:
-            print(outfile)
             write_po(outfile, catalog, width=options.width,
                      no_location=options.no_location,
                      omit_header=options.omit_header,
@@ -939,6 +948,7 @@ def callback(filename, method, options):
         finally:
             if close_output:
                 outfile.close()
+            catalog.charset = catalog_charset
 
     def init(self, argv):
         """Subcommand for creating new message catalogs from a template.

From f35626949fa142e77b624db40f2ffee2452d8c56 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 29 Jul 2013 11:34:37 +0200
Subject: [PATCH 008/489] Added a missing changelog entry

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 6fe47511e..4c6fd125d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,8 @@ Version 1.3
   our broken resolving.  This fixes #37.
 - Fixed a bug that caused pybabel to break when writing to stdout
   on Python 3.
+- Removed a stray print that was causing issues when writing to
+  stdout for message catalogs.
 
 Version 1.2
 -----------

From c3a7bf10158748aea1b8ce430e5f3f1cf4f1ce0f Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 29 Jul 2013 13:33:55 +0200
Subject: [PATCH 009/489] Ready for 1.4

---
 babel/__init__.py | 2 +-
 setup.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index dd9f17e04..046bdc012 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
      negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '1.3'
+__version__ = '1.4-dev'
diff --git a/setup.py b/setup.py
index 4a57551f7..7a566ab5c 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def run(self):
 
 setup(
     name='Babel',
-    version='1.3',
+    version='1.4-dev',
     description='Internationalization utilities',
     long_description=\
 """A collection of tools for internationalizing Python applications.""",

From 0d96186cf8b622e3fed0f2f11b940885344aea72 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 29 Jul 2013 19:08:04 +0200
Subject: [PATCH 010/489] Added changelog line for 1.4

---
 CHANGES | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES b/CHANGES
index 496f519bb..e8d6983af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
 Babel Changelog
 ===============
 
+Version 1.4
+-----------
+
+(bugfix release, release date to be decided)
+
 Version 1.3
 -----------
 

From e224a7b134d23a3c89cbb7ad492e684267023934 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 29 Jul 2013 19:09:07 +0200
Subject: [PATCH 011/489] Fixed territory aliases not working properly

---
 CHANGES            | 5 +++++
 babel/core.py      | 2 +-
 tests/test_core.py | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index e8d6983af..8b93fd200 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@ Version 1.4
 
 (bugfix release, release date to be decided)
 
+- Fixed a bug that caused deprecated territory codes not being
+  converted properly by the subtag resolving.  This for instance
+  showed up when trying to use ``und_UK`` as a language code
+  which now properly resolves to ``en_GB``.
+
 Version 1.3
 -----------
 
diff --git a/babel/core.py b/babel/core.py
index 6e6e6d619..56dbf5593 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -282,7 +282,7 @@ def _try_load_reducing(parts):
 
         language, territory, script, variant = parts
         language = get_global('language_aliases').get(language, language)
-        territory = get_global('territory_aliases').get(territory, territory)
+        territory = get_global('territory_aliases').get(territory, (territory,))[0]
         script = get_global('script_aliases').get(script, script)
         variant = get_global('variant_aliases').get(variant, variant)
 
diff --git a/tests/test_core.py b/tests/test_core.py
index b4a1ac575..ec3f9ea9d 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -111,6 +111,11 @@ def test_parse_likely_subtags(self):
         assert l.language == 'de'
         assert l.territory == 'AT'
 
+        l = Locale.parse('und_UK')
+        assert l.language == 'en'
+        assert l.territory == 'GB'
+        assert l.script is None
+
     def test_get_display_name(self):
         zh_CN = Locale('zh', 'CN', script='Hans')
         assert zh_CN.get_display_name('en') == 'Chinese (Simplified, China)'

From b409813eff5142e1856e5e57c221b72d8d5b978b Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 30 Jul 2013 02:13:45 +0200
Subject: [PATCH 012/489] Added support for territory currency lookups.

The main usecase of this is to figure out at what point in time did
a country use a certain currency.  The default behavior is to use
the current date.

This fixes #42
---
 CHANGES                |  4 ++
 babel/numbers.py       | 88 +++++++++++++++++++++++++++++++++++++++++-
 docs/api/numbers.rst   |  2 +
 scripts/import_cldr.py | 28 ++++++++++++++
 tests/test_numbers.py  | 23 +++++++++++
 5 files changed, 144 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 7dbaf25cc..147124e4f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@ Version 2.0
 
 (release date to be decided, codename to be selected)
 
+- Added support for looking up currencies that belong to a territory
+  through the :func:`babel.numbers.get_territory_currencies`
+  function.
+
 Version 1.4
 -----------
 
diff --git a/babel/numbers.py b/babel/numbers.py
index 0f387190a..344625e19 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -21,8 +21,9 @@
 from decimal import Decimal, InvalidOperation
 import math
 import re
+from datetime import date as date_, datetime as datetime_
 
-from babel.core import default_locale, Locale
+from babel.core import default_locale, Locale, get_global
 from babel._compat import range_type
 
 
@@ -63,6 +64,91 @@ def get_currency_symbol(currency, locale=LC_NUMERIC):
     return Locale.parse(locale).currency_symbols.get(currency, currency)
 
 
+def get_territory_currencies(territory, start_date=None, end_date=None,
+                             tender=True, non_tender=False,
+                             include_details=False):
+    """Returns the list of currencies for the given territory that are valid at
+    the given date range.  In addition to that the currency database
+    distinguishes between tender and non-tender currencies.  By default only
+    tender currencies are returned.
+
+    The return value is a list of all currencies roughly ordered by the time
+    of when the currency became active.  The longer the currency is being in
+    use the more to the left of the list it will be.
+
+    The start date defaults to today.  If no end date is given it will be the
+    same as the start date.  Otherwise a range can be defined.  For instance
+    this can be used to find the currencies in use in Austria between 1995 and
+    2011:
+
+    >>> from datetime import date
+    >>> get_territory_currencies('AT', date(1995, 1, 1), date(2011, 1, 1))
+    ['ATS', 'EUR']
+
+    Likewise it's also possible to find all the currencies in use on a
+    single date:
+
+    >>> get_territory_currencies('AT', date(1995, 1, 1))
+    ['ATS']
+    >>> get_territory_currencies('AT', date(2011, 1, 1))
+    ['EUR']
+
+    By default the return value only includes tender currencies.  This
+    however can be changed:
+
+    >>> get_territory_currencies('US')
+    ['USD']
+    >>> get_territory_currencies('US', tender=False, non_tender=True)
+    ['USN', 'USS']
+
+    .. versionadded:: 2.0
+
+    :param territory: the name of the territory to find the currency fo
+    :param start_date: the start date.  If not given today is assumed.
+    :param end_date: the end date.  If not given the start date is assumed.
+    :param tender: controls whether tender currencies should be included.
+    :param non_tender: controls whether non-tender currencies should be
+                       included.
+    :param include_details: if set to `True`, instead of returning currency
+                            codes the return value will be dictionaries
+                            with detail information.  In that case each
+                            dictionary will have the keys ``'currency'``,
+                            ``'from'``, ``'to'``, and ``'tender'``.
+    """
+    currencies = get_global('territory_currencies')
+    if start_date is None:
+        start_date = date_.today()
+    elif isinstance(start_date, datetime_):
+        start_date = start_date.date()
+    if end_date is None:
+        end_date = start_date
+    elif isinstance(end_date, datetime_):
+        end_date = end_date.date()
+
+    curs = currencies.get(territory.upper(), ())
+    # TODO: validate that the territory exists
+
+    def _is_active(start, end):
+        return (start is None or start <= end_date) and \
+               (end is None or end >= start_date)
+
+    result = []
+    for currency_code, start, end, is_tender in curs:
+        if ((is_tender and tender) or \
+            (not is_tender and non_tender)) and _is_active(start, end):
+            if include_details:
+                result.append({
+                    'currency': currency_code,
+                    'from': start,
+                    'to': end,
+                    'tender': is_tender,
+                })
+            else:
+                result.append(currency_code)
+
+    return result
+
+
 def get_decimal_symbol(locale=LC_NUMERIC):
     """Return the symbol used by the locale to separate decimal fractions.
 
diff --git a/docs/api/numbers.rst b/docs/api/numbers.rst
index de3573e71..207ae0bca 100644
--- a/docs/api/numbers.rst
+++ b/docs/api/numbers.rst
@@ -43,3 +43,5 @@ Data Access
 .. autofunction:: get_plus_sign_symbol
 
 .. autofunction:: get_minus_sign_symbol
+
+.. autofunction:: get_territory_currencies
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 84b2b1ddf..c189e4f3e 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -21,6 +21,8 @@
 except ImportError:
     from xml.etree import ElementTree
 
+from datetime import date
+
 # Make sure we're using Babel source, and not some previously installed version
 sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), '..'))
 
@@ -95,6 +97,18 @@ def _translate_alias(ctxt, path):
     return keys
 
 
+def _parse_currency_date(s):
+    if not s:
+        return None
+    parts = s.split('-', 2)
+    return date(*map(int, parts + [1] * (3 - len(parts))))
+
+
+def _currency_sort_key(tup):
+    code, start, end, tender = tup
+    return int(not tender), start or date(1, 1, 1)
+
+
 def main():
     parser = OptionParser(usage='%prog path/to/cldr')
     options, args = parser.parse_args()
@@ -128,6 +142,7 @@ def main():
         script_aliases = global_data.setdefault('script_aliases', {})
         variant_aliases = global_data.setdefault('variant_aliases', {})
         likely_subtags = global_data.setdefault('likely_subtags', {})
+        territory_currencies = global_data.setdefault('territory_currencies', {})
 
         # create auxiliary zone->territory map from the windows zones (we don't set
         # the 'zones_territories' map directly here, because there are some zones
@@ -186,6 +201,19 @@ def main():
         for likely_subtag in sup_likely.findall('.//likelySubtags/likelySubtag'):
             likely_subtags[likely_subtag.attrib['from']] = likely_subtag.attrib['to']
 
+        # Currencies in territories
+        for region in sup.findall('.//currencyData/region'):
+            region_code = region.attrib['iso3166']
+            region_currencies = []
+            for currency in region.findall('./currency'):
+                cur_start = _parse_currency_date(currency.attrib.get('from'))
+                cur_end = _parse_currency_date(currency.attrib.get('to'))
+                region_currencies.append((currency.attrib['iso4217'],
+                                          cur_start, cur_end,
+                                          currency.attrib.get('tender', 'true') == 'true'))
+            region_currencies.sort(key=_currency_sort_key)
+            territory_currencies[region_code] = region_currencies
+
         outfile = open(global_path, 'wb')
         try:
             pickle.dump(global_data, outfile, 2)
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 6db4b6795..99e0d1bda 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -15,6 +15,8 @@
 import unittest
 import pytest
 
+from datetime import date
+
 from babel import numbers
 
 
@@ -180,6 +182,27 @@ def test_get_currency_symbol():
     assert numbers.get_currency_symbol('USD', 'en_US') == u'$'
 
 
+def test_get_territory_currencies():
+    assert numbers.get_territory_currencies('AT', date(1995, 1, 1)) == ['ATS']
+    assert numbers.get_territory_currencies('AT', date(2011, 1, 1)) == ['EUR']
+
+    assert numbers.get_territory_currencies('US', date(2013, 1, 1)) == ['USD']
+    assert sorted(numbers.get_territory_currencies('US', date(2013, 1, 1),
+        non_tender=True)) == ['USD', 'USN', 'USS']
+
+    assert numbers.get_territory_currencies('US', date(2013, 1, 1),
+        include_details=True) == [{
+            'currency': 'USD',
+            'from': date(1792, 1, 1),
+            'to': None,
+            'tender': True
+        }]
+
+    assert numbers.get_territory_currencies('LS', date(2013, 1, 1)) == ['ZAR', 'LSL']
+
+    assert numbers.get_territory_currencies('QO', date(2013, 1, 1)) == []
+
+
 def test_get_decimal_symbol():
     assert numbers.get_decimal_symbol('en_US') == u'.'
 

From 47dd1be41fe812fef67897839487bfd8fb29993c Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 30 Jul 2013 02:17:03 +0200
Subject: [PATCH 013/489] Renamed a chapter in the docs

---
 docs/api/numbers.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api/numbers.rst b/docs/api/numbers.rst
index 207ae0bca..1b21425ee 100644
--- a/docs/api/numbers.rst
+++ b/docs/api/numbers.rst
@@ -1,5 +1,5 @@
-Numbers
-=======
+Numbers and Currencies
+======================
 
 .. module:: babel.numbers
 

From 8b56f05f347b2aa63b6ebec18a323b8a7c667025 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 30 Jul 2013 02:32:35 +0200
Subject: [PATCH 014/489] Fixed a typo

---
 babel/numbers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 344625e19..2f7fe1621 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -67,7 +67,7 @@ def get_currency_symbol(currency, locale=LC_NUMERIC):
 def get_territory_currencies(territory, start_date=None, end_date=None,
                              tender=True, non_tender=False,
                              include_details=False):
-    """Returns the list of currencies for the given territory that are valid at
+    """Returns the list of currencies for the given territory that are valid for
     the given date range.  In addition to that the currency database
     distinguishes between tender and non-tender currencies.  By default only
     tender currencies are returned.

From a42ac1bbae0b9dbc618e8a83b4d1315732f402f5 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 31 Jul 2013 22:48:52 +0200
Subject: [PATCH 015/489] Fixed a CLDR import error on windows.

When building the CLDR data from scratch the process would break on
windows because the timezone mapping is not available yet.

This fixes #43.
---
 CHANGES                   | 2 ++
 babel/localtime/_win32.py | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 8b93fd200..219f7cfe9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,8 @@ Version 1.4
   converted properly by the subtag resolving.  This for instance
   showed up when trying to use ``und_UK`` as a language code
   which now properly resolves to ``en_GB``.
+- Fixed a bug that made it impossible to import the CLDR data
+  from scratch on windows systems.
 
 Version 1.3
 -----------
diff --git a/babel/localtime/_win32.py b/babel/localtime/_win32.py
index 1f6ecc7c0..3752dffac 100644
--- a/babel/localtime/_win32.py
+++ b/babel/localtime/_win32.py
@@ -10,7 +10,14 @@
 import pytz
 
 
-tz_names = get_global('windows_zone_mapping')
+# When building the cldr data on windows this module gets imported.
+# Because at that point there is no global.dat yet this call will
+# fail.  We want to catch it down in that case then and just assume
+# the mapping was empty.
+try:
+    tz_names = get_global('windows_zone_mapping')
+except RuntimeError:
+    tz_names = {}
 
 
 def valuestodict(key):

From ca2f29cba122b3f6d64ea13669eb6210f0e457b5 Mon Sep 17 00:00:00 2001
From: Hyunjun Kim <kim@hyunjun.kr>
Date: Fri, 16 Aug 2013 20:08:23 +0900
Subject: [PATCH 016/489] Fixed typos on cli errors.

---
 babel/messages/frontend.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 144bc98a1..3d496f3ee 100755
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -89,7 +89,7 @@ def finalize_options(self):
             raise DistutilsOptionError('you must specify either the input file '
                                        'or the base directory')
         if not self.output_file and not self.directory:
-            raise DistutilsOptionError('you must specify either the input file '
+            raise DistutilsOptionError('you must specify either the output file '
                                        'or the base directory')
 
     def run(self):
@@ -750,7 +750,7 @@ def compile(self, argv):
                 mo_files.append(options.output_file)
             else:
                 if not options.directory:
-                    parser.error('you must specify either the input file or '
+                    parser.error('you must specify either the output file or '
                                  'the base directory')
                 mo_files.append(os.path.join(options.directory, options.locale,
                                              'LC_MESSAGES',

From e5a4738b5ad6b6497383c562dc102a08631d532f Mon Sep 17 00:00:00 2001
From: Hyunjun Kim <kim@hyunjun.kr>
Date: Fri, 16 Aug 2013 20:40:31 +0900
Subject: [PATCH 017/489] Fixed a typo on description for setuptools command
 option.

---
 babel/messages/frontend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 3d496f3ee..f26e985ed 100755
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -65,7 +65,7 @@ class compile_catalog(Command):
          'name of the input file'),
         ('output-file=', 'o',
          "name of the output file (default "
-         "'<output_dir>/<locale>/LC_MESSAGES/<domain>.po')"),
+         "'<output_dir>/<locale>/LC_MESSAGES/<domain>.mo')"),
         ('locale=', 'l',
          'locale of the catalog to compile'),
         ('use-fuzzy', 'f',

From d764b35bc3910b8f67ff811752df615afa7667f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Neuha=CC=88user?= <dasdasich@gmail.com>
Date: Thu, 22 Aug 2013 19:40:55 +0200
Subject: [PATCH 018/489] Fix tox configuration

Re-using the pickled data across 2.x and 3.x causes errors when running
the tests.
---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 52d8df9fc..6d4eb0341 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,4 +4,5 @@ envlist = py26, py27, pypy, py33
 [testenv]
 deps =
     pytest
-commands = py.test tests
+whitelist_externals = make
+commands = make clean-cldr test

From 6c220383993f0612923387ed171b21449711c75f Mon Sep 17 00:00:00 2001
From: "Alexander A. Dyshev" <adyshev@gmail.com>
Date: Fri, 23 Aug 2013 17:06:21 +0300
Subject: [PATCH 019/489] Python3

Without 'b' option, using python3 everybody will get during update:

bash-3.2$ pybabel update -i messages.pot -d translations
updating catalog 'translations/en/LC_MESSAGES/messages.po' based on 'messages.pot'
Traceback (most recent call last):
  File "/home/user/.pyenv/versions/3.3.2/bin/pybabel", line 9, in <module>
    load_entry_point('Babel==1.3', 'console_scripts', 'pybabel')()
  File "/home/user/.pyenv/versions/3.3.2/lib/python3.3/site-packages/babel/messages/frontend.py", line 1151, in main
    return CommandLineInterface().run(sys.argv)
  File "/home/user/.pyenv/versions/3.3.2/lib/python3.3/site-packages/babel/messages/frontend.py", line 665, in run
    return getattr(self, cmdname)(args[1:])
  File "/home/user/.pyenv/versions/3.3.2/lib/python3.3/site-packages/babel/messages/frontend.py", line 1130, in update
    width=options.width)
  File "/home/user/.pyenv/versions/3.3.2/lib/python3.3/site-packages/babel/messages/pofile.py", line 444, in write_po
    _write(comment_header + u'\n')
  File "/home/user/.pyenv/versions/3.3.2/lib/python3.3/site-packages/babel/messages/pofile.py", line 388, in _write
    fileobj.write(text)
TypeError: must be str, not bytes
---
 babel/messages/frontend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 144bc98a1..86274e0fb 100755
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -1121,7 +1121,7 @@ def update(self, argv):
             tmpname = os.path.join(os.path.dirname(filename),
                                    tempfile.gettempprefix() +
                                    os.path.basename(filename))
-            tmpfile = open(tmpname, 'w')
+            tmpfile = open(tmpname, 'wb')
             try:
                 try:
                     write_po(tmpfile, catalog,

From dffa7ec421f14f73b04d35258be6b0babcca8a0e Mon Sep 17 00:00:00 2001
From: Matt Iversen <teh.ivo@gmail.com>
Date: Sat, 19 Oct 2013 22:27:38 +1100
Subject: [PATCH 020/489] Update classifiers to give more detailed information
 about babel's version compatibility

---
 setup.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.py b/setup.py
index c7b39c3ca..b89a4ec4e 100755
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,10 @@ def run(self):
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     packages=['babel', 'babel.messages', 'babel.localtime'],

From 3ec7bb104e808d1fda16fbf9fec4b9d7efccaa3f Mon Sep 17 00:00:00 2001
From: Sjoerd Langkemper <sjoerd@byte.nl>
Date: Wed, 6 Nov 2013 11:32:28 +0100
Subject: [PATCH 021/489] Correctly parse number pattern with '-' on the end

For the nl_NL locale, negative numbers would be formatted just like
positive numbers by format_currency. By changing NUMBER_TOKEN to
no longer have a minus sign in it, the minus sign on the end
of the negative pattern for nl_NL is correctly parsed.
---
 babel/numbers.py      | 2 +-
 tests/test_numbers.py | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 2f7fe1621..587d64070 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -389,7 +389,7 @@ def parse_decimal(string, locale=LC_NUMERIC):
 
 
 PREFIX_END = r'[^0-9@#.,]'
-NUMBER_TOKEN = r'[0-9@#.\-,E+]'
+NUMBER_TOKEN = r'[0-9@#.,E+]'
 
 PREFIX_PATTERN = r"(?P<prefix>(?:'[^']*'|%s)*)" % PREFIX_END
 NUMBER_PATTERN = r"(?P<number>%s+)" % NUMBER_TOKEN
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 99e0d1bda..1c4d13fc9 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -213,6 +213,7 @@ def test_get_plus_sign_symbol():
 
 def test_get_minus_sign_symbol():
     assert numbers.get_minus_sign_symbol('en_US') == u'-'
+    assert numbers.get_minus_sign_symbol('nl_NL') == u'-'
 
 
 def test_get_exponential_symbol():
@@ -247,6 +248,8 @@ def test_format_currency():
     assert (numbers.format_currency(1099.98, 'EUR', u'\xa4\xa4 #,##0.00',
                                     locale='en_US')
             == u'EUR 1,099.98')
+    assert (numbers.format_currency(1099.98, 'EUR', locale='nl_NL')
+            != numbers.format_currency(-1099.98, 'EUR', locale='nl_NL'))
 
 
 def test_format_percent():
@@ -298,3 +301,8 @@ def test_parse_grouping():
     assert numbers.parse_grouping('##') == (1000, 1000)
     assert numbers.parse_grouping('#,###') == (3, 3)
     assert numbers.parse_grouping('#,####,###') == (3, 4)
+
+
+def test_parse_pattern():
+    assert numbers.parse_pattern(u'¤#,##0.00;(¤#,##0.00)').suffix == (u'', u')')
+    assert numbers.parse_pattern(u'¤ #,##0.00;¤ #,##0.00-').suffix == (u'', u'-')

From 7edfab980eb89e06ee97c576b0778283f1c40707 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 20 Nov 2013 17:38:25 +0000
Subject: [PATCH 022/489] Reformatted import script

---
 scripts/import_cldr.py | 60 ++++++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index c189e4f3e..3a2f1217c 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -56,6 +56,7 @@ def _text(elem):
     'timeFormats': 'time_formats'
 }
 
+
 def log(message, *args):
     if args:
         message = message % args
@@ -70,7 +71,8 @@ def error(message, *args):
 def need_conversion(dst_filename, data_dict, source_filename):
     with open(source_filename, 'rb') as f:
         blob = f.read(4096)
-        version = int(re.search(b'version number="\\$Revision: (\\d+)', blob).group(1))
+        version = int(re.search(b'version number="\\$Revision: (\\d+)',
+                                blob).group(1))
 
     data_dict['_version'] = version
     if not os.path.isfile(dst_filename):
@@ -149,11 +151,14 @@ def main():
         # aliases listed and we defer the decision of which ones to choose to the
         # 'bcp47' data
         _zone_territory_map = {}
-        for map_zone in sup_windows_zones.findall('.//windowsZones/mapTimezones/mapZone'):
+        for map_zone in sup_windows_zones.findall(
+                './/windowsZones/mapTimezones/mapZone'):
             if map_zone.attrib.get('territory') == '001':
-                win_mapping[map_zone.attrib['other']] = map_zone.attrib['type'].split()[0]
+                win_mapping[map_zone.attrib['other']] = \
+                    map_zone.attrib['type'].split()[0]
             for tzid in text_type(map_zone.attrib['type']).split():
-                _zone_territory_map[tzid] = text_type(map_zone.attrib['territory'])
+                _zone_territory_map[tzid] = \
+                    text_type(map_zone.attrib['territory'])
 
         for key_elem in bcp47_timezone.findall('.//keyword/key'):
             if key_elem.attrib['name'] == 'tz':
@@ -185,7 +190,8 @@ def main():
 
         # Territory aliases
         for alias in sup_metadata.findall('.//alias/territoryAlias'):
-            territory_aliases[alias.attrib['type']] = alias.attrib['replacement'].split()
+            territory_aliases[alias.attrib['type']] = \
+                alias.attrib['replacement'].split()
 
         # Script aliases
         for alias in sup_metadata.findall('.//alias/scriptAlias'):
@@ -199,7 +205,8 @@ def main():
 
         # Likely subtags
         for likely_subtag in sup_likely.findall('.//likelySubtags/likelySubtag'):
-            likely_subtags[likely_subtag.attrib['from']] = likely_subtag.attrib['to']
+            likely_subtags[likely_subtag.attrib['from']] = \
+                likely_subtag.attrib['to']
 
         # Currencies in territories
         for region in sup.findall('.//currencyData/region'):
@@ -210,7 +217,8 @@ def main():
                 cur_end = _parse_currency_date(currency.attrib.get('to'))
                 region_currencies.append((currency.attrib['iso4217'],
                                           cur_start, cur_end,
-                                          currency.attrib.get('tender', 'true') == 'true'))
+                                          currency.attrib.get(
+                                              'tender', 'true') == 'true'))
             region_currencies.sort(key=_currency_sort_key)
             territory_currencies[region_code] = region_currencies
 
@@ -405,7 +413,8 @@ def main():
                             if ('draft' in elem.attrib or 'alt' in elem.attrib) \
                                     and int(elem.attrib['type']) in widths:
                                 continue
-                            widths[int(elem.attrib.get('type'))] = text_type(elem.text)
+                            widths[int(elem.attrib.get('type'))] = \
+                                text_type(elem.text)
                         elif elem.tag == 'alias':
                             ctxts[width_type] = Alias(
                                 _translate_alias(['months', ctxt_type, width_type],
@@ -422,7 +431,8 @@ def main():
                     for elem in width.getiterator():
                         if elem.tag == 'day':
                             dtype = weekdays[elem.attrib['type']]
-                            if ('draft' in elem.attrib or 'alt' not in elem.attrib) \
+                            if ('draft' in elem.attrib or
+                                'alt' not in elem.attrib) \
                                     and dtype in widths:
                                 continue
                             widths[dtype] = text_type(elem.text)
@@ -447,9 +457,9 @@ def main():
                             widths[int(elem.attrib['type'])] = text_type(elem.text)
                         elif elem.tag == 'alias':
                             ctxts[width_type] = Alias(
-                                _translate_alias(['quarters', ctxt_type, width_type],
-                                                 elem.attrib['path'])
-                            )
+                                _translate_alias(['quarters', ctxt_type,
+                                                  width_type],
+                                                 elem.attrib['path']))
 
             eras = data.setdefault('eras', {})
             for width in calendar.findall('eras/*'):
@@ -470,7 +480,7 @@ def main():
             # AM/PM
             periods = data.setdefault('periods', {})
             for day_period_width in calendar.findall(
-                'dayPeriods/dayPeriodContext/dayPeriodWidth'):
+                    'dayPeriods/dayPeriodContext/dayPeriodWidth'):
                 if day_period_width.attrib['type'] == 'wide':
                     for day_period in day_period_width.findall('dayPeriod'):
                         if 'alt' not in day_period.attrib:
@@ -486,7 +496,8 @@ def main():
                             continue
                         try:
                             date_formats[elem.attrib.get('type')] = \
-                                dates.parse_pattern(text_type(elem.findtext('dateFormat/pattern')))
+                                dates.parse_pattern(text_type(
+                                    elem.findtext('dateFormat/pattern')))
                         except ValueError as e:
                             error(e)
                     elif elem.tag == 'alias':
@@ -503,7 +514,8 @@ def main():
                             continue
                         try:
                             time_formats[elem.attrib.get('type')] = \
-                                dates.parse_pattern(text_type(elem.findtext('timeFormat/pattern')))
+                                dates.parse_pattern(text_type(
+                                    elem.findtext('timeFormat/pattern')))
                         except ValueError as e:
                             error(e)
                     elif elem.tag == 'alias':
@@ -545,7 +557,8 @@ def main():
                 # TODO map the alias to its target
                 continue
             pattern = text_type(elem.findtext('./decimalFormat/pattern'))
-            decimal_formats[elem.attrib.get('type')] = numbers.parse_pattern(pattern)
+            decimal_formats[elem.attrib.get('type')] = \
+                numbers.parse_pattern(pattern)
 
         scientific_formats = data.setdefault('scientific_formats', {})
         for elem in tree.findall('.//scientificFormats/scientificFormatLength'):
@@ -553,7 +566,8 @@ def main():
                     and elem.attrib.get('type') in scientific_formats:
                 continue
             pattern = text_type(elem.findtext('scientificFormat/pattern'))
-            scientific_formats[elem.attrib.get('type')] = numbers.parse_pattern(pattern)
+            scientific_formats[elem.attrib.get('type')] = \
+                numbers.parse_pattern(pattern)
 
         currency_formats = data.setdefault('currency_formats', {})
         for elem in tree.findall('.//currencyFormats/currencyFormatLength'):
@@ -561,7 +575,8 @@ def main():
                     and elem.attrib.get('type') in currency_formats:
                 continue
             pattern = text_type(elem.findtext('currencyFormat/pattern'))
-            currency_formats[elem.attrib.get('type')] = numbers.parse_pattern(pattern)
+            currency_formats[elem.attrib.get('type')] = \
+                numbers.parse_pattern(pattern)
 
         percent_formats = data.setdefault('percent_formats', {})
         for elem in tree.findall('.//percentFormats/percentFormatLength'):
@@ -569,7 +584,8 @@ def main():
                     and elem.attrib.get('type') in percent_formats:
                 continue
             pattern = text_type(elem.findtext('percentFormat/pattern'))
-            percent_formats[elem.attrib.get('type')] = numbers.parse_pattern(pattern)
+            percent_formats[elem.attrib.get('type')] = \
+                numbers.parse_pattern(pattern)
 
         currency_names = data.setdefault('currency_names', {})
         currency_names_plural = data.setdefault('currency_names_plural', {})
@@ -580,8 +596,8 @@ def main():
                 if ('draft' in name.attrib) and code in currency_names:
                     continue
                 if 'count' in name.attrib:
-                    currency_names_plural.setdefault(code, {})[name.attrib['count']] = \
-                        text_type(name.text)
+                    currency_names_plural.setdefault(code, {})[
+                        name.attrib['count']] = text_type(name.text)
                 else:
                     currency_names[code] = text_type(name.text)
             # TODO: support choice patterns for currency symbol selection
@@ -600,7 +616,7 @@ def main():
                 if 'alt' in pattern.attrib:
                     box += ':' + pattern.attrib['alt']
                 unit_patterns.setdefault(box, {})[pattern.attrib['count']] = \
-                        text_type(pattern.text)
+                    text_type(pattern.text)
 
         outfile = open(data_filename, 'wb')
         try:

From f5960f3116c6a615f44133c66cf17ed561d063f8 Mon Sep 17 00:00:00 2001
From: masklinn <github.com@masklinn.net>
Date: Tue, 26 Nov 2013 19:45:35 +0100
Subject: [PATCH 023/489] Add links from changelog entries to their ticket via
 extlink

Supports links to the new github (``:gh:``) and the old trac
(``:trac:``). The prefixes are used to keep the same reference style
as pre-extlinks in the final output (aside from a few entries at the
bottom of 1.0, trac references were all in the form ``ticket #42``).
---
 CHANGES      | 158 ++++++++++++++++++++++++++-------------------------
 docs/conf.py |   8 ++-
 2 files changed, 89 insertions(+), 77 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7ccd8c9e1..7f44c5f9a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,7 +30,7 @@ Version 1.3
 - Fixed a bug in likely-subtag resolving for some common locales.
   This primarily makes ``zh_CN`` work again which was broken
   due to how it was defined in the likely subtags combined with
-  our broken resolving.  This fixes #37.
+  our broken resolving.  This fixes :gh:`37`.
 - Fixed a bug that caused pybabel to break when writing to stdout
   on Python 3.
 - Removed a stray print that was causing issues when writing to
@@ -65,8 +65,8 @@ Version 1.0
 - use tox for testing on different pythons
 - Added support for the locale plural rules defined by the CLDR.
 - Added `format_timedelta` function to support localized formatting of
-  relative times with strings such as "2 days" or "1 month" (ticket #126).
-- Fixed negative offset handling of Catalog._set_mime_headers (ticket #165).
+  relative times with strings such as "2 days" or "1 month" (:trac:`126`).
+- Fixed negative offset handling of Catalog._set_mime_headers (:trac:`165`).
 - Fixed the case where messages containing square brackets would break with
   an unpack error.
 - updated to CLDR 23
@@ -74,52 +74,56 @@ Version 1.0
 - Fix various typos.
 - Sort output of list-locales.
 - Make the POT-Creation-Date of the catalog being updated equal to
-  POT-Creation-Date of the template used to update (ticket #148).
+  POT-Creation-Date of the template used to update (:trac:`148`).
 - Use a more explicit error message if no option or argument (command) is
-  passed to pybabel (ticket #81).
-- Keep the PO-Revision-Date if it is not the default value (ticket #148).
+  passed to pybabel (:trac:`81`).
+- Keep the PO-Revision-Date if it is not the default value (:trac:`148`).
 - Make --no-wrap work by reworking --width's default and mimic xgettext's
-  behaviour of always wrapping comments (ticket #145).
-- Add --project and --version options for commandline (ticket #173).
+  behaviour of always wrapping comments (:trac:`145`).
+- Add --project and --version options for commandline (:trac:`173`).
 - Add a __ne__() method to the Local class.
 - Explicitly sort instead of using sorted() and don't assume ordering
   (Jython compatibility).
 - Removed ValueError raising for string formatting message checkers if the
-  string does not contain any string formattings (ticket #150).
-- Fix Serbian plural forms (ticket #213).
-- Small speed improvement in format_date() (ticket #216).
+  string does not contain any string formattings (:trac:`150`).
+- Fix Serbian plural forms (:trac:`213`).
+- Small speed improvement in format_date() (:trac:`216`).
 - Fix so frontend.CommandLineInterface.run does not accumulate logging 
-  handlers (#227, reported with initial patch by dfraser)
-- Fix exception if environment contains an invalid locale setting (#200)
-- use cPickle instead of pickle for better performance (#225)
+  handlers (:trac:`227`, reported with initial patch by dfraser)
+- Fix exception if environment contains an invalid locale setting
+  (:trac:`200`)
+- use cPickle instead of pickle for better performance (:trac:`225`)
 - Only use bankers round algorithm as a tie breaker if there are two nearest
-  numbers, round as usual if there is only one nearest number (#267, patch by 
-  Martin)
-- Allow disabling cache behaviour in LazyProxy (#208, initial patch from Pedro 
-  Algarvio)
-- Support for context-aware methods during message extraction (#229, patch
-  from David Rios)
-- "init" and "update" commands support "--no-wrap" option (#289)
+  numbers, round as usual if there is only one nearest number (:trac:`267`,
+  patch by Martin)
+- Allow disabling cache behaviour in LazyProxy (:trac:`208`, initial patch
+  from Pedro Algarvio)
+- Support for context-aware methods during message extraction (:trac:`229`,
+  patch from David Rios)
+- "init" and "update" commands support "--no-wrap" option (:trac:`289`)
 - fix formatting of fraction in format_decimal() if the input value is a float
-  with more than 7 significant digits (#183)
-- fix format_date() with datetime parameter (#282, patch from Xavier Morel)
-- fix format_decimal() with small Decimal values (#214, patch from George Lund)
-- fix handling of messages containing '\\n' (#198)
-- handle irregular multi-line msgstr (no "" as first line) gracefully (#171)
-- parse_decimal() now returns Decimals not floats, API change (#178)
-- no warnings when running setup.py without installed setuptools (#262)
+  with more than 7 significant digits (:trac:`183`)
+- fix format_date() with datetime parameter (:trac:`282`, patch from Xavier
+  Morel)
+- fix format_decimal() with small Decimal values (:trac:`214`, patch from
+  George Lund)
+- fix handling of messages containing '\\n' (:trac:`198`)
+- handle irregular multi-line msgstr (no "" as first line) gracefully
+  (:trac:`171`)
+- parse_decimal() now returns Decimals not floats, API change (:trac:`178`)
+- no warnings when running setup.py without installed setuptools (:trac:`262`)
 - modified Locale.__eq__ method so Locales are only equal if all of their
   attributes (language, territory, script, variant) are equal
-- resort to hard-coded message extractors/checkers if pkg_resources is 
-  installed but no egg-info was found (#230)
-- format_time() and format_datetime() now accept also floats (#242)
+- resort to hard-coded message extractors/checkers if pkg_resources is
+  installed but no egg-info was found (:trac:`230`)
+- format_time() and format_datetime() now accept also floats (:trac:`242`)
 - add babel.support.NullTranslations class similar to gettext.NullTranslations
-  but with all of Babel's new gettext methods (#277)
-- "init" and "update" commands support "--width" option (#284)
-- fix 'input_dirs' option for setuptools integration (#232, initial patch by 
-  Étienne Bersac)
-- ensure .mo file header contains the same information as the source .po file 
-  (#199)
+  but with all of Babel's new gettext methods (:trac:`277`)
+- "init" and "update" commands support "--width" option (:trac:`284`)
+- fix 'input_dirs' option for setuptools integration (:trac:`232`, initial
+  patch by Étienne Bersac)
+- ensure .mo file header contains the same information as the source .po file
+  (:trac:`199`)
 - added support for get_language_name() on the locale objects.
 - added support for get_territory_name() on the locale objects.
 - added support for get_script_name() on the locale objects.
@@ -143,31 +147,32 @@ Version 0.9.6
 - Backport r493-494: documentation typo fixes.
 - Make the CLDR import script work with Python 2.7.
 - Fix various typos.
-- Fixed Python 2.3 compatibility (ticket #146, #233).
+- Fixed Python 2.3 compatibility (:trac:`146`, :trac:`233`).
 - Sort output of list-locales.
 - Make the POT-Creation-Date of the catalog being updated equal to
-  POT-Creation-Date of the template used to update (ticket #148).
+  POT-Creation-Date of the template used to update (:trac:`148`).
 - Use a more explicit error message if no option or argument (command) is
-  passed to pybabel (ticket #81).
-- Keep the PO-Revision-Date if it is not the default value (ticket #148).
+  passed to pybabel (:trac:`81`).
+- Keep the PO-Revision-Date if it is not the default value (:trac:`148`).
 - Make --no-wrap work by reworking --width's default and mimic xgettext's
-  behaviour of always wrapping comments (ticket #145).
-- Fixed negative offset handling of Catalog._set_mime_headers (ticket #165).
-- Add --project and --version options for commandline (ticket #173).
+  behaviour of always wrapping comments (:trac:`145`).
+- Fixed negative offset handling of Catalog._set_mime_headers (:trac:`165`).
+- Add --project and --version options for commandline (:trac:`173`).
 - Add a __ne__() method to the Local class.
 - Explicitly sort instead of using sorted() and don't assume ordering
   (Python 2.3 and Jython compatibility).
 - Removed ValueError raising for string formatting message checkers if the
-  string does not contain any string formattings (ticket #150).
-- Fix Serbian plural forms (ticket #213).
-- Small speed improvement in format_date() (ticket #216).
+  string does not contain any string formattings (:trac:`150`).
+- Fix Serbian plural forms (:trac:`213`).
+- Small speed improvement in format_date() (:trac:`216`).
 - Fix number formatting for locales where CLDR specifies alt or draft 
-  items (ticket #217)
-- Fix bad check in format_time (ticket #257, reported with patch and tests by 
+  items (:trac:`217`)
+- Fix bad check in format_time (:trac:`257`, reported with patch and tests by
   jomae)
 - Fix so frontend.CommandLineInterface.run does not accumulate logging 
-  handlers (#227, reported with initial patch by dfraser)
-- Fix exception if environment contains an invalid locale setting (#200)
+  handlers (:trac:`227`, reported with initial patch by dfraser)
+- Fix exception if environment contains an invalid locale setting
+  (:trac:`200`)
 
 
 Version 0.9.5
@@ -179,7 +184,7 @@ Version 0.9.5
   an unpack error.
 - Backport of r467: Fuzzy matching regarding plurals should *NOT* be checked
   against len(message.id)  because this is always 2, instead, it's should be
-  checked against catalog.num_plurals (ticket #212).
+  checked against catalog.num_plurals (:trac:`212`).
 
 
 Version 0.9.4
@@ -191,17 +196,17 @@ Version 0.9.4
   CLDR data are no longer imported, so the symbol code will be used instead.
 - Fixed quarter support in date formatting.
 - Fixed a serious memory leak that was introduces by the support for CLDR
-  aliases in 0.9.3 (ticket #128).
+  aliases in 0.9.3 (:trac:`128`).
 - Locale modifiers such as "@euro" are now stripped from locale identifiers
-  when parsing (ticket #136).
+  when parsing (:trac:`136`).
 - The system locales "C" and "POSIX" are now treated as aliases for
   "en_US_POSIX", for which the CLDR provides the appropriate data. Thanks to
   Manlio Perillo for the suggestion.
-- Fixed JavaScript extraction for regular expression literals (ticket #138)
+- Fixed JavaScript extraction for regular expression literals (:trac:`138`)
   and concatenated strings.
 - The `Translation` class in `babel.support` can now manage catalogs with
   different message domains, and exposes the family of `d*gettext` functions
-  (ticket #137).
+  (:trac:`137`).
 
 
 Version 0.9.3
@@ -211,11 +216,11 @@ Version 0.9.3
 
 - Fixed invalid message extraction methods causing an UnboundLocalError.
 - Extraction method specification can now use a dot instead of the colon to
-  separate module and function name (ticket #105).
+  separate module and function name (:trac:`105`).
 - Fixed message catalog compilation for locales with more than two plural
-  forms (ticket #95).
+  forms (:trac:`95`).
 - Fixed compilation of message catalogs for locales with more than two plural
-  forms where the translations were empty (ticket #97).
+  forms where the translations were empty (:trac:`97`).
 - The stripping of the comment tags in comments is optional now and
   is done for each line in a comment.
 - Added a JavaScript message extractor.
@@ -225,7 +230,7 @@ Version 0.9.3
   correct plural forms for a locale as tuple.
 - Added support for alias definitions in the CLDR data files, meaning that
   the chance for items missing in certain locales should be greatly reduced
-  (ticket #68).
+  (:trac:`68`).
 
 
 Version 0.9.2
@@ -233,15 +238,15 @@ Version 0.9.2
 
 (released on February 4th 2008)
 
-- Fixed catalogs' charset values not being recognized (ticket #66).
+- Fixed catalogs' charset values not being recognized (:trac:`66`).
 - Numerous improvements to the default plural forms.
-- Fixed fuzzy matching when updating message catalogs (ticket #82).
+- Fixed fuzzy matching when updating message catalogs (:trac:`82`).
 - Fixed bug in catalog updating, that in some cases pulled in translations
   from different catalogs based on the same template.
 - Location lines in PO files do no longer get wrapped at hyphens in file
-  names (ticket #79).
+  names (:trac:`79`).
 - Fixed division by zero error in catalog compilation on empty catalogs
-  (ticket #60).
+  (:trac:`60`).
 
 
 Version 0.9.1
@@ -254,7 +259,7 @@ Version 0.9.1
   `ngettext`, or vice versa.
 - Fixed time formatting for 12 am and 12 pm.
 - Fixed output encoding of the `pybabel --list-locales` command.
-- MO files are now written in binary mode on windows (ticket #61).
+- MO files are now written in binary mode on windows (:trac:`61`).
 
 
 Version 0.9
@@ -264,23 +269,24 @@ Version 0.9
 
 - The `new_catalog` distutils command has been renamed to `init_catalog` for
   consistency with the command-line frontend.
-- Added compilation of message catalogs to MO files (ticket #21).
-- Added updating of message catalogs from POT files (ticket #22).
+- Added compilation of message catalogs to MO files (:trac:`21`).
+- Added updating of message catalogs from POT files (:trac:`22`).
 - Support for significant digits in number formatting.
 - Apply proper "banker's rounding" in number formatting in a cross-platform
   manner.
 - The number formatting functions now also work with numbers represented by
-  Python `Decimal` objects (ticket #53).
+  Python `Decimal` objects (:trac:`53`).
 - Added extensible infrastructure for validating translation catalogs.
 - Fixed the extractor not filtering out messages that didn't validate against
-  the keyword's specification (ticket #39).
+  the keyword's specification (:trac:`39`).
 - Fixed the extractor raising an exception when encountering an empty string
   msgid. It now emits a warning to stderr.
 - Numerous Python message extractor fixes: it now handles nested function
   calls within a gettext function call correctly, uses the correct line number
-  for multi-line function calls, and other small fixes (tickets #38 and #39).
+  for multi-line function calls, and other small fixes (tickets :trac:`38` and
+  :trac:`39`).
 - Improved support for detecting Python string formatting fields in message
-  strings (ticket #57).
+  strings (:trac:`57`).
 - CLDR upgraded to the 1.5 release.
 - Improved timezone formatting.
 - Implemented scientific number formatting.
@@ -302,21 +308,21 @@ Version 0.8.1
   that way.
 - The character set specified in PO template files is now respected when
   creating new catalog files based on that template. This allows the use of
-  characters outside the ASCII range in POT files (ticket #17).
+  characters outside the ASCII range in POT files (:trac:`17`).
 - The default ordering of messages in generated POT files, which is based on
   the order those messages are found when walking the source tree, is no
   longer subject to differences between platforms; directory and file names
   are now always sorted alphabetically.
 - The Python message extractor now respects the special encoding comment to be
-  able to handle files containing non-ASCII characters (ticket #23).
+  able to handle files containing non-ASCII characters (:trac:`23`).
 - Added ``N_`` (gettext noop) to the extractor's default keywords.
 - Made locale string parsing more robust, and also take the script part into
-  account (ticket #27).
+  account (:trac:`27`).
 - Added a function to list all locales for which locale data is available.
 - Added a command-line option to the `pybabel` command which prints out all
-  available locales (ticket #24).
+  available locales (:trac:`24`).
 - The name of the command-line script has been changed from just `babel` to
-  `pybabel` to avoid a conflict with the OpenBabel project (ticket #34).
+  `pybabel` to avoid a conflict with the OpenBabel project (:trac:`34`).
 
 
 Version 0.8
diff --git a/docs/conf.py b/docs/conf.py
index b1467c74b..c84ebaef4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -27,7 +27,8 @@
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc',
-              'sphinx.ext.intersphinx']
+              'sphinx.ext.intersphinx',
+              'sphinx.ext.extlinks']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -254,3 +255,8 @@
 intersphinx_mapping = {
     'http://docs.python.org/2': None,
 }
+
+extlinks = {
+    'gh': ('https://github.com/mitsuhiko/babel/issues/%s', '#'),
+    'trac': ('http://babel.edgewall.org/ticket/%s', 'ticket #'),
+}

From 50f727ac2c741877235c592ce4e1f50bba08162c Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Fri, 6 Dec 2013 11:49:26 +0000
Subject: [PATCH 024/489] Fixup get_currency_name test

This test failed in environments where no default locale
can be determined; make the test deterministic and add
additional test for plurality.

Signed-off-by: James Page <james.page@ubuntu.com>
---
 tests/test_numbers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 99e0d1bda..7faba6be2 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -175,7 +175,8 @@ def test_can_parse_decimals(self):
 
 
 def test_get_currency_name():
-    assert numbers.get_currency_name('USD', 'en_US') == u'US dollars'
+    assert numbers.get_currency_name('USD', locale='en_US') == u'US Dollar'
+    assert numbers.get_currency_name('USD', count=2, locale='en_US') == u'US dollars'
 
 
 def test_get_currency_symbol():

From b004036f8b2624235af20ba601607efa8c3db3ca Mon Sep 17 00:00:00 2001
From: Alex Morega <alex@grep.ro>
Date: Mon, 6 Jan 2014 21:19:47 +0200
Subject: [PATCH 025/489] use fallback plural if none is defined in CLDR

fixes #69
---
 babel/core.py        | 4 +++-
 tests/test_plural.py | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/babel/core.py b/babel/core.py
index 56dbf5593..4ada4661f 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -13,12 +13,14 @@
 
 from babel import localedata
 from babel._compat import pickle, string_types
+from babel.plural import PluralRule
 
 __all__ = ['UnknownLocaleError', 'Locale', 'default_locale', 'negotiate_locale',
            'parse_locale']
 
 
 _global_data = None
+_default_plural_rule = PluralRule({})
 
 
 def _raise_no_data_error():
@@ -737,7 +739,7 @@ def plural_form(self):
         >>> Locale('ru').plural_form(100)
         'many'
         """
-        return self._data['plural_form']
+        return self._data.get('plural_form', _default_plural_rule)
 
 
 def default_locale(category=None, aliases=LOCALE_ALIASES):
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 5fe67a548..7f31fd98f 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -90,3 +90,11 @@ def test_plural_within_rules():
     assert p(7) == 'few'
     assert p(8) == 'few'
     assert p(9) == 'few'
+
+
+def test_locales_with_no_plural_rules_have_default():
+    from babel import Locale
+    aa_plural = Locale.parse('aa').plural_form
+    assert aa_plural(1) == 'other'
+    assert aa_plural(2) == 'other'
+    assert aa_plural(15) == 'other'

From e92bbba373e6d56383723f71dd8d531c4cdd2806 Mon Sep 17 00:00:00 2001
From: Alex Morega <alex@grep.ro>
Date: Mon, 6 Jan 2014 21:41:25 +0200
Subject: [PATCH 026/489] extract _parse_datetime_header function

---
 babel/messages/catalog.py | 84 ++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 54 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 501763b58..82c08c881 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -40,6 +40,34 @@
 ''')
 
 
+def _parse_datetime_header(value):
+    value, tzoffset, _ = re.split('([+-]\d{4})$', value, 1)
+
+    tt = time.strptime(value, '%Y-%m-%d %H:%M')
+    ts = time.mktime(tt)
+
+    # Separate the offset into a sign component, hours, and # minutes
+    plus_minus_s, rest = tzoffset[0], tzoffset[1:]
+    hours_offset_s, mins_offset_s = rest[:2], rest[2:]
+
+    # Make them all integers
+    plus_minus = int(plus_minus_s + '1')
+    hours_offset = int(hours_offset_s)
+    mins_offset = int(mins_offset_s)
+
+    # Calculate net offset
+    net_mins_offset = hours_offset * 60
+    net_mins_offset += mins_offset
+    net_mins_offset *= plus_minus
+
+    # Create an offset object
+    tzoffset = FixedOffsetTimezone(net_mins_offset)
+
+    # Store the offset in a datetime object
+    dt = datetime.fromtimestamp(ts)
+    return dt.replace(tzinfo=tzoffset)
+
+
 class Message(object):
     """Representation of a single message in a catalog."""
 
@@ -379,63 +407,11 @@ def _set_mime_headers(self, headers):
                 self._num_plurals = int(params.get('nplurals', 2))
                 self._plural_expr = params.get('plural', '(n != 1)')
             elif name == 'pot-creation-date':
-                # FIXME: this should use dates.parse_datetime as soon as that
-                #        is ready
-                value, tzoffset, _ = re.split('([+-]\d{4})$', value, 1)
-
-                tt = time.strptime(value, '%Y-%m-%d %H:%M')
-                ts = time.mktime(tt)
-
-                # Separate the offset into a sign component, hours, and minutes
-                plus_minus_s, rest = tzoffset[0], tzoffset[1:]
-                hours_offset_s, mins_offset_s = rest[:2], rest[2:]
-
-                # Make them all integers
-                plus_minus = int(plus_minus_s + '1')
-                hours_offset = int(hours_offset_s)
-                mins_offset = int(mins_offset_s)
-
-                # Calculate net offset
-                net_mins_offset = hours_offset * 60
-                net_mins_offset += mins_offset
-                net_mins_offset *= plus_minus
-
-                # Create an offset object
-                tzoffset = FixedOffsetTimezone(net_mins_offset)
-
-                # Store the offset in a datetime object
-                dt = datetime.fromtimestamp(ts)
-                self.creation_date = dt.replace(tzinfo=tzoffset)
+                self.creation_date = _parse_datetime_header(value)
             elif name == 'po-revision-date':
                 # Keep the value if it's not the default one
                 if 'YEAR' not in value:
-                    # FIXME: this should use dates.parse_datetime as soon as
-                    #        that is ready
-                    value, tzoffset, _ = re.split('([+-]\d{4})$', value, 1)
-                    tt = time.strptime(value, '%Y-%m-%d %H:%M')
-                    ts = time.mktime(tt)
-
-                    # Separate the offset into a sign component, hours, and
-                    # minutes
-                    plus_minus_s, rest = tzoffset[0], tzoffset[1:]
-                    hours_offset_s, mins_offset_s = rest[:2], rest[2:]
-
-                    # Make them all integers
-                    plus_minus = int(plus_minus_s + '1')
-                    hours_offset = int(hours_offset_s)
-                    mins_offset = int(mins_offset_s)
-
-                    # Calculate net offset
-                    net_mins_offset = hours_offset * 60
-                    net_mins_offset += mins_offset
-                    net_mins_offset *= plus_minus
-
-                    # Create an offset object
-                    tzoffset = FixedOffsetTimezone(net_mins_offset)
-
-                    # Store the offset in a datetime object
-                    dt = datetime.fromtimestamp(ts)
-                    self.revision_date = dt.replace(tzinfo=tzoffset)
+                    self.revision_date = _parse_datetime_header(value)
 
     mime_headers = property(_get_mime_headers, _set_mime_headers, doc="""\
     The MIME headers of the catalog, used for the special ``msgid ""`` entry.

From 1df64dfe5d9e10f6725362d467278c5eb02e5162 Mon Sep 17 00:00:00 2001
From: Alex Morega <alex@grep.ro>
Date: Mon, 6 Jan 2014 21:43:33 +0200
Subject: [PATCH 027/489] rewrite regexp parsing

---
 babel/messages/catalog.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 82c08c881..756d64cce 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -41,12 +41,13 @@
 
 
 def _parse_datetime_header(value):
-    value, tzoffset, _ = re.split('([+-]\d{4})$', value, 1)
+    match = re.match(r'^(?P<datetime>.*)(?P<tzoffset>[+-]\d{4})$', value)
 
-    tt = time.strptime(value, '%Y-%m-%d %H:%M')
+    tt = time.strptime(match.group('datetime'), '%Y-%m-%d %H:%M')
     ts = time.mktime(tt)
 
     # Separate the offset into a sign component, hours, and # minutes
+    tzoffset = match.group('tzoffset')
     plus_minus_s, rest = tzoffset[0], tzoffset[1:]
     hours_offset_s, mins_offset_s = rest[:2], rest[2:]
 

From 88c564228d30a6cda6368cf2077341fea0c6c6d2 Mon Sep 17 00:00:00 2001
From: Alex Morega <alex@grep.ro>
Date: Mon, 6 Jan 2014 21:55:27 +0200
Subject: [PATCH 028/489] parse datetime values with no timezone info

fixes #56
---
 babel/messages/catalog.py      | 35 ++++++++++++++++++----------------
 tests/messages/test_catalog.py | 14 ++++++++++++++
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 756d64cce..67c542591 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -41,32 +41,35 @@
 
 
 def _parse_datetime_header(value):
-    match = re.match(r'^(?P<datetime>.*)(?P<tzoffset>[+-]\d{4})$', value)
+    match = re.match(r'^(?P<datetime>.*?)(?P<tzoffset>[+-]\d{4})?$', value)
 
     tt = time.strptime(match.group('datetime'), '%Y-%m-%d %H:%M')
     ts = time.mktime(tt)
+    dt = datetime.fromtimestamp(ts)
 
     # Separate the offset into a sign component, hours, and # minutes
     tzoffset = match.group('tzoffset')
-    plus_minus_s, rest = tzoffset[0], tzoffset[1:]
-    hours_offset_s, mins_offset_s = rest[:2], rest[2:]
+    if tzoffset is not None:
+        plus_minus_s, rest = tzoffset[0], tzoffset[1:]
+        hours_offset_s, mins_offset_s = rest[:2], rest[2:]
 
-    # Make them all integers
-    plus_minus = int(plus_minus_s + '1')
-    hours_offset = int(hours_offset_s)
-    mins_offset = int(mins_offset_s)
+        # Make them all integers
+        plus_minus = int(plus_minus_s + '1')
+        hours_offset = int(hours_offset_s)
+        mins_offset = int(mins_offset_s)
 
-    # Calculate net offset
-    net_mins_offset = hours_offset * 60
-    net_mins_offset += mins_offset
-    net_mins_offset *= plus_minus
+        # Calculate net offset
+        net_mins_offset = hours_offset * 60
+        net_mins_offset += mins_offset
+        net_mins_offset *= plus_minus
 
-    # Create an offset object
-    tzoffset = FixedOffsetTimezone(net_mins_offset)
+        # Create an offset object
+        tzoffset = FixedOffsetTimezone(net_mins_offset)
 
-    # Store the offset in a datetime object
-    dt = datetime.fromtimestamp(ts)
-    return dt.replace(tzinfo=tzoffset)
+        # Store the offset in a datetime object
+        dt = dt.replace(tzinfo=tzoffset)
+
+    return dt
 
 
 class Message(object):
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index fcac34d3d..aac71eeac 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -454,3 +454,17 @@ def test_catalog_update():
 
     assert not 'head' in cat
     assert list(cat.obsolete.values())[0].id == 'head'
+
+
+def test_datetime_parsing():
+    val1 = catalog._parse_datetime_header('2006-06-28 23:24+0200')
+    assert val1.year == 2006
+    assert val1.month == 6
+    assert val1.day == 28
+    assert val1.tzinfo.zone == 'Etc/GMT+120'
+
+    val2 = catalog._parse_datetime_header('2006-06-28 23:24')
+    assert val2.year == 2006
+    assert val2.month == 6
+    assert val2.day == 28
+    assert val2.tzinfo is None

From 764f68b42a0f2dc0ad82152f84008503e2ac0d3d Mon Sep 17 00:00:00 2001
From: Alex Morega <alex@grep.ro>
Date: Mon, 6 Jan 2014 22:39:22 +0200
Subject: [PATCH 029/489] re-enable doctests

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f2cdc967c..48120c6c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 test: import-cldr
-	@py.test tests
+	@py.test
 
 test-env:
 	@virtualenv test-env

From 2eb475f835375c1b3b7fefcb7d8aad7047d7fda7 Mon Sep 17 00:00:00 2001
From: Alex Morega <alex@grep.ro>
Date: Mon, 6 Jan 2014 22:48:15 +0200
Subject: [PATCH 030/489] specify locale

otherwise, running tests in another locale fails
fixes #45, thanks @Arfrever!
---
 babel/dates.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 72674e8aa..73d54fa57 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -733,9 +733,9 @@ def format_timedelta(delta, granularity='second', threshold=.85,
     In addition directional information can be provided that informs
     the user if the date is in the past or in the future:
 
-    >>> format_timedelta(timedelta(hours=1), add_direction=True)
+    >>> format_timedelta(timedelta(hours=1), add_direction=True, locale='en')
     u'In 1 hour'
-    >>> format_timedelta(timedelta(hours=-1), add_direction=True)
+    >>> format_timedelta(timedelta(hours=-1), add_direction=True, locale='en')
     u'1 hour ago'
 
     :param delta: a ``timedelta`` object representing the time difference to

From 2af2c176b09b0fd90b91e6678e2afaf1355f838b Mon Sep 17 00:00:00 2001
From: Alex Morega <alex@grep.ro>
Date: Mon, 6 Jan 2014 23:15:45 +0200
Subject: [PATCH 031/489] change spelling of the encoding

Apparently jython doesn't understand "utf_8". Fixes #46.
---
 babel/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/util.py b/babel/util.py
index f46ee2b70..a65fce36e 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -80,7 +80,7 @@ def parse_encoding(fp):
                 raise SyntaxError(
                     "python refuses to compile code with both a UTF8 "
                     "byte-order-mark and a magic encoding comment")
-            return 'utf_8'
+            return 'utf-8'
         elif m:
             return m.group(1).decode('latin-1')
         else:

From 7bad77ded77f658c2b8a478e4a35a672d143606e Mon Sep 17 00:00:00 2001
From: Alex Morega <alex@grep.ro>
Date: Tue, 7 Jan 2014 08:16:16 +0200
Subject: [PATCH 032/489] fix warning for deprecated array.tostring

fixes #75
---
 Makefile                 | 2 +-
 babel/_compat.py         | 5 +++++
 babel/messages/mofile.py | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 48120c6c5..5bb68a9a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 test: import-cldr
-	@py.test
+	@PYTHONWARNINGS=default py.test
 
 test-env:
 	@virtualenv test-env
diff --git a/babel/_compat.py b/babel/_compat.py
index 86096daa6..0f7640de1 100644
--- a/babel/_compat.py
+++ b/babel/_compat.py
@@ -1,4 +1,5 @@
 import sys
+import array
 
 PY2 = sys.version_info[0] == 2
 
@@ -26,6 +27,8 @@
 
     cmp = lambda a, b: (a > b) - (a < b)
 
+    array_tobytes = array.array.tobytes
+
 else:
     text_type = unicode
     string_types = (str, unicode)
@@ -47,5 +50,7 @@
 
     cmp = cmp
 
+    array_tobytes = array.array.tostring
+
 
 number_types = integer_types + (float,)
diff --git a/babel/messages/mofile.py b/babel/messages/mofile.py
index 5dd20aee0..18503287b 100644
--- a/babel/messages/mofile.py
+++ b/babel/messages/mofile.py
@@ -13,7 +13,7 @@
 import struct
 
 from babel.messages.catalog import Catalog, Message
-from babel._compat import range_type
+from babel._compat import range_type, array_tobytes
 
 
 LE_MAGIC = 0x950412de
@@ -206,4 +206,4 @@ def write_mo(fileobj, catalog, use_fuzzy=False):
         7 * 4,                      # start of key index
         7 * 4 + len(messages) * 8,  # start of value index
         0, 0                        # size and offset of hash table
-    ) + array.array("i", offsets).tostring() + ids + strs)
+    ) + array_tobytes(array.array("i", offsets)) + ids + strs)

From c21a3323d27f17556cd997a0f9279c6d0ec65be3 Mon Sep 17 00:00:00 2001
From: Alex Morega <alex@grep.ro>
Date: Wed, 8 Jan 2014 13:24:40 +0200
Subject: [PATCH 033/489] correctly handle 'C.UTF-8' locale

fixes #57
---
 babel/core.py      | 2 +-
 tests/test_core.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/babel/core.py b/babel/core.py
index 4ada4661f..df3857295 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -777,7 +777,7 @@ def default_locale(category=None, aliases=LOCALE_ALIASES):
                 # the LANGUAGE variable may contain a colon-separated list of
                 # language codes; we just pick the language on the list
                 locale = locale.split(':')[0]
-            if locale in ('C', 'POSIX'):
+            if locale.split('.')[0] in ('C', 'POSIX'):
                 locale = 'en_US_POSIX'
             elif aliases and locale in aliases:
                 locale = aliases[locale]
diff --git a/tests/test_core.py b/tests/test_core.py
index ec3f9ea9d..ac2611dce 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -238,6 +238,10 @@ def test_default_locale(os_environ):
     os_environ['LC_MESSAGES'] = 'POSIX'
     assert default_locale('LC_MESSAGES') == 'en_US_POSIX'
 
+    for value in ['C', 'C.UTF-8', 'POSIX']:
+        os_environ['LANGUAGE'] = value
+        assert default_locale() == 'en_US_POSIX'
+
 
 def test_negotiate_locale():
     assert (core.negotiate_locale(['de_DE', 'en_US'], ['de_DE', 'de_AT']) ==

From 514d41c0e73c58d43ace3ec310585bc48775196a Mon Sep 17 00:00:00 2001
From: Alex Morega <alex@grep.ro>
Date: Wed, 15 Jan 2014 22:12:19 +0200
Subject: [PATCH 034/489] read/write all PO files in binary mode

as pointed out in #52
---
 babel/messages/frontend.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index cead69499..cd79ebf20 100755
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -128,7 +128,7 @@ def run(self):
 
         for idx, (locale, po_file) in enumerate(po_files):
             mo_file = mo_files[idx]
-            infile = open(po_file, 'r')
+            infile = open(po_file, 'rb')
             try:
                 catalog = read_po(infile, locale)
             finally:
@@ -439,7 +439,7 @@ def run(self):
         log.info('creating catalog %r based on %r', self.output_file,
                  self.input_file)
 
-        infile = open(self.input_file, 'r')
+        infile = open(self.input_file, 'rb')
         try:
             # Although reading from the catalog template, read_po must be fed
             # the locale in order to correctly calculate plurals
@@ -554,7 +554,7 @@ def run(self):
         if not domain:
             domain = os.path.splitext(os.path.basename(self.input_file))[0]
 
-        infile = open(self.input_file, 'U')
+        infile = open(self.input_file, 'rb')
         try:
             template = read_po(infile)
         finally:
@@ -566,7 +566,7 @@ def run(self):
         for locale, filename in po_files:
             log.info('updating catalog %r based on %r', filename,
                      self.input_file)
-            infile = open(filename, 'U')
+            infile = open(filename, 'rb')
             try:
                 catalog = read_po(infile, locale=locale, domain=domain)
             finally:
@@ -577,7 +577,7 @@ def run(self):
             tmpname = os.path.join(os.path.dirname(filename),
                                    tempfile.gettempprefix() +
                                    os.path.basename(filename))
-            tmpfile = open(tmpname, 'w')
+            tmpfile = open(tmpname, 'wb')
             try:
                 try:
                     write_po(tmpfile, catalog,
@@ -760,7 +760,7 @@ def compile(self, argv):
 
         for idx, (locale, po_file) in enumerate(po_files):
             mo_file = mo_files[idx]
-            infile = open(po_file, 'r')
+            infile = open(po_file, 'rb')
             try:
                 catalog = read_po(infile, locale)
             finally:

From 546755f77b98a4ae4ddc29cb4c44b81cd88a31b1 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Thu, 8 Jan 2015 11:03:52 -0500
Subject: [PATCH 035/489] Update CLDR URL for v24, filename and MD5

---
 scripts/download_import_cldr.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index 9c82fc88a..fe0105339 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -13,9 +13,9 @@
     from urllib import urlretrieve
 
 
-URL = 'http://unicode.org/Public/cldr/23.1/core.zip'
-FILENAME = 'core-23.1.zip'
-FILESUM = 'd44ff35f9b9160becbb3a575468d8a5a'
+URL = 'http://unicode.org/Public/cldr/24/core.zip'
+FILENAME = 'core-24.zip'
+FILESUM = 'cd2e8f31baf65c96bfc7e5377b3b793f'
 BLKSIZE = 131072
 
 

From 837a5463dd386748dd76bd1fd5d74687861a1e53 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Thu, 8 Jan 2015 11:34:21 -0500
Subject: [PATCH 036/489] Some language aliases, which we do not want now use _
 instead of -

---
 scripts/import_cldr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 3a2f1217c..082393ce7 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -184,7 +184,7 @@ def main():
         for alias in sup_metadata.findall('.//alias/languageAlias'):
             # We don't have a use for those at the moment.  They don't
             # pass our parser anyways.
-            if '-' in alias.attrib['type']:
+            if '_' in alias.attrib['type']:
                 continue
             language_aliases[alias.attrib['type']] = alias.attrib['replacement']
 

From b892e1941848db601fb699692a34736774bf5b63 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Thu, 8 Jan 2015 14:49:14 -0500
Subject: [PATCH 037/489] Add link to rules spec in PluralRule doc

---
 babel/plural.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/babel/plural.py b/babel/plural.py
index 144a0dc02..911475750 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -18,7 +18,7 @@
 
 class PluralRule(object):
     """Represents a set of language pluralization rules.  The constructor
-    accepts a list of (tag, expr) tuples or a dict of CLDR rules. The
+    accepts a list of (tag, expr) tuples or a dict of `CLDR rules`_. The
     resulting object is callable and accepts one parameter with a positive or
     negative number (both integer and float) for the number that indicates the
     plural form for a string and returns the tag for the format:
@@ -33,6 +33,8 @@ class PluralRule(object):
     other where other is an implicit default.  Rules should be mutually
     exclusive; for a given numeric value, only one rule should apply (i.e.
     the condition should only be true for one of the plural rule elements.
+
+    .. _`CLDR rules`: http://www.unicode.org/reports/tr35/tr35-33/tr35-numbers.html#Language_Plural_Rules
     """
 
     __slots__ = ('abstract', '_func')

From dd64686bdabddd155d77146e7af25d6a88f2d189 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Thu, 8 Jan 2015 17:07:11 -0500
Subject: [PATCH 038/489] Extract plural rule tokenization function and add
 tests

---
 babel/plural.py      | 71 ++++++++++++++++++++++++++++----------------
 tests/test_plural.py | 28 +++++++++++++++++
 2 files changed, 74 insertions(+), 25 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index 911475750..e2eb88b05 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -255,11 +255,56 @@ def cldr_modulo(a, b):
 class RuleError(Exception):
     """Raised if a rule is malformed."""
 
+_RULES = [
+    (None, re.compile(r'\s+(?u)')),
+    ('word', re.compile(r'\b(and|or|is|(?:with)?in|not|mod|[nivwft])\b')),
+    ('value', re.compile(r'\d+')),
+    ('symbol', re.compile(r'%|,|!=|=')),
+    ('ellipsis', re.compile(r'\.\.'))
+]
+
+
+def tokenize_rule(s):
+    s = s.split('@')[0]
+    result = []
+    pos = 0
+    end = len(s)
+    while pos < end:
+        for tok, rule in _RULES:
+            match = rule.match(s, pos)
+            if match is not None:
+                pos = match.end()
+                if tok:
+                    result.append((tok, match.group()))
+                break
+        else:
+            raise RuleError('malformed CLDR pluralization rule.  '
+                            'Got unexpected %r' % s[pos])
+    return result[::-1]
+
 
 class _Parser(object):
     """Internal parser.  This class can translate a single rule into an abstract
     tree of tuples. It implements the following grammar::
 
+        condition     = and_condition ('or' and_condition)*
+                        ('@integer' samples)?
+                        ('@decimal' samples)?
+        and_condition = relation ('and' relation)*
+        relation      = is_relation | in_relation | within_relation
+        is_relation   = expr 'is' ('not')? value
+        in_relation   = expr (('not')? 'in' | '=' | '!=') range_list
+        within_relation = expr ('not')? 'within' range_list
+        expr          = operand (('mod' | '%') value)?
+        operand       = 'n' | 'i' | 'f' | 't' | 'v' | 'w'
+        range_list    = (range | value) (',' range_list)*
+        value         = digit+
+        digit         = 0|1|2|3|4|5|6|7|8|9
+        range         = value'..'value
+        samples       = sampleRange (',' sampleRange)* (',' ('…'|'...'))?
+        sampleRange   = decimalValue '~' decimalValue
+        decimalValue  = value ('.' value)?
+
         condition     = and_condition ('or' and_condition)*
         and_condition = relation ('and' relation)*
         relation      = is_relation | in_relation | within_relation | 'n' <EOL>
@@ -283,32 +328,8 @@ class _Parser(object):
     called `ast`.
     """
 
-    _rules = [
-        (None, re.compile(r'\s+(?u)')),
-        ('word', re.compile(r'\b(and|or|is|(?:with)?in|not|mod|n)\b')),
-        ('value', re.compile(r'\d+')),
-        ('comma', re.compile(r',')),
-        ('ellipsis', re.compile(r'\.\.'))
-    ]
-
     def __init__(self, string):
-        string = string.lower()
-        result = []
-        pos = 0
-        end = len(string)
-        while pos < end:
-            for tok, rule in self._rules:
-                match = rule.match(string, pos)
-                if match is not None:
-                    pos = match.end()
-                    if tok:
-                        result.append((tok, match.group()))
-                    break
-            else:
-                raise RuleError('malformed CLDR pluralization rule.  '
-                                'Got unexpected %r' % string[pos])
-        self.tokens = result[::-1]
-
+        self.tokens = tokenize_rule(string)
         self.ast = self.condition()
         if self.tokens:
             raise RuleError('Expected end of rule, got %r' %
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 7f31fd98f..ad6da7030 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -13,6 +13,7 @@
 
 import doctest
 import unittest
+import pytest
 
 from babel import plural
 
@@ -98,3 +99,30 @@ def test_locales_with_no_plural_rules_have_default():
     assert aa_plural(1) == 'other'
     assert aa_plural(2) == 'other'
     assert aa_plural(15) == 'other'
+
+
+WELL_FORMED_TOKEN_TESTS = (
+    ('', []),
+    ('n = 1', [('value', '1'), ('symbol', '='), ('word', 'n'), ]),
+    ('n = 1 @integer 1', [('value', '1'), ('symbol', '='), ('word', 'n'), ]),
+    ('n is 1', [('value', '1'), ('word', 'is'), ('word', 'n'), ]),
+    ('n % 100 = 3..10', [('value', '10'), ('ellipsis', '..'), ('value', '3'),
+                         ('symbol', '='),  ('value', '100'), ('symbol', '%'),
+                         ('word', 'n'), ]),
+)
+
+
+@pytest.mark.parametrize('rule_text,tokens', WELL_FORMED_TOKEN_TESTS)
+def test_tokenize_well_formed(rule_text, tokens):
+    assert plural.tokenize_rule(rule_text) == tokens
+
+
+MALFORMED_TOKEN_TESTS = (
+    ('a = 1'), ('n ! 2'),
+)
+
+
+@pytest.mark.parametrize('rule_text', MALFORMED_TOKEN_TESTS)
+def test_tokenize_malformed(rule_text):
+    with pytest.raises(plural.RuleError):
+        plural.tokenize_rule(rule_text)

From ad2ff1b53a2c5c803b6cbdec08fe9ea1a3865333 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Thu, 8 Jan 2015 17:29:24 -0500
Subject: [PATCH 039/489] Include Armin Ronacher's work on PluralRule
 mitsuhiko/babel@774047a

---
 babel/plural.py      | 57 +++++++++++++++++++++++++++++++-------------
 tests/test_plural.py |  2 +-
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index e2eb88b05..03f92fc35 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -255,9 +255,12 @@ def cldr_modulo(a, b):
 class RuleError(Exception):
     """Raised if a rule is malformed."""
 
+_VARS = 'nivwft'
+
 _RULES = [
     (None, re.compile(r'\s+(?u)')),
-    ('word', re.compile(r'\b(and|or|is|(?:with)?in|not|mod|[nivwft])\b')),
+    ('word', re.compile(r'\b(and|or|is|(?:with)?in|not|mod|[{0}])\b'
+                        .format(_VARS))),
     ('value', re.compile(r'\d+')),
     ('symbol', re.compile(r'%|,|!=|=')),
     ('ellipsis', re.compile(r'\.\.'))
@@ -335,20 +338,20 @@ def __init__(self, string):
             raise RuleError('Expected end of rule, got %r' %
                             self.tokens[-1][1])
 
-    def test(self, type, value=None):
-        return self.tokens and self.tokens[-1][0] == type and \
-               (value is None or self.tokens[-1][1] == value)
+    def test(self, type_, value=None):
+        return self.tokens and self.tokens[-1][0] == type_ and \
+            (value is None or self.tokens[-1][1] == value)
 
-    def skip(self, type, value=None):
-        if self.test(type, value):
+    def skip(self, type_, value=None):
+        if self.test(type_, value):
             return self.tokens.pop()
 
-    def expect(self, type, value=None, term=None):
-        token = self.skip(type, value)
+    def expect(self, type_, value=None, term=None):
+        token = self.skip(type_, value)
         if token is not None:
             return token
         if term is None:
-            term = repr(value is None and type or value)
+            term = repr(value is None and type_ or value)
         if not self.tokens:
             raise RuleError('expected %s but end of rule reached' % term)
         raise RuleError('expected %s but got %r' % (term, self.tokens[-1][1]))
@@ -369,36 +372,56 @@ def relation(self):
         left = self.expr()
         if self.skip('word', 'is'):
             return self.skip('word', 'not') and 'isnot' or 'is', \
-                   (left, self.value())
+                (left, self.value())
         negated = self.skip('word', 'not')
         method = 'in'
         if self.skip('word', 'within'):
             method = 'within'
         else:
-            self.expect('word', 'in', term="'within' or 'in'")
+            if not self.skip('word', 'in'):
+                if negated:
+                    raise RuleError('Cannot negate operator based rules.')
+                return self.newfangled_relation(left)
         rv = 'relation', (method, left, self.range_list())
         if negated:
             rv = 'not', (rv,)
         return rv
 
+    def newfangled_relation(self, left):
+        if self.skip('symbol', '='):
+            negated = False
+        elif self.skip('symbol', '!='):
+            negated = True
+        else:
+            raise RuleError('Expected "=" or "!=" or legacy relation')
+        rv = 'relation', ('in', left, self.range_list())
+        if negated:
+            rv = 'not', (rv,)
+        return rv
+
     def range_or_value(self):
         left = self.value()
         if self.skip('ellipsis'):
-            return((left, self.value()))
+            return left, self.value()
         else:
-            return((left, left))
+            return left, left
 
     def range_list(self):
         range_list = [self.range_or_value()]
-        while self.skip('comma'):
+        while self.skip('symbol', ','):
             range_list.append(self.range_or_value())
         return 'range_list', range_list
 
     def expr(self):
-        self.expect('word', 'n')
+        word = self.skip('word')
+        if word is None or word[1] not in _VARS:
+            raise RuleError('Expected identifier variable')
+        name = word[1]
         if self.skip('word', 'mod'):
-            return 'mod', (('n', ()), self.value())
-        return 'n', ()
+            return 'mod', ((name, ()), self.value())
+        elif self.skip('symbol', '%'):
+            return 'mod', ((name, ()), self.value())
+        return name, ()
 
     def value(self):
         return 'value', (int(self.expect('value')[1]),)
diff --git a/tests/test_plural.py b/tests/test_plural.py
index ad6da7030..95e233029 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -18,7 +18,7 @@
 from babel import plural
 
 
-class test_plural_rule():
+def test_plural_rule():
     rule = plural.PluralRule({'one': 'n is 1'})
     assert rule(1) == 'one'
     assert rule(2) == 'other'

From 9f354e1ff36e0cebdfee88b8eca6bb269a43cae4 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Thu, 8 Jan 2015 17:53:16 -0500
Subject: [PATCH 040/489] Extract PluralRule.test and add tests

---
 babel/plural.py      | 11 ++++++-----
 tests/test_plural.py | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index 03f92fc35..1936c5cc4 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -286,6 +286,11 @@ def tokenize_rule(s):
     return result[::-1]
 
 
+def test_next_token(tokens, type_, value=None):
+    return tokens and tokens[-1][0] == type_ and \
+        (value is None or tokens[-1][1] == value)
+
+
 class _Parser(object):
     """Internal parser.  This class can translate a single rule into an abstract
     tree of tuples. It implements the following grammar::
@@ -338,12 +343,8 @@ def __init__(self, string):
             raise RuleError('Expected end of rule, got %r' %
                             self.tokens[-1][1])
 
-    def test(self, type_, value=None):
-        return self.tokens and self.tokens[-1][0] == type_ and \
-            (value is None or self.tokens[-1][1] == value)
-
     def skip(self, type_, value=None):
-        if self.test(type_, value):
+        if test_next_token(self.tokens, type_, value):
             return self.tokens.pop()
 
     def expect(self, type_, value=None, term=None):
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 95e233029..49bdfa737 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -126,3 +126,20 @@ def test_tokenize_well_formed(rule_text, tokens):
 def test_tokenize_malformed(rule_text):
     with pytest.raises(plural.RuleError):
         plural.tokenize_rule(rule_text)
+
+
+class TestNextTokenTestCase(unittest.TestCase):
+    def test_empty(self):
+        assert not plural.test_next_token([], '')
+
+    def test_type_ok_and_no_value(self):
+        assert plural.test_next_token([('word', 'and')], 'word')
+
+    def test_type_ok_and_not_value(self):
+        assert not plural.test_next_token([('word', 'and')], 'word', 'or')
+
+    def test_type_ok_and_value_ok(self):
+        assert plural.test_next_token([('word', 'and')], 'word', 'and')
+
+    def test_type_not_ok_and_value_ok(self):
+        assert not plural.test_next_token([('abc', 'and')], 'word', 'and')
\ No newline at end of file

From e9a4518fccace157b97d00d4866147395de09e33 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Thu, 8 Jan 2015 17:57:07 -0500
Subject: [PATCH 041/489] Extract PluralRule.skip

---
 babel/plural.py | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index 1936c5cc4..5749bb04e 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -291,6 +291,11 @@ def test_next_token(tokens, type_, value=None):
         (value is None or tokens[-1][1] == value)
 
 
+def skip_token(tokens, type_, value=None):
+    if test_next_token(tokens, type_, value):
+        return tokens.pop()
+
+
 class _Parser(object):
     """Internal parser.  This class can translate a single rule into an abstract
     tree of tuples. It implements the following grammar::
@@ -343,12 +348,8 @@ def __init__(self, string):
             raise RuleError('Expected end of rule, got %r' %
                             self.tokens[-1][1])
 
-    def skip(self, type_, value=None):
-        if test_next_token(self.tokens, type_, value):
-            return self.tokens.pop()
-
     def expect(self, type_, value=None, term=None):
-        token = self.skip(type_, value)
+        token = skip_token(self.tokens, type_, value)
         if token is not None:
             return token
         if term is None:
@@ -359,27 +360,27 @@ def expect(self, type_, value=None, term=None):
 
     def condition(self):
         op = self.and_condition()
-        while self.skip('word', 'or'):
+        while skip_token(self.tokens, 'word', 'or'):
             op = 'or', (op, self.and_condition())
         return op
 
     def and_condition(self):
         op = self.relation()
-        while self.skip('word', 'and'):
+        while skip_token(self.tokens, 'word', 'and'):
             op = 'and', (op, self.relation())
         return op
 
     def relation(self):
         left = self.expr()
-        if self.skip('word', 'is'):
-            return self.skip('word', 'not') and 'isnot' or 'is', \
+        if skip_token(self.tokens, 'word', 'is'):
+            return skip_token(self.tokens, 'word', 'not') and 'isnot' or 'is', \
                 (left, self.value())
-        negated = self.skip('word', 'not')
+        negated = skip_token(self.tokens, 'word', 'not')
         method = 'in'
-        if self.skip('word', 'within'):
+        if skip_token(self.tokens, 'word', 'within'):
             method = 'within'
         else:
-            if not self.skip('word', 'in'):
+            if not skip_token(self.tokens, 'word', 'in'):
                 if negated:
                     raise RuleError('Cannot negate operator based rules.')
                 return self.newfangled_relation(left)
@@ -389,9 +390,9 @@ def relation(self):
         return rv
 
     def newfangled_relation(self, left):
-        if self.skip('symbol', '='):
+        if skip_token(self.tokens, 'symbol', '='):
             negated = False
-        elif self.skip('symbol', '!='):
+        elif skip_token(self.tokens, 'symbol', '!='):
             negated = True
         else:
             raise RuleError('Expected "=" or "!=" or legacy relation')
@@ -402,25 +403,25 @@ def newfangled_relation(self, left):
 
     def range_or_value(self):
         left = self.value()
-        if self.skip('ellipsis'):
+        if skip_token(self.tokens, 'ellipsis'):
             return left, self.value()
         else:
             return left, left
 
     def range_list(self):
         range_list = [self.range_or_value()]
-        while self.skip('symbol', ','):
+        while skip_token(self.tokens, 'symbol', ','):
             range_list.append(self.range_or_value())
         return 'range_list', range_list
 
     def expr(self):
-        word = self.skip('word')
+        word = skip_token(self.tokens, 'word')
         if word is None or word[1] not in _VARS:
             raise RuleError('Expected identifier variable')
         name = word[1]
-        if self.skip('word', 'mod'):
+        if skip_token(self.tokens, 'word', 'mod'):
             return 'mod', ((name, ()), self.value())
-        elif self.skip('symbol', '%'):
+        elif skip_token(self.tokens, 'symbol', '%'):
             return 'mod', ((name, ()), self.value())
         return name, ()
 

From c7ae2dbdb153d20fb5e6a49a1edc669a7d02e1fd Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Thu, 8 Jan 2015 19:01:48 -0500
Subject: [PATCH 042/489] More extraction in _Parser, more tests

---
 babel/plural.py      | 26 ++++++++++++++++++++------
 tests/test_plural.py | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index 5749bb04e..e4acd41d6 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -296,6 +296,22 @@ def skip_token(tokens, type_, value=None):
         return tokens.pop()
 
 
+def value_node(value):
+    return 'value', (value, )
+
+
+def ident_node(name):
+    return name, ()
+
+
+def range_list_node(range_list):
+    return 'range_list', range_list
+
+
+def negate(rv):
+    return 'not', (rv,)
+
+
 class _Parser(object):
     """Internal parser.  This class can translate a single rule into an abstract
     tree of tuples. It implements the following grammar::
@@ -385,9 +401,7 @@ def relation(self):
                     raise RuleError('Cannot negate operator based rules.')
                 return self.newfangled_relation(left)
         rv = 'relation', (method, left, self.range_list())
-        if negated:
-            rv = 'not', (rv,)
-        return rv
+        return negate(rv) if negated else rv
 
     def newfangled_relation(self, left):
         if skip_token(self.tokens, 'symbol', '='):
@@ -412,7 +426,7 @@ def range_list(self):
         range_list = [self.range_or_value()]
         while skip_token(self.tokens, 'symbol', ','):
             range_list.append(self.range_or_value())
-        return 'range_list', range_list
+        return range_list_node(range_list)
 
     def expr(self):
         word = skip_token(self.tokens, 'word')
@@ -423,10 +437,10 @@ def expr(self):
             return 'mod', ((name, ()), self.value())
         elif skip_token(self.tokens, 'symbol', '%'):
             return 'mod', ((name, ()), self.value())
-        return name, ()
+        return ident_node(name)
 
     def value(self):
-        return 'value', (int(self.expect('value')[1]),)
+        return value_node(int(self.expect('value')[1]))
 
 
 def _binary_compiler(tmpl):
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 49bdfa737..d20d186a4 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -142,4 +142,37 @@ def test_type_ok_and_value_ok(self):
         assert plural.test_next_token([('word', 'and')], 'word', 'and')
 
     def test_type_not_ok_and_value_ok(self):
-        assert not plural.test_next_token([('abc', 'and')], 'word', 'and')
\ No newline at end of file
+        assert not plural.test_next_token([('abc', 'and')], 'word', 'and')
+
+
+def make_range_list(*values):
+    ranges = []
+    for v in values:
+        if isinstance(v, int):
+            val_node = plural.value_node(v)
+            ranges.append((val_node, val_node))
+        else:
+            assert isinstance(v, tuple)
+            ranges.append((plural.value_node(v[0]),
+                           plural.value_node(v[1])))
+    return plural.range_list_node(ranges)
+
+
+class PluralRuleParserTestCase(unittest.TestCase):
+    def setUp(self):
+        self.n = plural.ident_node('n')
+        self.n_eq_1 = ('relation', ('in', self.n, make_range_list(1)))
+
+    def test_error_when_unexpected_end(self):
+        with pytest.raises(plural.RuleError):
+            plural._Parser('n =')
+
+    def test_eq_relation(self):
+        assert plural._Parser('n = 1').ast == self.n_eq_1
+
+    def test_in_range_relation(self):
+        assert plural._Parser('n = 2..4').ast == \
+            ('relation', ('in', self.n, make_range_list((2, 4))))
+
+    def test_negate(self):
+        assert plural._Parser('n != 1').ast == plural.negate(self.n_eq_1)
\ No newline at end of file

From 88b2b2ecd1e0e5d9daf10e455293ebe020d9d7bf Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Thu, 8 Jan 2015 19:03:25 -0500
Subject: [PATCH 043/489] Improved _Parser doc

---
 babel/plural.py | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index e4acd41d6..297a42282 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -334,24 +334,13 @@ class _Parser(object):
         sampleRange   = decimalValue '~' decimalValue
         decimalValue  = value ('.' value)?
 
-        condition     = and_condition ('or' and_condition)*
-        and_condition = relation ('and' relation)*
-        relation      = is_relation | in_relation | within_relation | 'n' <EOL>
-        is_relation   = expr 'is' ('not')? value
-        in_relation   = expr ('not')? 'in' range_list
-        within_relation = expr ('not')? 'within' range_list
-        expr          = 'n' ('mod' value)?
-        range_list    = (range | value) (',' range_list)*
-        value         = digit+
-        digit         = 0|1|2|3|4|5|6|7|8|9
-        range         = value'..'value
-
     - Whitespace can occur between or around any of the above tokens.
     - Rules should be mutually exclusive; for a given numeric value, only one
       rule should apply (i.e. the condition should only be true for one of
       the plural rule elements).
     - The in and within relations can take comma-separated lists, such as:
       'n in 3,5,7..15'.
+    - Samples are ignored.
 
     The translator parses the expression on instanciation into an attribute
     called `ast`.
@@ -411,9 +400,7 @@ def newfangled_relation(self, left):
         else:
             raise RuleError('Expected "=" or "!=" or legacy relation')
         rv = 'relation', ('in', left, self.range_list())
-        if negated:
-            rv = 'not', (rv,)
-        return rv
+        return negate(rv) if negated else rv
 
     def range_or_value(self):
         left = self.value()

From e463ce92ff950917ad632c36c07b403d2410df98 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Thu, 8 Jan 2015 19:22:20 -0500
Subject: [PATCH 044/489] More plural._Parser tests

---
 tests/test_plural.py | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/test_plural.py b/tests/test_plural.py
index d20d186a4..489c0efcb 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -161,18 +161,40 @@ def make_range_list(*values):
 class PluralRuleParserTestCase(unittest.TestCase):
     def setUp(self):
         self.n = plural.ident_node('n')
-        self.n_eq_1 = ('relation', ('in', self.n, make_range_list(1)))
+
+    def n_eq(self, v):
+        return 'relation', ('in', self.n, make_range_list(v))
 
     def test_error_when_unexpected_end(self):
         with pytest.raises(plural.RuleError):
             plural._Parser('n =')
 
     def test_eq_relation(self):
-        assert plural._Parser('n = 1').ast == self.n_eq_1
+        assert plural._Parser('n = 1').ast == self.n_eq(1)
 
     def test_in_range_relation(self):
         assert plural._Parser('n = 2..4').ast == \
             ('relation', ('in', self.n, make_range_list((2, 4))))
 
     def test_negate(self):
-        assert plural._Parser('n != 1').ast == plural.negate(self.n_eq_1)
\ No newline at end of file
+        assert plural._Parser('n != 1').ast == plural.negate(self.n_eq(1))
+
+    def test_or(self):
+        assert plural._Parser('n = 1 or n = 2').ast ==\
+            ('or', (self.n_eq(1), self.n_eq(2)))
+
+    def test_and(self):
+        assert plural._Parser('n = 1 and n = 2').ast ==\
+            ('and', (self.n_eq(1), self.n_eq(2)))
+
+    def test_or_and(self):
+        assert plural._Parser('n = 0 or n != 1 and n % 100 = 1..19' ).ast ==\
+            ('or', (self.n_eq(0),
+                    ('and', (plural.negate(self.n_eq(1)),
+                             ('relation', ('in',
+                                           ('mod', (self.n,
+                                                    plural.value_node(100))),
+                                           (make_range_list((1, 19))))))
+                    )
+            )
+            )
\ No newline at end of file

From fb808af2f681232c14b15f39149ff2e190dfcaca Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Thu, 8 Jan 2015 19:40:28 -0500
Subject: [PATCH 045/489] More stuff merged from mitsuhiko's cldr-24 branch

---
 babel/plural.py      | 21 ++++++++++++++++++++-
 tests/test_plural.py |  5 +++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/babel/plural.py b/babel/plural.py
index 297a42282..ce6659b47 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -52,6 +52,8 @@ def __init__(self, rules):
         found = set()
         self.abstract = []
         for key, expr in sorted(list(rules)):
+            if key == 'other':
+                continue
             if key not in _plural_tags:
                 raise ValueError('unknown tag %r' % key)
             elif key in found:
@@ -450,6 +452,11 @@ def compile(self, arg):
         return getattr(self, 'compile_' + op)(*args)
 
     compile_n = lambda x: 'n'
+    compile_i = lambda x: 'i'
+    compile_v = lambda x: 'v'
+    compile_w = lambda x: 'w'
+    compile_f = lambda x: 'f'
+    compile_t = lambda x: 't'
     compile_value = lambda x, v: str(v)
     compile_and = _binary_compiler('(%s && %s)')
     compile_or = _binary_compiler('(%s || %s)')
@@ -504,18 +511,30 @@ def compile_relation(self, method, expr, range_list):
 class _JavaScriptCompiler(_GettextCompiler):
     """Compiles the expression to plain of JavaScript."""
 
+    # XXX: presently javascript does not support any of the
+    # fraction support and basically only deals with integers.
+    compile_i = lambda x: 'parseInt(n, 10)'
+    compile_v = lambda x: '0'
+    compile_w = lambda x: '0'
+    compile_f = lambda x: '0'
+    compile_t = lambda x: '0'
+
     def compile_relation(self, method, expr, range_list):
         code = _GettextCompiler.compile_relation(
             self, method, expr, range_list)
         if method == 'in':
             expr = self.compile(expr)
-            code = '(parseInt(%s) == %s && %s)' % (expr, expr, code)
+            code = '(parseInt(%s, 10) == %s && %s)' % (expr, expr, code)
         return code
 
 
 class _UnicodeCompiler(_Compiler):
     """Returns a unicode pluralization rule again."""
 
+    # XXX: this currently spits out the old syntax instead of the new
+    # one.  We can change that, but it will break a whole bunch of stuff
+    # for users I suppose.
+
     compile_is = _binary_compiler('%s is %s')
     compile_isnot = _binary_compiler('%s is not %s')
     compile_and = _binary_compiler('%s and %s')
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 489c0efcb..166e2276d 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -27,6 +27,11 @@ def test_plural_rule():
     assert rule.rules == {'one': 'n is 1'}
 
 
+def test_plural_other_is_ignored():
+    rule = plural.PluralRule({'one': 'n is 1', 'other': '@integer 2'})
+    assert rule(1) == 'one'
+
+
 def test_to_javascript():
     assert (plural.to_javascript({'one': 'n is 1'})
             == "(function(n) { return (n == 1) ? 'one' : 'other'; })")

From 022b8fd62a5b2e85b3aa254ceee0b5bea15ac1eb Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Fri, 9 Jan 2015 08:51:54 -0500
Subject: [PATCH 046/489] PEP8

---
 tests/test_plural.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/test_plural.py b/tests/test_plural.py
index 166e2276d..122d64d77 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -81,8 +81,8 @@ def test_plural_within_rules():
     assert repr(p) == "<PluralRule 'one: n is 1, few: n within 2,4,7..9'>"
     assert plural.to_javascript(p) == (
         "(function(n) { "
-            "return ((n == 2) || (n == 4) || (n >= 7 && n <= 9))"
-            " ? 'few' : (n == 1) ? 'one' : 'other'; })")
+        "return ((n == 2) || (n == 4) || (n >= 7 && n <= 9))"
+        " ? 'few' : (n == 1) ? 'one' : 'other'; })")
     assert plural.to_gettext(p) == (
         'nplurals=3; plural=(((n == 2) || (n == 4) || (n >= 7 && n <= 9))'
         ' ? 1 : (n == 1) ? 0 : 2)')
@@ -193,13 +193,11 @@ def test_and(self):
             ('and', (self.n_eq(1), self.n_eq(2)))
 
     def test_or_and(self):
-        assert plural._Parser('n = 0 or n != 1 and n % 100 = 1..19' ).ast ==\
+        assert plural._Parser('n = 0 or n != 1 and n % 100 = 1..19').ast == \
             ('or', (self.n_eq(0),
                     ('and', (plural.negate(self.n_eq(1)),
                              ('relation', ('in',
                                            ('mod', (self.n,
                                                     plural.value_node(100))),
-                                           (make_range_list((1, 19))))))
-                    )
-            )
-            )
\ No newline at end of file
+                                           (make_range_list((1, 19)))))))
+                    ))

From 1beec5d6d5c4c6a14976033661e35c337df22cee Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Fri, 9 Jan 2015 10:33:24 -0500
Subject: [PATCH 047/489] plural.extract_operands function and tests

---
 babel/plural.py      | 39 ++++++++++++++++++++++++++++++++++-----
 tests/test_plural.py | 23 +++++++++++++++++++++--
 2 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index ce6659b47..b11b17e51 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -8,7 +8,7 @@
     :copyright: (c) 2013 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
-
+import decimal
 import re
 
 
@@ -16,6 +16,32 @@
 _fallback_tag = 'other'
 
 
+def extract_operands(source):
+    """Extract operands from a decimal, a float or an int, according to
+    `CLDR rules`_.
+
+    .. _`CLDR rules`: http://www.unicode.org/reports/tr35/tr35-33/tr35-numbers.html#Operands
+    """
+    n = abs(source)
+    i = int(n)
+    if isinstance(n, float):
+        n = i if i == n else decimal.Decimal(n)
+
+    if isinstance(n, decimal.Decimal):
+        dec_tuple = n.as_tuple()
+        exp = dec_tuple.exponent
+        fraction_digits = dec_tuple.digits[exp:] if exp < 0 else ()
+        trailing = ''.join(str(d) for d in fraction_digits)
+        no_trailing = trailing.rstrip('0')
+        v = len(trailing)
+        w = len(no_trailing)
+        f = int(trailing or 0)
+        t = int(no_trailing or 0)
+    else:
+        v = w = f = t = 0
+    return n, i, v, w, f, t
+
+
 class PluralRule(object):
     """Represents a set of language pluralization rules.  The constructor
     accepts a list of (tag, expr) tuples or a dict of `CLDR rules`_. The
@@ -106,7 +132,7 @@ def __setstate__(self, abstract):
     def __call__(self, n):
         if not hasattr(self, '_func'):
             self._func = to_python(self)
-        return self._func(n)
+        return self._func(*extract_operands(n))
 
 
 def to_javascript(rule):
@@ -156,12 +182,15 @@ def to_python(rule):
         'WITHIN':   within_range_list,
         'MOD':      cldr_modulo
     }
-    to_python = _PythonCompiler().compile
-    result = ['def evaluate(n):']
+    to_python_func = _PythonCompiler().compile
+    result = [
+        'def evaluate(n, v=0, w=0, f=0, t=0):',
+        ' i = int(n)',
+    ]
     for tag, ast in PluralRule.parse(rule).abstract:
         # the str() call is to coerce the tag to the native string.  It's
         # a limited ascii restricted set of tags anyways so that is fine.
-        result.append(' if (%s): return %r' % (to_python(ast), str(tag)))
+        result.append(' if (%s): return %r' % (to_python_func(ast), str(tag)))
     result.append(' return %r' % _fallback_tag)
     code = compile('\n'.join(result), '<rule>', 'exec')
     eval(code, namespace)
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 122d64d77..ece1358c5 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -10,11 +10,12 @@
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
+import decimal
 
 import doctest
 import unittest
 import pytest
-
+from decimal import Decimal as Dec
 from babel import plural
 
 
@@ -123,7 +124,7 @@ def test_tokenize_well_formed(rule_text, tokens):
 
 
 MALFORMED_TOKEN_TESTS = (
-    ('a = 1'), ('n ! 2'),
+    'a = 1', 'n ! 2',
 )
 
 
@@ -201,3 +202,21 @@ def test_or_and(self):
                                                     plural.value_node(100))),
                                            (make_range_list((1, 19)))))))
                     ))
+
+
+EXTRACT_OPERANDS_TESTS = (
+    (1, 1, 1, 0, 0, 0, 0),
+    ('1.0', '1.0', 1, 1, 0, 0, 0),
+    ('1.00', '1.00', 1, 2, 0, 0, 0),
+    ('1.3', '1.3', 1, 1, 1, 3, 3),
+    ('1.30', '1.30', 1, 2, 1, 30, 3),
+    ('1.03', '1.03', 1, 2, 2, 3, 3),
+    ('1.230', '1.230', 1, 3, 2, 230, 23),
+    (-1, 1, 1, 0, 0, 0, 0),
+)
+
+
+@pytest.mark.parametrize('source,n,i,v,w,f,t', EXTRACT_OPERANDS_TESTS)
+def test_extract_operands(source, n, i, v, w, f, t):
+    assert (plural.extract_operands(decimal.Decimal(source)) ==
+            decimal.Decimal(n), i, v, w, f, t)

From 071e38a1c9d882e3290430255a5a707d3d9aa8e0 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Fri, 9 Jan 2015 11:17:07 -0500
Subject: [PATCH 048/489] Fix to_python when i is not provided to evaluate
 function

---
 babel/plural.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index b11b17e51..7ce62e1fb 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -184,8 +184,8 @@ def to_python(rule):
     }
     to_python_func = _PythonCompiler().compile
     result = [
-        'def evaluate(n, v=0, w=0, f=0, t=0):',
-        ' i = int(n)',
+        'def evaluate(n, i=None, v=0, w=0, f=0, t=0):',
+        ' i = int(n) if i is None else i',
     ]
     for tag, ast in PluralRule.parse(rule).abstract:
         # the str() call is to coerce the tag to the native string.  It's

From 9327e0824a1bbed538e73d42b971988f8214b490 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Fri, 9 Jan 2015 14:56:31 -0500
Subject: [PATCH 049/489] Fixed import and format_timedelta to handle new time
 unit patterns in cldr-24. Fixed tests to account for various minor changes in
 cldr-24.

---
 babel/dates.py         | 29 +++++++++++++++++++----------
 scripts/import_cldr.py | 27 +++++++++++++++++++--------
 tests/test_core.py     |  2 +-
 tests/test_dates.py    | 17 ++++++++---------
 4 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 73d54fa57..bb215d1e8 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -19,6 +19,7 @@
 from __future__ import division
 
 import re
+import warnings
 import pytz as _pytz
 
 from datetime import date, datetime, time, timedelta
@@ -705,7 +706,7 @@ def format_time(time=None, format='medium', tzinfo=None, locale=LC_TIME):
 
 
 def format_timedelta(delta, granularity='second', threshold=.85,
-                     add_direction=False, format='medium',
+                     add_direction=False, format='long',
                      locale=LC_TIME):
     """Return a time delta according to the rules of the given locale.
 
@@ -750,25 +751,34 @@ def format_timedelta(delta, granularity='second', threshold=.85,
                           positive timedelta will include the information about
                           it being in the future, a negative will be information
                           about the value being in the past.
-    :param format: the format (currently only "medium" and "short" are supported)
+    :param format: the format (currently only "long" and "short" are supported,
+                   "medium" is deprecated, currently converted to "long" to
+                   maintain compatibility)
     :param locale: a `Locale` object or a locale identifier
     """
-    if format not in ('short', 'medium'):
+    if format not in ('short', 'medium', 'long'):
         raise TypeError('Format can only be one of "short" or "medium"')
+    if format == 'medium':
+        warnings.warn('"medium" value for format param of format_timedelta'
+                      ' is deprecated. Use "long" instead',
+                      category=DeprecationWarning)
+        format = 'long'
     if isinstance(delta, timedelta):
         seconds = int((delta.days * 86400) + delta.seconds)
     else:
         seconds = delta
     locale = Locale.parse(locale)
 
-    def _iter_choices(unit):
+    def _iter_patterns(a_unit):
         if add_direction:
+            unit_rel_patterns = locale._data['date_fields'][a_unit]
             if seconds >= 0:
-                yield unit + '-future'
+                yield unit_rel_patterns['future']
             else:
-                yield unit + '-past'
-        yield unit + ':' + format
-        yield unit
+                yield unit_rel_patterns['past']
+        a_unit = 'duration-' + a_unit
+        yield locale._data['unit_patterns'].get(a_unit + ':' + format)
+        yield locale._data['unit_patterns'].get(a_unit)
 
     for unit, secs_per_unit in TIMEDELTA_UNITS:
         value = abs(seconds) / secs_per_unit
@@ -778,8 +788,7 @@ def _iter_choices(unit):
             value = int(round(value))
             plural_form = locale.plural_form(value)
             pattern = None
-            for choice in _iter_choices(unit):
-                patterns = locale._data['unit_patterns'].get(choice)
+            for patterns in _iter_patterns(unit):
                 if patterns is not None:
                     pattern = patterns[plural_form]
                     break
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 082393ce7..637804127 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -609,14 +609,25 @@ def main():
         # <units>
 
         unit_patterns = data.setdefault('unit_patterns', {})
-        for elem in tree.findall('.//units/unit'):
-            unit_type = elem.attrib['type']
-            for pattern in elem.findall('unitPattern'):
-                box = unit_type
-                if 'alt' in pattern.attrib:
-                    box += ':' + pattern.attrib['alt']
-                unit_patterns.setdefault(box, {})[pattern.attrib['count']] = \
-                    text_type(pattern.text)
+        for elem in tree.findall('.//units/unitLength'):
+            unit_length_type = elem.attrib['type']
+            for unit in elem.findall('unit'):
+                unit_type = unit.attrib['type']
+                for pattern in unit.findall('unitPattern'):
+                    box = unit_type
+                    box += ':' + unit_length_type
+                    unit_patterns.setdefault(box, {})[pattern.attrib['count']] = \
+                        text_type(pattern.text)
+
+        date_fields = data.setdefault('date_fields', {})
+        for elem in tree.findall('.//dates/fields/field'):
+            field_type = elem.attrib['type']
+            date_fields.setdefault(field_type, {})
+            for rel_time in elem.findall('relativeTime'):
+                rel_time_type = rel_time.attrib['type']
+                for pattern in rel_time.findall('relativeTimePattern'):
+                    date_fields[field_type].setdefault(rel_time_type, {})\
+                        [pattern.attrib['count']] = text_type(pattern.text)
 
         outfile = open(data_filename, 'wb')
         try:
diff --git a/tests/test_core.py b/tests/test_core.py
index ac2611dce..7e16765fc 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -220,7 +220,7 @@ def test_time_formats_property(self):
 
     def test_datetime_formats_property(self):
         assert Locale('en').datetime_formats['full'] == u"{1} 'at' {0}"
-        assert Locale('th').datetime_formats['medium'] == u'{1}, {0}'
+        assert Locale('th').datetime_formats['medium'] == u'{1} {0}'
 
     def test_plural_form_property(self):
         assert Locale('en').plural_form(1) == 'one'
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 7b897a13a..b18bf5076 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -191,25 +191,25 @@ def test_timezone_name(self):
         tz = timezone('Europe/Paris')
         dt = datetime(2007, 4, 1, 15, 30, tzinfo=tz)
         fmt = dates.DateTimeFormat(dt, locale='fr_FR')
-        self.assertEqual('Heure : France', fmt['v'])
+        self.assertEqual('heure : France', fmt['v'])
 
     def test_timezone_location_format(self):
         tz = timezone('Europe/Paris')
         dt = datetime(2007, 4, 1, 15, 30, tzinfo=tz)
         fmt = dates.DateTimeFormat(dt, locale='fr_FR')
-        self.assertEqual('Heure : France', fmt['VVVV'])
+        self.assertEqual('heure : France', fmt['VVVV'])
 
     def test_timezone_walltime_short(self):
         tz = timezone('Europe/Paris')
         t = time(15, 30, tzinfo=tz)
         fmt = dates.DateTimeFormat(t, locale='fr_FR')
-        self.assertEqual('Heure : France', fmt['v'])
+        self.assertEqual('heure : France', fmt['v'])
 
     def test_timezone_walltime_long(self):
         tz = timezone('Europe/Paris')
         t = time(15, 30, tzinfo=tz)
         fmt = dates.DateTimeFormat(t, locale='fr_FR')
-        self.assertEqual(u'heure de l\u2019Europe centrale', fmt['vvvv'])
+        self.assertEqual(u'heure d\u2019Europe centrale', fmt['vvvv'])
 
     def test_hour_formatting(self):
         l = 'en_US'
@@ -265,7 +265,6 @@ def test_with_float(self):
         formatted_time = dates.format_time(epoch, format='long', locale='en_US')
         self.assertEqual(u'3:30:29 PM +0000', formatted_time)
 
-
     def test_with_date_fields_in_pattern(self):
         self.assertRaises(AttributeError, dates.format_time, date(2007, 4, 1),
                           "yyyy-MM-dd HH:mm", locale='en_US')
@@ -305,7 +304,7 @@ def test_direction_adding(self):
         string = dates.format_timedelta(timedelta(hours=1),
                                         locale='en',
                                         add_direction=True)
-        self.assertEqual('In 1 hour', string)
+        self.assertEqual('in 1 hour', string)
         string = dates.format_timedelta(timedelta(hours=-1),
                                         locale='en',
                                         add_direction=True)
@@ -336,14 +335,14 @@ def test_get_period_names():
 
 def test_get_day_names():
     assert dates.get_day_names('wide', locale='en_US')[1] == u'Tuesday'
-    assert dates.get_day_names('abbreviated', locale='es')[1] == u'mar'
+    assert dates.get_day_names('abbreviated', locale='es')[1] == u'mar.'
     de = dates.get_day_names('narrow', context='stand-alone', locale='de_DE')
     assert de[1] == u'D'
 
 
 def test_get_month_names():
     assert dates.get_month_names('wide', locale='en_US')[1] == u'January'
-    assert dates.get_month_names('abbreviated', locale='es')[1] == u'ene'
+    assert dates.get_month_names('abbreviated', locale='es')[1] == u'ene.'
     de = dates.get_month_names('narrow', context='stand-alone', locale='de_DE')
     assert de[1] == u'J'
 
@@ -477,7 +476,7 @@ def test_format_time():
     t = time(15, 30)
     paris = dates.format_time(t, format='full',
                               tzinfo=timezone('Europe/Paris'), locale='fr_FR')
-    assert paris == u'15:30:00 heure normale de l\u2019Europe centrale'
+    assert paris == u'15:30:00 heure normale d\u2019Europe centrale'
     us_east = dates.format_time(t, format='full',
                                 tzinfo=timezone('US/Eastern'), locale='en_US')
     assert us_east == u'3:30:00 PM Eastern Standard Time'

From 98fa4b6ca174e1ef3b0fbd9557b2006d38a52f60 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Fri, 9 Jan 2015 15:35:21 -0500
Subject: [PATCH 050/489] Make sure extract_operands is always called when
 using plural.to_python, add tests to check operands eval works

---
 babel/plural.py      |  9 +++++----
 tests/test_plural.py | 41 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index 7ce62e1fb..918038e61 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -132,7 +132,7 @@ def __setstate__(self, abstract):
     def __call__(self, n):
         if not hasattr(self, '_func'):
             self._func = to_python(self)
-        return self._func(*extract_operands(n))
+        return self._func(n)
 
 
 def to_javascript(rule):
@@ -180,12 +180,13 @@ def to_python(rule):
     namespace = {
         'IN':       in_range_list,
         'WITHIN':   within_range_list,
-        'MOD':      cldr_modulo
+        'MOD':      cldr_modulo,
+        'extract_operands': extract_operands,
     }
     to_python_func = _PythonCompiler().compile
     result = [
-        'def evaluate(n, i=None, v=0, w=0, f=0, t=0):',
-        ' i = int(n) if i is None else i',
+        'def evaluate(n):',
+        ' n, i, v, w, f, t = extract_operands(n)',
     ]
     for tag, ast in PluralRule.parse(rule).abstract:
         # the str() call is to coerce the tag to the native string.  It's
diff --git a/tests/test_plural.py b/tests/test_plural.py
index ece1358c5..278b5dba8 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -11,11 +11,8 @@
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
 import decimal
-
-import doctest
 import unittest
 import pytest
-from decimal import Decimal as Dec
 from babel import plural
 
 
@@ -28,6 +25,40 @@ def test_plural_rule():
     assert rule.rules == {'one': 'n is 1'}
 
 
+def test_plural_rule_operands_i():
+    rule = plural.PluralRule({'one': 'i is 1'})
+    assert rule(1.2) == 'one'
+    assert rule(2) == 'other'
+
+
+def test_plural_rule_operands_v():
+    rule = plural.PluralRule({'one': 'v is 2'})
+    assert rule(decimal.Decimal('1.20')) == 'one'
+    assert rule(decimal.Decimal('1.2')) == 'other'
+    assert rule(2) == 'other'
+
+
+def test_plural_rule_operands_w():
+    rule = plural.PluralRule({'one': 'w is 2'})
+    assert rule(decimal.Decimal('1.23')) == 'one'
+    assert rule(decimal.Decimal('1.20')) == 'other'
+    assert rule(1.2) == 'other'
+
+
+def test_plural_rule_operands_f():
+    rule = plural.PluralRule({'one': 'f is 20'})
+    assert rule(decimal.Decimal('1.23')) == 'other'
+    assert rule(decimal.Decimal('1.20')) == 'one'
+    assert rule(1.2) == 'other'
+
+
+def test_plural_rule_operands_t():
+    rule = plural.PluralRule({'one': 't = 5'})
+    assert rule(decimal.Decimal('1.53')) == 'other'
+    assert rule(decimal.Decimal('1.50')) == 'one'
+    assert rule(1.5) == 'one'
+
+
 def test_plural_other_is_ignored():
     rule = plural.PluralRule({'one': 'n is 1', 'other': '@integer 2'})
     assert rule(1) == 'one'
@@ -213,10 +244,12 @@ def test_or_and(self):
     ('1.03', '1.03', 1, 2, 2, 3, 3),
     ('1.230', '1.230', 1, 3, 2, 230, 23),
     (-1, 1, 1, 0, 0, 0, 0),
+    (1.3, '1.3', 1, 1, 1, 3, 3),
 )
 
 
 @pytest.mark.parametrize('source,n,i,v,w,f,t', EXTRACT_OPERANDS_TESTS)
 def test_extract_operands(source, n, i, v, w, f, t):
-    assert (plural.extract_operands(decimal.Decimal(source)) ==
+    source = decimal.Decimal(source) if isinstance(source, str) else source
+    assert (plural.extract_operands(source) ==
             decimal.Decimal(n), i, v, w, f, t)

From a6d89445ae01cabbbe09541428018523cf49d579 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Sun, 11 Jan 2015 11:54:28 -0500
Subject: [PATCH 051/489] File name and checksum for CLDR-25

---
 scripts/download_import_cldr.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index fe0105339..fda5ff48d 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -13,9 +13,9 @@
     from urllib import urlretrieve
 
 
-URL = 'http://unicode.org/Public/cldr/24/core.zip'
-FILENAME = 'core-24.zip'
-FILESUM = 'cd2e8f31baf65c96bfc7e5377b3b793f'
+URL = 'http://unicode.org/Public/cldr/25/core.zip'
+FILENAME = 'core-25.zip'
+FILESUM = '44bdc6ca189d55eb36063dfbec208927'
 BLKSIZE = 131072
 
 

From 87bab018a1003ca32524c7d98bffea112b9d4fca Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Sun, 11 Jan 2015 11:55:24 -0500
Subject: [PATCH 052/489] Don't try and import deprecated BCP-47 timezones

---
 scripts/import_cldr.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 637804127..7dcd171ca 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -163,13 +163,14 @@ def main():
         for key_elem in bcp47_timezone.findall('.//keyword/key'):
             if key_elem.attrib['name'] == 'tz':
                 for elem in key_elem.findall('type'):
-                    aliases = text_type(elem.attrib['alias']).split()
-                    tzid = aliases.pop(0)
-                    territory = _zone_territory_map.get(tzid, '001')
-                    territory_zones.setdefault(territory, []).append(tzid)
-                    zone_territories[tzid] = territory
-                    for alias in aliases:
-                        zone_aliases[alias] = tzid
+                    if 'deprecated' not in elem.attrib:
+                        aliases = text_type(elem.attrib['alias']).split()
+                        tzid = aliases.pop(0)
+                        territory = _zone_territory_map.get(tzid, '001')
+                        territory_zones.setdefault(territory, []).append(tzid)
+                        zone_territories[tzid] = territory
+                        for alias in aliases:
+                            zone_aliases[alias] = tzid
                 break
 
         # Import Metazone mapping

From 44942cf1627cd68cdb987be7d67cb40259f65638 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Sun, 11 Jan 2015 15:21:16 -0500
Subject: [PATCH 053/489] CLDR-26 support: Minor adjustments to tests. URL,
 filename and filehash.

---
 scripts/download_import_cldr.py |  6 +++---
 tests/test_dates.py             | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index fda5ff48d..f8ba1fa92 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -13,9 +13,9 @@
     from urllib import urlretrieve
 
 
-URL = 'http://unicode.org/Public/cldr/25/core.zip'
-FILENAME = 'core-25.zip'
-FILESUM = '44bdc6ca189d55eb36063dfbec208927'
+URL = 'http://unicode.org/Public/cldr/26/core.zip'
+FILENAME = 'core-26.zip'
+FILESUM = '46220170238b092685fd24221f895e3d'
 BLKSIZE = 131072
 
 
diff --git a/tests/test_dates.py b/tests/test_dates.py
index b18bf5076..436039378 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -35,10 +35,10 @@ def test_quarter_format(self):
 
     def test_month_context(self):
         d = date(2006, 2, 8)
-        fmt = dates.DateTimeFormat(d, locale='cs_CZ')
-        self.assertEqual(u'2', fmt['MMMMM']) # narrow format
-        fmt = dates.DateTimeFormat(d, locale='cs_CZ')
-        self.assertEqual(u'ú', fmt['LLLLL']) # narrow standalone
+        fmt = dates.DateTimeFormat(d, locale='mt_MT')
+        self.assertEqual(u'F', fmt['MMMMM']) # narrow format
+        fmt = dates.DateTimeFormat(d, locale='mt_MT')
+        self.assertEqual(u'Fr', fmt['LLLLL']) # narrow standalone
 
     def test_abbreviated_month_alias(self):
         d = date(2006, 3, 8)
@@ -389,7 +389,7 @@ def test_get_timezone_gmt():
 def test_get_timezone_location():
     tz = timezone('America/St_Johns')
     assert (dates.get_timezone_location(tz, locale='de_DE') ==
-            u"Kanada (St. John's) Zeit")
+            u"Kanada (St. John\u2019s) Zeit")
     tz = timezone('America/Mexico_City')
     assert (dates.get_timezone_location(tz, locale='de_DE') ==
             u'Mexiko (Mexiko-Stadt) Zeit')
@@ -450,7 +450,7 @@ def test_format_datetime():
     full = dates.format_datetime(dt, 'full', tzinfo=timezone('Europe/Paris'),
                                  locale='fr_FR')
     assert full == (u'dimanche 1 avril 2007 17:30:00 heure '
-                    u'avanc\xe9e d\u2019Europe centrale')
+                    u'd\u2019\xe9t\xe9 d\u2019Europe centrale')
     custom = dates.format_datetime(dt, "yyyy.MM.dd G 'at' HH:mm:ss zzz",
                                    tzinfo=timezone('US/Eastern'), locale='en')
     assert custom == u'2007.04.01 AD at 11:30:00 EDT'
@@ -468,7 +468,7 @@ def test_format_time():
     tzinfo = timezone('Europe/Paris')
     t = tzinfo.localize(t)
     fr = dates.format_time(t, format='full', tzinfo=tzinfo, locale='fr_FR')
-    assert fr == u'15:30:00 heure avanc\xe9e d\u2019Europe centrale'
+    assert fr == u'15:30:00 heure d\u2019\xe9t\xe9 d\u2019Europe centrale'
     custom = dates.format_time(t, "hh 'o''clock' a, zzzz",
                                tzinfo=timezone('US/Eastern'), locale='en')
     assert custom == u"09 o'clock AM, Eastern Daylight Time"

From 04f7d471effb948aaec22208a912ea6e36ea2e74 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Sun, 11 Jan 2015 15:58:53 -0500
Subject: [PATCH 054/489] Fixed doctests

---
 babel/core.py  | 2 +-
 babel/dates.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index df3857295..712585856 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -722,7 +722,7 @@ def datetime_formats(self):
         >>> Locale('en').datetime_formats['full']
         u"{1} 'at' {0}"
         >>> Locale('th').datetime_formats['medium']
-        u'{1}, {0}'
+        u'{1} {0}'
         """
         return self._data['datetime_formats']
 
diff --git a/babel/dates.py b/babel/dates.py
index bb215d1e8..4d326d20e 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -167,7 +167,7 @@ def get_day_names(width='wide', context='format', locale=LC_TIME):
     >>> get_day_names('wide', locale='en_US')[1]
     u'Tuesday'
     >>> get_day_names('abbreviated', locale='es')[1]
-    u'mar'
+    u'mar.'
     >>> get_day_names('narrow', context='stand-alone', locale='de_DE')[1]
     u'D'
 
@@ -184,7 +184,7 @@ def get_month_names(width='wide', context='format', locale=LC_TIME):
     >>> get_month_names('wide', locale='en_US')[1]
     u'January'
     >>> get_month_names('abbreviated', locale='es')[1]
-    u'ene'
+    u'ene.'
     >>> get_month_names('narrow', context='stand-alone', locale='de_DE')[1]
     u'J'
 
@@ -661,7 +661,7 @@ def format_time(time=None, format='medium', tzinfo=None, locale=LC_TIME):
     >>> t = time(15, 30)
     >>> format_time(t, format='full', tzinfo=get_timezone('Europe/Paris'),
     ...             locale='fr_FR')
-    u'15:30:00 heure normale de l\u2019Europe centrale'
+    u'15:30:00 heure normale d\u2019Europe centrale'
     >>> format_time(t, format='full', tzinfo=get_timezone('US/Eastern'),
     ...             locale='en_US')
     u'3:30:00 PM Eastern Standard Time'
@@ -735,7 +735,7 @@ def format_timedelta(delta, granularity='second', threshold=.85,
     the user if the date is in the past or in the future:
 
     >>> format_timedelta(timedelta(hours=1), add_direction=True, locale='en')
-    u'In 1 hour'
+    u'in 1 hour'
     >>> format_timedelta(timedelta(hours=-1), add_direction=True, locale='en')
     u'1 hour ago'
 

From bd3dec313a8dc9a94eaba87662c21bfc84b37d59 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Sun, 11 Jan 2015 17:12:47 -0500
Subject: [PATCH 055/489] Fix doctests

---
 babel/dates.py   | 10 +++++-----
 babel/numbers.py |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 4d326d20e..63c6eb16e 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -320,14 +320,14 @@ def get_timezone_gmt(datetime=None, width='long', locale=LC_TIME):
 
 
 def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME):
-    """Return a representation of the given timezone using "location format".
+    u"""Return a representation of the given timezone using "location format".
 
     The result depends on both the local display name of the country and the
     city associated with the time zone:
 
     >>> tz = get_timezone('America/St_Johns')
-    >>> get_timezone_location(tz, locale='de_DE')
-    u"Kanada (St. John's) Zeit"
+    >>> print(get_timezone_location(tz, locale='de_DE'))
+    Kanada (St. John’s) Zeit
     >>> tz = get_timezone('America/Mexico_City')
     >>> get_timezone_location(tz, locale='de_DE')
     u'Mexiko (Mexiko-Stadt) Zeit'
@@ -582,7 +582,7 @@ def format_datetime(datetime=None, format='medium', tzinfo=None,
 
     >>> format_datetime(dt, 'full', tzinfo=get_timezone('Europe/Paris'),
     ...                 locale='fr_FR')
-    u'dimanche 1 avril 2007 17:30:00 heure avanc\xe9e d\u2019Europe centrale'
+    u'dimanche 1 avril 2007 17:30:00 heure d\u2019\xe9t\xe9 d\u2019Europe centrale'
     >>> format_datetime(dt, "yyyy.MM.dd G 'at' HH:mm:ss zzz",
     ...                 tzinfo=get_timezone('US/Eastern'), locale='en')
     u'2007.04.01 AD at 11:30:00 EDT'
@@ -640,7 +640,7 @@ def format_time(time=None, format='medium', tzinfo=None, locale=LC_TIME):
     >>> tzinfo = get_timezone('Europe/Paris')
     >>> t = tzinfo.localize(t)
     >>> format_time(t, format='full', tzinfo=tzinfo, locale='fr_FR')
-    u'15:30:00 heure avanc\xe9e d\u2019Europe centrale'
+    u'15:30:00 heure d\u2019\xe9t\xe9 d\u2019Europe centrale'
     >>> format_time(t, "hh 'o''clock' a, zzzz", tzinfo=get_timezone('US/Eastern'),
     ...             locale='en')
     u"09 o'clock AM, Eastern Daylight Time"
diff --git a/babel/numbers.py b/babel/numbers.py
index 587d64070..01af774dd 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -98,7 +98,8 @@ def get_territory_currencies(territory, start_date=None, end_date=None,
 
     >>> get_territory_currencies('US')
     ['USD']
-    >>> get_territory_currencies('US', tender=False, non_tender=True)
+    >>> get_territory_currencies('US', tender=False, non_tender=True,
+    ...                          start_date=date(2014, 1, 1))
     ['USN', 'USS']
 
     .. versionadded:: 2.0

From 21d6efe915a6b41630878805fcfa06e50c601d13 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Sun, 11 Jan 2015 18:18:12 -0500
Subject: [PATCH 056/489] Fixed 2.6 bug (Decimal cannot convert floats)

---
 babel/plural.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/babel/plural.py b/babel/plural.py
index 918038e61..50bf54181 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -10,6 +10,7 @@
 """
 import decimal
 import re
+import sys
 
 
 _plural_tags = ('zero', 'one', 'two', 'few', 'many', 'other')
@@ -25,7 +26,13 @@ def extract_operands(source):
     n = abs(source)
     i = int(n)
     if isinstance(n, float):
-        n = i if i == n else decimal.Decimal(n)
+        if i == n:
+            n = i
+        else:
+            # 2.6's Decimal cannot convert from float directly
+            if sys.version_info < (2, 7):
+                n = str(n)
+            n = decimal.Decimal(n)
 
     if isinstance(n, decimal.Decimal):
         dec_tuple = n.as_tuple()

From 7eb5a8d1f2a1cc810dc44f171fdc1c29374e1b48 Mon Sep 17 00:00:00 2001
From: benselme <benselme@gmail.com>
Date: Sun, 11 Jan 2015 18:27:20 -0500
Subject: [PATCH 057/489] Fixed doctest failing randomly

---
 babel/messages/pofile.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 4aaf406f9..3d7dc3283 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -98,13 +98,13 @@ def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=No
     >>> for message in catalog:
     ...     if message.id:
     ...         print (message.id, message.string)
-    ...         print ' ', (message.locations, message.flags)
+    ...         print ' ', (message.locations, sorted(list(message.flags)))
     ...         print ' ', (message.user_comments, message.auto_comments)
     (u'foo %(name)s', u'quux %(name)s')
-      ([(u'main.py', 1)], set([u'fuzzy', u'python-format']))
+      ([(u'main.py', 1)], [u'fuzzy', u'python-format'])
       ([], [])
     ((u'bar', u'baz'), (u'bar', u'baaz'))
-      ([(u'main.py', 3)], set([]))
+      ([(u'main.py', 3)], [])
       ([u'A user comment'], [u'An auto comment'])
 
     .. versionadded:: 1.0

From aa4165df073239a9f6ff01c0b5f6cb430a5b9d10 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 27 Jul 2015 13:22:31 +0200
Subject: [PATCH 058/489] Fixed a bunch of broken timezone tests.

---
 babel/dates.py      |  8 ++++----
 tests/test_dates.py | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 73d54fa57..6761bcae1 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -281,17 +281,17 @@ def get_timezone_gmt(datetime=None, width='long', locale=LC_TIME):
     u'GMT+00:00'
 
     >>> tz = get_timezone('America/Los_Angeles')
-    >>> dt = datetime(2007, 4, 1, 15, 30, tzinfo=tz)
+    >>> dt = tz.localize(datetime(2007, 4, 1, 15, 30))
     >>> get_timezone_gmt(dt, locale='en')
-    u'GMT-08:00'
+    u'GMT-07:00'
     >>> get_timezone_gmt(dt, 'short', locale='en')
-    u'-0800'
+    u'-0700'
 
     The long format depends on the locale, for example in France the acronym
     UTC string is used instead of GMT:
 
     >>> get_timezone_gmt(dt, 'long', locale='fr_FR')
-    u'UTC-08:00'
+    u'UTC-07:00'
 
     .. versionadded:: 0.9
 
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 7b897a13a..25719299a 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -177,19 +177,19 @@ def test_milliseconds_in_day_zero(self):
 
     def test_timezone_rfc822(self):
         tz = timezone('Europe/Berlin')
-        t = time(15, 30, tzinfo=tz)
+        t = tz.localize(datetime(2015, 1, 1, 15, 30))
         fmt = dates.DateTimeFormat(t, locale='de_DE')
         self.assertEqual('+0100', fmt['Z'])
 
     def test_timezone_gmt(self):
         tz = timezone('Europe/Berlin')
-        t = time(15, 30, tzinfo=tz)
+        t = tz.localize(datetime(2015, 1, 1, 15, 30))
         fmt = dates.DateTimeFormat(t, locale='de_DE')
         self.assertEqual('GMT+01:00', fmt['ZZZZ'])
 
     def test_timezone_name(self):
         tz = timezone('Europe/Paris')
-        dt = datetime(2007, 4, 1, 15, 30, tzinfo=tz)
+        dt = tz.localize(datetime(2007, 4, 1, 15, 30))
         fmt = dates.DateTimeFormat(dt, locale='fr_FR')
         self.assertEqual('Heure : France', fmt['v'])
 
@@ -380,11 +380,11 @@ def test_get_timezone_gmt():
     assert dates.get_timezone_gmt(dt, locale='en') == u'GMT+00:00'
 
     tz = timezone('America/Los_Angeles')
-    dt = datetime(2007, 4, 1, 15, 30, tzinfo=tz)
-    assert dates.get_timezone_gmt(dt, locale='en') == u'GMT-08:00'
-    assert dates.get_timezone_gmt(dt, 'short', locale='en') == u'-0800'
+    dt = tz.localize(datetime(2007, 4, 1, 15, 30))
+    assert dates.get_timezone_gmt(dt, locale='en') == u'GMT-07:00'
+    assert dates.get_timezone_gmt(dt, 'short', locale='en') == u'-0700'
 
-    assert dates.get_timezone_gmt(dt, 'long', locale='fr_FR') == u'UTC-08:00'
+    assert dates.get_timezone_gmt(dt, 'long', locale='fr_FR') == u'UTC-07:00'
 
 
 def test_get_timezone_location():

From caf1a1f0fe8a395d4ba9404d7f629b7917b697de Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 27 Jul 2015 13:27:44 +0200
Subject: [PATCH 059/489] Updated changelog

---
 CHANGES | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 7f44c5f9a..9dc814d48 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,11 +4,14 @@ Babel Changelog
 Version 2.0
 -----------
 
-(release date to be decided, codename to be selected)
+(Released on July 27th 2015, codename Second Coming)
 
 - Added support for looking up currencies that belong to a territory
   through the :func:`babel.numbers.get_territory_currencies`
   function.
+- Improved Python 3 support.
+- Fixed some broken tests for timezone behavior.
+- Improved various smaller things for dealing with dates.
 
 Version 1.4
 -----------

From 5e9ae0996d6c502a04a338a7fa3c0c1c9024e734 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 27 Jul 2015 13:27:47 +0200
Subject: [PATCH 060/489] Bump version number to 2.0

---
 babel/__init__.py | 2 +-
 setup.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index addf71aec..6854931a5 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
      negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.0-dev'
+__version__ = '2.0'
diff --git a/setup.py b/setup.py
index b89a4ec4e..2c27ce40e 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def run(self):
 
 setup(
     name='Babel',
-    version='2.0-dev',
+    version='2.0',
     description='Internationalization utilities',
     long_description=\
 """A collection of tools for internationalizing Python applications.""",

From 169d622246465ab4b97e9cbdcc895a55531cfe69 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 27 Jul 2015 13:28:25 +0200
Subject: [PATCH 061/489] This is 3.0-dev

---
 babel/__init__.py | 2 +-
 setup.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index 6854931a5..c977c732d 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
      negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.0'
+__version__ = '3.0-dev'
diff --git a/setup.py b/setup.py
index 2c27ce40e..bc2ed02a5 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def run(self):
 
 setup(
     name='Babel',
-    version='2.0',
+    version='3.0-dev',
     description='Internationalization utilities',
     long_description=\
 """A collection of tools for internationalizing Python applications.""",

From b306b8acbe95f9c47a4f3b177e9af596245d2f38 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Mon, 27 Jul 2015 13:39:24 +0200
Subject: [PATCH 062/489] Added changelog entry for 3.0

---
 CHANGES | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES b/CHANGES
index 9dc814d48..60fef7d7c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
 Babel Changelog
 ===============
 
+Version 3.0
+-----------
+
+(release date to be decided; codename to be picked)
+
+- Upgraded data to CLDR 26
+
 Version 2.0
 -----------
 

From 073fd1381d07433d7a6b23191ec358ae97ec48f6 Mon Sep 17 00:00:00 2001
From: Erick Wilder <erickwilder@gmail.com>
Date: Mon, 27 Jul 2015 17:02:28 -0300
Subject: [PATCH 063/489] Force file deletion at cleaning tasks

- Fresh install tests will fail if there's no file inside babel/localedata and/or babel/global.dat
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5bb68a9a9..c0adaa10d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ import-cldr:
 	@python scripts/download_import_cldr.py
 
 clean-cldr:
-	@rm babel/localedata/*.dat
-	@rm babel/global.dat
+	@rm -f babel/localedata/*.dat
+	@rm -f babel/global.dat
 
 clean-pyc:
 	@find . -name '*.pyc' -exec rm {} \;

From 5c86c18c5d2673ef56eeb6c1f2109e46313a234d Mon Sep 17 00:00:00 2001
From: Erick Wilder <erickwilder@gmail.com>
Date: Mon, 27 Jul 2015 18:01:47 -0300
Subject: [PATCH 064/489] Add Python 3.4 to tox stack

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 6d4eb0341..311da6e6f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, pypy, py33
+envlist = py26, py27, pypy, py33, py34
 
 [testenv]
 deps =

From 1e93326e0afd3d1305bdfaf75d94ef5182e9eb93 Mon Sep 17 00:00:00 2001
From: Erick Wilder <erickwilder@gmail.com>
Date: Mon, 27 Jul 2015 18:21:29 -0300
Subject: [PATCH 065/489] Add Python 3.4 to travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 94425a607..4c965dad3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
   - "2.7"
   - "pypy"
   - "3.3"
+  - "3.4"
 
 install:
   - pip install --upgrade pip

From 40872406281cac1fd2f832705fc5d4c2d407852a Mon Sep 17 00:00:00 2001
From: Erick Wilder <erickwilder@gmail.com>
Date: Mon, 27 Jul 2015 18:27:12 -0300
Subject: [PATCH 066/489] Update CHANGES with py3.4 support

---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index 60fef7d7c..4258e5e8f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@ Version 3.0
 (release date to be decided; codename to be picked)
 
 - Upgraded data to CLDR 26
+- Add official support for Python 3.4
 
 Version 2.0
 -----------

From f51005ad508ea6880fe9b9d6966129435d634429 Mon Sep 17 00:00:00 2001
From: Jeremy Weinstein <jeremydw@gmail.com>
Date: Mon, 27 Jul 2015 17:45:35 -0700
Subject: [PATCH 067/489] Update locale.rst

---
 docs/locale.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/locale.rst b/docs/locale.rst
index f30e2fe87..5e9b2487c 100644
--- a/docs/locale.rst
+++ b/docs/locale.rst
@@ -109,7 +109,7 @@ want.  You can also ask for the information in parts:
     u'Alemanha'
 
 
-Calender Display Names
+Calendar Display Names
 ======================
 
 The :class:`~babel.core.Locale` class provides access to many locale

From cb3c845bea332ea6d4173ac155d2bc2ce83f2313 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse@schuirmann.net>
Date: Tue, 28 Jul 2015 18:07:25 +0200
Subject: [PATCH 068/489] travis: Use docker infrastructure

See http://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/ for related documentation.
---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4c965dad3..a876247cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,9 @@ install:
   - pip install pytest
   - pip install --editable .
 
+# Use travis docker infrastructure for greater speed
+sudo: false
+
 script: make test
 
 notifications:

From bff595933069dc859a05a2380894148a82c14605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Fri, 20 Mar 2015 12:15:11 +0100
Subject: [PATCH 069/489] Fix typo on mapping filename

Now the setup.cfg example for extract_messages configuration is equivalent to the command line example.
---
 docs/setup.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index ef203e9d5..fd7ee754d 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -202,7 +202,7 @@ underscore characters instead of dashes, for example:
 
     [extract_messages]
     keywords = _ gettext ngettext
-    mapping_file = babel.cfg
+    mapping_file = mapping.cfg
     width = 80
 
 This would be equivalent to invoking the command from the command-line as

From 7d387f95f4f41ed646bcb2b4fa39dae4a601b6ce Mon Sep 17 00:00:00 2001
From: Philip_Tzou <philip.npc@gmail.com>
Date: Sat, 1 Aug 2015 14:03:14 -0700
Subject: [PATCH 070/489] Fixed issue #109: `ImportWarning` warned when `import
 babel`

`localedata.py` uses the same name with folder `localedata/`, which
Python will try to load `localdata/__init__.py` and warn `ImportWarning`
if the file not found.

If try to filter the `ImportWarning` as an error like this:

```python
import warnings
warnings.filterwarnings('error', category=ImportWarning)
import babel
```

An `ImportWarning` exception will be raised.
---
 babel/localedata/.gitignore                     |  1 +
 babel/{localedata.py => localedata/__init__.py} | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename babel/{localedata.py => localedata/__init__.py} (94%)

diff --git a/babel/localedata/.gitignore b/babel/localedata/.gitignore
index 72e8ffc0d..2cbf0fc75 100644
--- a/babel/localedata/.gitignore
+++ b/babel/localedata/.gitignore
@@ -1 +1,2 @@
 *
+!__init__.py
diff --git a/babel/localedata.py b/babel/localedata/__init__.py
similarity index 94%
rename from babel/localedata.py
rename to babel/localedata/__init__.py
index 88883ac80..e6df0c4d1 100644
--- a/babel/localedata.py
+++ b/babel/localedata/__init__.py
@@ -5,8 +5,8 @@
 
     Low-level locale data access.
 
-    :note: The `Locale` class, which uses this module under the hood, provides a
-           more convenient interface for accessing the locale data.
+    :note: The `Locale` class, which uses this module under the hood, provides
+           a more convenient interface for accessing the locale data.
 
     :copyright: (c) 2013 by the Babel Team.
     :license: BSD, see LICENSE for more details.
@@ -21,7 +21,7 @@
 
 _cache = {}
 _cache_lock = threading.RLock()
-_dirname = os.path.join(os.path.dirname(__file__), 'localedata')
+_dirname = os.path.dirname(__file__)
 
 
 def exists(name):
@@ -187,13 +187,13 @@ def __iter__(self):
 
     def __getitem__(self, key):
         orig = val = self._data[key]
-        if isinstance(val, Alias): # resolve an alias
+        if isinstance(val, Alias):  # resolve an alias
             val = val.resolve(self.base)
-        if isinstance(val, tuple): # Merge a partial dict with an alias
+        if isinstance(val, tuple):  # Merge a partial dict with an alias
             alias, others = val
             val = alias.resolve(self.base).copy()
             merge(val, others)
-        if type(val) is dict: # Return a nested alias-resolving dict
+        if type(val) is dict:  # Return a nested alias-resolving dict
             val = LocaleDataDict(val, base=self.base)
         if val is not orig:
             self._data[key] = val

From bb75d7147a5f09e0f14b78766b8e2260bff73fe0 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Tue, 4 Aug 2015 10:42:44 +0200
Subject: [PATCH 071/489] CI: Add windows builds

---
 .ci/appveyor.yml     | 52 ++++++++++++++++++++++++++++++++++++++++++++
 .ci/run_with_env.cmd | 47 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 .ci/appveyor.yml
 create mode 100644 .ci/run_with_env.cmd

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
new file mode 100644
index 000000000..67ca84b14
--- /dev/null
+++ b/.ci/appveyor.yml
@@ -0,0 +1,52 @@
+# From https://github.com/ogrisel/python-appveyor-demo/blob/master/appveyor.yml
+
+environment:
+  global:
+    # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
+    # /E:ON and /V:ON options are not enabled in the batch script intepreter
+    # See: http://stackoverflow.com/a/13751649/163740
+    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\.ci\\run_with_env.cmd"
+
+  matrix:
+    - PYTHON: "C:\\Python27"
+      PYTHON_VERSION: "2.7.x"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python27-x64"
+      PYTHON_VERSION: "2.7.x"
+      PYTHON_ARCH: "64"
+
+    - PYTHON: "C:\\Python33"
+      PYTHON_VERSION: "3.3.x"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python33-x64"
+      PYTHON_VERSION: "3.3.x"
+      PYTHON_ARCH: "64"
+
+    - PYTHON: "C:\\Python34"
+      PYTHON_VERSION: "3.4.x"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python34-x64"
+      PYTHON_VERSION: "3.4.x"
+      PYTHON_ARCH: "64"
+
+branches:  # Only build official branches, PRs are built anyway.
+  only:
+    - master
+    - /release.*/
+
+install:
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  # Check that we have the expected version and architecture for Python
+  - "python --version"
+  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  # Build data files
+  - "pip install . pytest"
+  - "python setup.py import_cldr"
+
+build: false  # Not a C# project, build stuff at the test step instead.
+
+test_script:
+  - "%CMD_IN_ENV% python -m pytest"
diff --git a/.ci/run_with_env.cmd b/.ci/run_with_env.cmd
new file mode 100644
index 000000000..3a472bc83
--- /dev/null
+++ b/.ci/run_with_env.cmd
@@ -0,0 +1,47 @@
+:: To build extensions for 64 bit Python 3, we need to configure environment
+:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
+:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
+::
+:: To build extensions for 64 bit Python 2, we need to configure environment
+:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
+:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
+::
+:: 32 bit builds do not require specific environment configurations.
+::
+:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
+:: cmd interpreter, at least for (SDK v7.0)
+::
+:: More details at:
+:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
+:: http://stackoverflow.com/a/13751649/163740
+::
+:: Author: Olivier Grisel
+:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
+@ECHO OFF
+
+SET COMMAND_TO_RUN=%*
+SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
+
+SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
+IF %MAJOR_PYTHON_VERSION% == "2" (
+    SET WINDOWS_SDK_VERSION="v7.0"
+) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
+    SET WINDOWS_SDK_VERSION="v7.1"
+) ELSE (
+    ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
+    EXIT 1
+)
+
+IF "%PYTHON_ARCH%"=="64" (
+    ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
+    SET DISTUTILS_USE_SDK=1
+    SET MSSdk=1
+    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
+    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
+    ECHO Executing: %COMMAND_TO_RUN%
+    call %COMMAND_TO_RUN% || EXIT 1
+) ELSE (
+    ECHO Using default MSVC build environment for 32 bit architecture
+    ECHO Executing: %COMMAND_TO_RUN%
+    call %COMMAND_TO_RUN% || EXIT 1
+)

From d333ae7e085a718d4460cd6629ee2bbf51c5f45c Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Tue, 4 Aug 2015 11:02:14 +0200
Subject: [PATCH 072/489] travis: Submit coverage to codecov

---
 .travis.yml | 6 ++++--
 Makefile    | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a876247cc..cda41362d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,15 @@ python:
 
 install:
   - pip install --upgrade pip
-  - pip install pytest
+  - pip install pytest pytest-cov
   - pip install --editable .
 
 # Use travis docker infrastructure for greater speed
 sudo: false
 
-script: make test
+script:
+  - make test-cov
+  - bash <(curl -s https://codecov.io/bash)
 
 notifications:
   email: false
diff --git a/Makefile b/Makefile
index c0adaa10d..ea4d75f91 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 test: import-cldr
 	@PYTHONWARNINGS=default py.test
 
+test-cov: import-cldr
+	@PYTHONWARNINGS=default py.test --cov=babel
+
 test-env:
 	@virtualenv test-env
 	@test-env/bin/pip install pytest

From 6f6ed17f9920bf513147c8f3218b331395017fc3 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Tue, 4 Aug 2015 13:08:26 +0200
Subject: [PATCH 073/489] gitignore: Add temporary editor files

.idea stores settings for PyCharm, ~ files are temporary files e.g. used
by gedit. .swp is used by vim. We don't want any of those to be
accidentally committed in the repo.
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7effb2fcc..0006e76c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+*~
+*.swp
+.idea
 *.so
 docs/_build
 *.pyc

From 9e3b5441ed7a68a7a5b553351b6baf6c5f20f13d Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Tue, 4 Aug 2015 13:02:30 +0200
Subject: [PATCH 074/489] Makefile: Use platform independent pytest invocation

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ea4d75f91..12dbb5eb3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 test: import-cldr
-	@PYTHONWARNINGS=default py.test
+	@PYTHONWARNINGS=default python -m pytest
 
 test-cov: import-cldr
-	@PYTHONWARNINGS=default py.test --cov=babel
+	@PYTHONWARNINGS=default python -m pytest --cov=babel
 
 test-env:
 	@virtualenv test-env

From 1caf790121bae3e0698c06004cd4c6916f32a398 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Tue, 4 Aug 2015 11:46:04 +0200
Subject: [PATCH 075/489] CI: Add mac builds

---
 .ci/deploy.linux.sh |  4 ++++
 .ci/deploy.osx.sh   |  4 ++++
 .ci/deps.linux.sh   |  4 ++++
 .ci/deps.osx.sh     | 11 +++++++++
 .travis.yml         | 55 +++++++++++++++++++++++++++++++++++++++------
 5 files changed, 71 insertions(+), 7 deletions(-)
 create mode 100644 .ci/deploy.linux.sh
 create mode 100644 .ci/deploy.osx.sh
 create mode 100644 .ci/deps.linux.sh
 create mode 100644 .ci/deps.osx.sh

diff --git a/.ci/deploy.linux.sh b/.ci/deploy.linux.sh
new file mode 100644
index 000000000..4d59382d7
--- /dev/null
+++ b/.ci/deploy.linux.sh
@@ -0,0 +1,4 @@
+set -x
+set -e
+
+bash <(curl -s https://codecov.io/bash)
diff --git a/.ci/deploy.osx.sh b/.ci/deploy.osx.sh
new file mode 100644
index 000000000..c44550eff
--- /dev/null
+++ b/.ci/deploy.osx.sh
@@ -0,0 +1,4 @@
+set -x
+set -e
+
+echo "Due to a bug in codecov, coverage cannot be deployed for Mac builds."
diff --git a/.ci/deps.linux.sh b/.ci/deps.linux.sh
new file mode 100644
index 000000000..13cc9e1ef
--- /dev/null
+++ b/.ci/deps.linux.sh
@@ -0,0 +1,4 @@
+set -x
+set -e
+
+echo "No dependencies to install for linux."
diff --git a/.ci/deps.osx.sh b/.ci/deps.osx.sh
new file mode 100644
index 000000000..b52a84f6d
--- /dev/null
+++ b/.ci/deps.osx.sh
@@ -0,0 +1,11 @@
+set -e
+set -x
+
+# Install packages with brew
+brew update >/dev/null
+brew outdated pyenv || brew upgrade --quiet pyenv
+
+# Install required python version for this build
+pyenv install -ks $PYTHON_VERSION
+pyenv global $PYTHON_VERSION
+python --version
diff --git a/.travis.yml b/.travis.yml
index cda41362d..95b1695f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,54 @@
 language: python
 
-python:
-  - "2.6"
-  - "2.7"
-  - "pypy"
-  - "3.3"
-  - "3.4"
+sudo: false
+
+cache: false
+
+matrix:
+  include:
+    - os: linux
+      python: 2.6
+    - os: linux
+      python: 2.7
+    - os: linux
+      python: pypy
+    - os: linux
+      python: 3.3
+    - os: linux
+      python: 3.4
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=2.6.6
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=2.7.10
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=pypy-2.6.0
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=3.3.6
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=3.4.3
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
 
 install:
+  - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
   - pip install pytest pytest-cov
   - pip install --editable .
@@ -17,7 +58,7 @@ sudo: false
 
 script:
   - make test-cov
-  - bash <(curl -s https://codecov.io/bash)
+  - bash .ci/deploy.${TRAVIS_OS_NAME}.sh
 
 notifications:
   email: false

From 79500992b4bc99fe1e6fdb122fa545943831a423 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Tue, 4 Aug 2015 13:01:34 +0200
Subject: [PATCH 076/489] travis: Cache cldr

This should speed linux builds up a bit. Caching is not supported for
mac builds though.
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 95b1695f2..6ba4fbd97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,9 @@ language: python
 
 sudo: false
 
-cache: false
+cache:
+  directories:
+  - cldr
 
 matrix:
   include:

From 819eaa9103fbc0e47ce9337c9ea566b3dbab0b72 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 4 Aug 2015 14:43:20 +0200
Subject: [PATCH 077/489] Added dev docs

---
 docs/dev.rst   | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
 docs/index.rst |  1 +
 2 files changed, 79 insertions(+)
 create mode 100644 docs/dev.rst

diff --git a/docs/dev.rst b/docs/dev.rst
new file mode 100644
index 000000000..b1fde576c
--- /dev/null
+++ b/docs/dev.rst
@@ -0,0 +1,78 @@
+Babel Development
+=================
+
+Babel as a library has a long history that goes back to the Trac project.
+Since then it has evolved into a independently developed project that
+implements data access for the CLDR project.
+
+This document tries to explain as best as possible the general rules of
+the project in case you want to help out developing.
+
+Tracking the CLDR
+-----------------
+
+Generally the goal of the project is to work as closely as possible with
+the CLDR data.  This has in the past caused some frustrating problems
+because the data is entirely out of our hand.  To minimize the frustration
+we generally deal with CLDR updates the following way:
+
+*   bump the CLDR data only with a major release of Babel.
+*   never perform custom bugfixes on the CLDR data.
+*   never work around CLDR bugs within Babel.  If you find a problem in
+    the data, report it upstream.
+*   adjust the parsing of the data as soon as possible, otherwise this
+    will spiral out of control later.  This is especially the case for
+    bigger updates that change pluralization and more.
+*   try not to test against specific CLDR data that is likely to change.
+
+Python Versions
+---------------
+
+At the moment the following Python versions should be supported:
+
+*   Python 2.6
+*   Python 2.7
+*   Python 3.3 and up
+*   PyPy tracking 2.7 and 3.2 and up
+
+While PyPy does not currently support 3.3, it does support traditional
+unicode literals which simplifies the entire situation tremendously.
+
+Documentation must build on Python 2, Python 3 support for the
+documentation is an optional goal.  Code examples in the docs preferrably
+are written in a style that makes them work on both 2.x and 3.x with
+preference to the former.
+
+Unicode
+-------
+
+Unicode is a big deal in Babel.  Here is how the rules are set up:
+
+*   internally everything is unicode that makes sense to have as unicode.
+    The exception to this rule are things which on Python 2 traditionally
+    have been bytes.  For example file names on Python 2 should be treated
+    as bytes wherever possible.
+*   Encode / decode at boundaries explicitly.  Never assume an encoding in
+    a way it cannot be overridden.  utf-8 should be generally considered
+    the default encoding.
+*   Dot not use ``unicode_literals``, instead use the ``u''`` string
+    syntax.  The reason for this is that the former introduces countless
+    of unicode problems by accidentally upgrading strings to unicode which
+    should not be.  (docstrings for instance).
+
+Dates and Timezones
+-------------------
+
+Generally all timezone support in Babel is based on pytz which it just
+depends on.  Babel should assume that timezone objects are pytz based
+because those are the only ones with an API that actually work correctly
+(due to the API problems with non UTC based timezones).
+
+Assumptions to make:
+
+*   use UTC where possible.
+*   be super careful with local time.  Do not use local time without
+    knowing the exact timezone.
+*   `time` without date is a very useless construct.  Do not try to
+    support timezones for it.  If you do, assume that the current local
+    date is assumed and not utc date.
diff --git a/docs/index.rst b/docs/index.rst
index 861384d62..082174133 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -42,5 +42,6 @@ Additional Notes
 .. toctree::
    :maxdepth: 2
 
+   dev
    changelog
    license

From 40d640f6d414446f906359f93d207413eb311bbc Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Tue, 4 Aug 2015 16:32:16 +0200
Subject: [PATCH 078/489] Add rultor configuration

This allows merging via github comments. The comment `@rultor merge`
will execute the script (which currently doesn't do anything) and if it
succeeds will perform the merge.

I plan to use rultor later for:
 * Automatic deployment to PyPI (development releases directly from
   master, we do this already in coala, see
   https://github.com/coala-analyzer/coala/blob/master/.rultor.yml)
 * Automatic releasing with deployment to PyPI.
 * Veryfy that all CI services pass before merging (see
   https://github.com/yegor256/rultor/issues/869)

With this any manual pushes to master are disallowed, all pushes to
master have to be validated by continuous integration and reviewed by a
non-committer.
---
 .rultor.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .rultor.yml

diff --git a/.rultor.yml b/.rultor.yml
new file mode 100644
index 000000000..087129698
--- /dev/null
+++ b/.rultor.yml
@@ -0,0 +1,2 @@
+merge:
+  script: echo "Nothing to do (yet)."

From 3ce842bb9a25d180a436d443b2376b7162161c22 Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@archlinux.org>
Date: Wed, 26 Mar 2014 14:43:14 +0000
Subject: [PATCH 079/489] Support 'Language' header field of PO files (#76)

GNU gettext has support for the 'Language' field in header entry since
version 0.18 (May 2010). This commit adds support for the field and
addresses #76.
---
 babel/messages/catalog.py       | 3 +++
 tests/messages/test_catalog.py  | 1 +
 tests/messages/test_frontend.py | 9 +++++++++
 3 files changed, 13 insertions(+)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 67c542591..12e878348 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -374,6 +374,8 @@ def _get_mime_headers(self):
         else:
             headers.append(('PO-Revision-Date', self.revision_date))
         headers.append(('Last-Translator', self.last_translator))
+        if self.locale is not None:
+            headers.append(('Language', str(self.locale)))
         if (self.locale is not None) and ('LANGUAGE' in self.language_team):
             headers.append(('Language-Team',
                            self.language_team.replace('LANGUAGE',
@@ -457,6 +459,7 @@ def _set_mime_headers(self, headers):
     POT-Creation-Date: 1990-04-01 15:30+0000
     PO-Revision-Date: 1990-08-03 12:00+0000
     Last-Translator: John Doe <jd@example.com>
+    Language: de_DE
     Language-Team: de_DE <de@example.com>
     Plural-Forms: nplurals=2; plural=(n != 1)
     MIME-Version: 1.0
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index aac71eeac..31bb1d140 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -380,6 +380,7 @@ def test_catalog_mime_headers_set_locale():
         ('POT-Creation-Date', '1990-04-01 15:30+0000'),
         ('PO-Revision-Date', '1990-08-03 12:00+0000'),
         ('Last-Translator', 'John Doe <jd@example.com>'),
+        ('Language', 'de_DE'),
         ('Language-Team', 'de_DE <de@example.com>'),
         ('Plural-Forms', 'nplurals=2; plural=(n != 1)'),
         ('MIME-Version', '1.0'),
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 882cb00d3..4d26df50e 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -359,6 +359,7 @@ def test_with_output_dir(self):
 "POT-Creation-Date: 2007-04-01 15:30+0200\n"
 "PO-Revision-Date: %(date)s\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en_US\n"
 "Language-Team: en_US <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -409,6 +410,7 @@ def test_keeps_catalog_non_fuzzy(self):
 "POT-Creation-Date: 2007-04-01 15:30+0200\n"
 "PO-Revision-Date: %(date)s\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en_US\n"
 "Language-Team: en_US <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -459,6 +461,7 @@ def test_correct_init_more_than_2_plurals(self):
 "POT-Creation-Date: 2007-04-01 15:30+0200\n"
 "PO-Revision-Date: %(date)s\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: lv_LV\n"
 "Language-Team: lv_LV <LL@li.org>\n"
 "Plural-Forms: nplurals=3; plural=(n%%10==1 && n%%100!=11 ? 0 : n != 0 ? 1 :"
 " 2)\n"
@@ -511,6 +514,7 @@ def test_correct_init_singular_plural_forms(self):
 "POT-Creation-Date: 2007-04-01 15:30+0200\n"
 "PO-Revision-Date: %(date)s\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: ja_JP\n"
 "Language-Team: ja_JP <LL@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
@@ -568,6 +572,7 @@ def test_supports_no_wrap(self):
 "POT-Creation-Date: 2007-04-01 15:30+0200\n"
 "PO-Revision-Date: %(date)s\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en_US\n"
 "Language-Team: en_US <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -626,6 +631,7 @@ def test_supports_width(self):
 "POT-Creation-Date: 2007-04-01 15:30+0200\n"
 "PO-Revision-Date: %(date)s\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en_US\n"
 "Language-Team: en_US <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -884,6 +890,7 @@ def test_init_with_output_dir(self):
 "POT-Creation-Date: 2007-04-01 15:30+0200\n"
 "PO-Revision-Date: %(date)s\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en_US\n"
 "Language-Team: en_US <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -934,6 +941,7 @@ def test_init_singular_plural_forms(self):
 "POT-Creation-Date: 2007-04-01 15:30+0200\n"
 "PO-Revision-Date: %(date)s\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: ja_JP\n"
 "Language-Team: ja_JP <LL@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
@@ -980,6 +988,7 @@ def test_init_more_than_2_plural_forms(self):
 "POT-Creation-Date: 2007-04-01 15:30+0200\n"
 "PO-Revision-Date: %(date)s\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: lv_LV\n"
 "Language-Team: lv_LV <LL@li.org>\n"
 "Plural-Forms: nplurals=3; plural=(n%%10==1 && n%%100!=11 ? 0 : n != 0 ? 1 :"
 " 2)\n"

From 504aafe5395061c6a2c9fbbb92bc6646a379633f Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Wed, 5 Nov 2014 16:40:04 +0100
Subject: [PATCH 080/489] Import parent locale exceptions

Process and save the <parentLocales> element, which contains the
inheritance exceptions to the standard CLDR locale inheritance
algorithm.
---
 scripts/import_cldr.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 7dcd171ca..576370140 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -145,6 +145,7 @@ def main():
         variant_aliases = global_data.setdefault('variant_aliases', {})
         likely_subtags = global_data.setdefault('likely_subtags', {})
         territory_currencies = global_data.setdefault('territory_currencies', {})
+        parent_exceptions = global_data.setdefault('parent_exceptions', {})
 
         # create auxiliary zone->territory map from the windows zones (we don't set
         # the 'zones_territories' map directly here, because there are some zones
@@ -223,6 +224,12 @@ def main():
             region_currencies.sort(key=_currency_sort_key)
             territory_currencies[region_code] = region_currencies
 
+        # Explicit parent locales
+        for paternity in sup.findall('.//parentLocales/parentLocale'):
+            parent = paternity.attrib['parent']
+            for child in paternity.attrib['locales'].split():
+                parent_exceptions[child] = parent
+
         outfile = open(global_path, 'wb')
         try:
             pickle.dump(global_data, outfile, 2)

From 3ef0d6daaff4e9e2b60706e27034c9043b725483 Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Wed, 5 Nov 2014 17:15:08 +0100
Subject: [PATCH 081/489] localedata: Check inheritance exceptions first

When deriving the parent locale from the given name, look first in the
inheritance exception list.  This will cover cases like "es_MX", which
parent is "es_419" and not "es".

Fixes https://github.com/mitsuhiko/babel/issues/97
---
 babel/localedata/__init__.py | 13 ++++++++-----
 babel/numbers.py             |  2 +-
 tests/test_numbers.py        |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/babel/localedata/__init__.py b/babel/localedata/__init__.py
index e6df0c4d1..c48b9f586 100644
--- a/babel/localedata/__init__.py
+++ b/babel/localedata/__init__.py
@@ -81,11 +81,14 @@ def load(name, merge_inherited=True):
             if name == 'root' or not merge_inherited:
                 data = {}
             else:
-                parts = name.split('_')
-                if len(parts) == 1:
-                    parent = 'root'
-                else:
-                    parent = '_'.join(parts[:-1])
+                from babel.core import get_global
+                parent = get_global('parent_exceptions').get(name)
+                if not parent:
+                    parts = name.split('_')
+                    if len(parts) == 1:
+                        parent = 'root'
+                    else:
+                        parent = '_'.join(parts[:-1])
                 data = load(parent).copy()
             filename = os.path.join(_dirname, '%s.dat' % name)
             fileobj = open(filename, 'rb')
diff --git a/babel/numbers.py b/babel/numbers.py
index 01af774dd..d1f647252 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -258,7 +258,7 @@ def format_currency(number, currency, format=None, locale=LC_NUMERIC):
     >>> format_currency(1099.98, 'USD', locale='en_US')
     u'$1,099.98'
     >>> format_currency(1099.98, 'USD', locale='es_CO')
-    u'1.099,98\\xa0US$'
+    u'US$1.099,98'
     >>> format_currency(1099.98, 'EUR', locale='de_DE')
     u'1.099,98\\xa0\\u20ac'
 
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 02332fbc7..6fe67c04e 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -243,7 +243,7 @@ def test_format_currency():
     assert (numbers.format_currency(1099.98, 'USD', locale='en_US')
             == u'$1,099.98')
     assert (numbers.format_currency(1099.98, 'USD', locale='es_CO')
-            == u'1.099,98\xa0US$')
+            == u'US$1.099,98')
     assert (numbers.format_currency(1099.98, 'EUR', locale='de_DE')
             == u'1.099,98\xa0\u20ac')
     assert (numbers.format_currency(1099.98, 'EUR', u'\xa4\xa4 #,##0.00',

From 94f68302796149898fe99c14edc2a5519baad5e8 Mon Sep 17 00:00:00 2001
From: Jun Omae <jun66j5@gmail.com>
Date: Tue, 4 Aug 2015 20:15:25 +0900
Subject: [PATCH 082/489] Removed uses of datetime.date class from *.dat files
 (#174)

To avoid incompatible *.dat files between Python 2 and 3.
---
 babel/numbers.py       | 4 ++++
 scripts/import_cldr.py | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 01af774dd..35705b59f 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -135,6 +135,10 @@ def _is_active(start, end):
 
     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:
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 7dcd171ca..1b0092345 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -21,8 +21,6 @@
 except ImportError:
     from xml.etree import ElementTree
 
-from datetime import date
-
 # Make sure we're using Babel source, and not some previously installed version
 sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), '..'))
 
@@ -103,12 +101,12 @@ def _parse_currency_date(s):
     if not s:
         return None
     parts = s.split('-', 2)
-    return date(*map(int, parts + [1] * (3 - len(parts))))
+    return tuple(map(int, parts + [1] * (3 - len(parts))))
 
 
 def _currency_sort_key(tup):
     code, start, end, tender = tup
-    return int(not tender), start or date(1, 1, 1)
+    return int(not tender), start or (1, 1, 1)
 
 
 def main():

From 6acf7ae1c95156d2adb956da77a8ec51b7e064da Mon Sep 17 00:00:00 2001
From: Jun Omae <jun66j5@gmail.com>
Date: Wed, 5 Aug 2015 07:21:34 +0900
Subject: [PATCH 083/489] Added unit tests for that *.dat files have only babel
 classes

---
 tests/test_core.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tests/test_core.py b/tests/test_core.py
index 7e16765fc..a4253d806 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -269,3 +269,29 @@ def test_parse_locale():
     assert core.parse_locale('en_US.UTF-8') == ('en', 'US', None, None)
     assert (core.parse_locale('de_DE.iso885915@euro') ==
             ('de', 'DE', None, None))
+
+def test_compatible_classes_in_global_and_localedata():
+    # Use pickle module rather than cPickle since cPickle.Unpickler is a method
+    # on Python 2
+    import pickle
+
+    class Unpickler(pickle.Unpickler):
+        def find_class(self, module, name):
+            # *.dat files must have compatible classes between Python 2 and 3
+            if module.split('.')[0] == 'babel':
+                return pickle.Unpickler.find_class(self, module, name)
+            raise pickle.UnpicklingError("global '%s.%s' is forbidden" %
+                                         (module, name))
+
+    def load(filename):
+        with open(filename, 'rb') as f:
+            return Unpickler(f).load()
+
+    load('babel/global.dat')
+    load('babel/localedata/root.dat')
+    load('babel/localedata/en.dat')
+    load('babel/localedata/en_US.dat')
+    load('babel/localedata/en_US_POSIX.dat')
+    load('babel/localedata/zh_Hans_CN.dat')
+    load('babel/localedata/zh_Hant_TW.dat')
+    load('babel/localedata/es_419.dat')

From a1cc3f1ca8149cddd97bd6823857cc9e3eba544e Mon Sep 17 00:00:00 2001
From: astaric <anze.staric@gmail.com>
Date: Thu, 12 Jun 2014 09:33:36 +0200
Subject: [PATCH 084/489] Add __copy__ and __deepcopy__ to LazyProxy.

Python's copy.copy and copy.deepcopy do not call objects __init__,
resulting in endless recursion.
---
 babel/support.py      | 17 +++++++++++++++++
 tests/test_support.py | 27 +++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/babel/support.py b/babel/support.py
index c720c747c..5ab97a5b2 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -263,6 +263,23 @@ def __getitem__(self, key):
     def __setitem__(self, key, value):
         self.value[key] = value
 
+    def __copy__(self):
+        return LazyProxy(
+            self._func,
+            enable_cache=self._is_cache_enabled,
+            *self._args,
+            **self._kwargs
+        )
+
+    def __deepcopy__(self, memo):
+        from copy import deepcopy
+        return LazyProxy(
+            deepcopy(self._func, memo),
+            enable_cache=deepcopy(self._is_cache_enabled, memo),
+            *deepcopy(self._args, memo),
+            **deepcopy(self._kwargs, memo)
+        )
+
 
 class NullTranslations(gettext.NullTranslations, object):
 
diff --git a/tests/test_support.py b/tests/test_support.py
index 8c182fc77..4647f6b13 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -243,6 +243,33 @@ def add_one():
         self.assertEqual(1, proxy.value)
         self.assertEqual(2, proxy.value)
 
+    def test_can_copy_proxy(self):
+        from copy import copy
+
+        numbers = [1,2]
+        def first(xs):
+            return xs[0]
+
+        proxy = support.LazyProxy(first, numbers)
+        proxy_copy = copy(proxy)
+
+        numbers.pop(0)
+        self.assertEqual(2, proxy.value)
+        self.assertEqual(2, proxy_copy.value)
+
+    def test_can_deepcopy_proxy(self):
+        from copy import deepcopy
+        numbers = [1,2]
+        def first(xs):
+            return xs[0]
+
+        proxy = support.LazyProxy(first, numbers)
+        proxy_deepcopy = deepcopy(proxy)
+
+        numbers.pop(0)
+        self.assertEqual(2, proxy.value)
+        self.assertEqual(1, proxy_deepcopy.value)
+
 
 def test_format_date():
     fmt = support.Format('en_US')

From 87c0456afa984be383fa2d1b640315bab7645990 Mon Sep 17 00:00:00 2001
From: Julen Ruiz Aizpuru <julenx@gmail.com>
Date: Tue, 27 May 2014 10:40:39 +0200
Subject: [PATCH 085/489] Docs: minor fixes

---
 docs/dates.rst  | 4 ++--
 docs/locale.rst | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/dates.rst b/docs/dates.rst
index f03c21ace..818a3941b 100644
--- a/docs/dates.rst
+++ b/docs/dates.rst
@@ -50,8 +50,8 @@ Core Time Concepts
 
 Working with dates and time can be a complicated thing.  Babel attempts to
 simplify working with them by making some decisions for you.  Python's
-datetime module knows to different ways to deal with times and dates:
-naive and timezone aware datetime objects.
+datetime module has different ways to deal with times and dates: naive and
+timezone-aware datetime objects.
 
 Babel generally recommends you to store all your time in naive datetime
 objects and treat them as UTC at all times.  This simplifies dealing with
diff --git a/docs/locale.rst b/docs/locale.rst
index 5e9b2487c..cf4f6d5c5 100644
--- a/docs/locale.rst
+++ b/docs/locale.rst
@@ -80,9 +80,9 @@ Locale Display Names
 ====================
 
 Locales itself can be used to describe the locale itself or other locales.
-This mainly means that given a locale object you can ask it for it's
+This mainly means that given a locale object you can ask it for its
 canonical display name, the name of the language and other things.  Since
-the locales cross reference each other you can ask for locale names in any
+the locales cross-reference each other you can ask for locale names in any
 language supported by the CLDR:
 
 .. code-block:: pycon
@@ -113,7 +113,7 @@ Calendar Display Names
 ======================
 
 The :class:`~babel.core.Locale` class provides access to many locale
-display names related to calendar display, such as the names of week days
+display names related to calendar display, such as the names of weekdays
 or months.
 
 These display names are of course used for date formatting, but can also be

From da87edd1e5ff71ff7d072318b664f2940b12e3f2 Mon Sep 17 00:00:00 2001
From: Leonardo Pistone <leonardo.pistone@camptocamp.com>
Date: Fri, 7 Aug 2015 16:43:41 +0200
Subject: [PATCH 086/489] allow utf8 BOM + magic comment, closes #189

---
 babel/util.py                  |  8 +++++---
 tests/messages/test_extract.py | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/babel/util.py b/babel/util.py
index a65fce36e..dd7378725 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -77,9 +77,11 @@ def parse_encoding(fp):
 
         if has_bom:
             if m:
-                raise SyntaxError(
-                    "python refuses to compile code with both a UTF8 "
-                    "byte-order-mark and a magic encoding comment")
+                magic_comment_encoding = m.group(1).decode('latin-1')
+                if magic_comment_encoding != 'utf-8':
+                    raise SyntaxError(
+                        'encoding problem: {0} with BOM'.format(
+                            magic_comment_encoding))
             return 'utf-8'
         elif m:
             return m.group(1).decode('latin-1')
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 62c722773..ded697f7f 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -343,6 +343,23 @@ def test_utf8_message_with_utf8_bom(self):
         self.assertEqual(u'Bonjour à tous', messages[0][2])
         self.assertEqual([u'NOTE: hello'], messages[0][3])
 
+    def test_utf8_message_with_utf8_bom_and_magic_comment(self):
+        buf = BytesIO(codecs.BOM_UTF8 + u"""# -*- coding: utf-8 -*-
+# NOTE: hello
+msg = _('Bonjour à tous')
+""".encode('utf-8'))
+        messages = list(extract.extract_python(buf, ('_',), ['NOTE:'], {}))
+        self.assertEqual(u'Bonjour à tous', messages[0][2])
+        self.assertEqual([u'NOTE: hello'], messages[0][3])
+
+    def test_utf8_bom_with_latin_magic_comment_fails(self):
+        buf = BytesIO(codecs.BOM_UTF8 + u"""# -*- coding: latin-1 -*-
+# NOTE: hello
+msg = _('Bonjour à tous')
+""".encode('utf-8'))
+        self.assertRaises(SyntaxError, list,
+                          extract.extract_python(buf, ('_',), ['NOTE:'], {}))
+
     def test_utf8_raw_strings_match_unicode_strings(self):
         buf = BytesIO(codecs.BOM_UTF8 + u"""
 msg = _('Bonjour à tous')

From 424ea406381c775aff5abdd89c444b503c547d87 Mon Sep 17 00:00:00 2001
From: Leonardo Pistone <leonardo.pistone@camptocamp.com>
Date: Tue, 25 Aug 2015 17:34:16 +0200
Subject: [PATCH 087/489] update dead link to the Python Language Reference

---
 babel/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/util.py b/babel/util.py
index dd7378725..3bfebc91a 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -46,7 +46,7 @@ def parse_encoding(fp):
 
     It does this in the same way as the `Python interpreter`__
 
-    .. __: http://docs.python.org/ref/encodings.html
+    .. __: https://docs.python.org/3.4/reference/lexical_analysis.html#encoding-declarations
 
     The ``fp`` argument should be a seekable file object.
 

From 6822b7fa7d12be1db8433a157345045dadebe5eb Mon Sep 17 00:00:00 2001
From: Arturas Moskvinas <arturas@uber.com>
Date: Fri, 7 Aug 2015 19:17:31 +0300
Subject: [PATCH 088/489] Improve odict performance by making key search O(1)

---
 babel/util.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/babel/util.py b/babel/util.py
index a65fce36e..8d88fc537 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -172,8 +172,9 @@ def __delitem__(self, key):
         self._keys.remove(key)
 
     def __setitem__(self, key, item):
+        new_key = key not in self
         dict.__setitem__(self, key, item)
-        if key not in self._keys:
+        if new_key:
             self._keys.append(key)
 
     def __iter__(self):

From 3c4e8ee15c5abc040eb94f2cca7cee09e9331795 Mon Sep 17 00:00:00 2001
From: Arturas Moskvinas <arturas@uber.com>
Date: Wed, 26 Aug 2015 09:11:47 +0300
Subject: [PATCH 089/489] Add change

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 4258e5e8f..4dbe07cf7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,8 @@ Version 3.0
 
 - Upgraded data to CLDR 26
 - Add official support for Python 3.4
+- Improved odict performance which is used during localization file
+  build, should improve compilation time for large projects
 
 Version 2.0
 -----------

From 0a9e97e3ae4ffb7431406a5c7166e337573dfa92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Wed, 12 Nov 2014 18:09:34 +0100
Subject: [PATCH 090/489] odict: Fix pop method

The items() and iteritems() methods did not contain correct values after
a call to `pop(i)`.

Fixes https://github.com/mitsuhiko/babel/issues/196
---
 babel/util.py      | 15 +++++++++------
 tests/test_util.py | 15 +++++++++++++--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/babel/util.py b/babel/util.py
index a65fce36e..a428bca37 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -199,12 +199,15 @@ def keys(self):
         return self._keys[:]
 
     def pop(self, key, default=missing):
-        if default is missing:
-            return dict.pop(self, key)
-        elif key not in self:
-            return default
-        self._keys.remove(key)
-        return dict.pop(self, key, default)
+        try:
+            value = dict.pop(self, key)
+            self._keys.remove(key)
+            return value
+        except KeyError as e:
+            if default == missing:
+                raise e
+            else:
+                return default
 
     def popitem(self, key):
         self._keys.remove(key)
diff --git a/tests/test_util.py b/tests/test_util.py
index 321014c90..6ec73dc52 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -11,8 +11,6 @@
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
 
-import doctest
-import unittest
 
 from babel import util
 
@@ -28,3 +26,16 @@ def test_pathmatch():
     assert not util.pathmatch('**.py', 'templates/index.html')
     assert util.pathmatch('**/templates/*.html', 'templates/index.html')
     assert not util.pathmatch('**/templates/*.html', 'templates/foo/bar.html')
+
+def test_odict_pop():
+    odict = util.odict()
+    odict[0] = 1
+    value = odict.pop(0)
+    assert 1 == value
+    assert [] == list(odict.items())
+    assert odict.pop(2, None) is None
+    try:
+        odict.pop(2)
+        assert False
+    except KeyError:
+        assert True

From c17ff4108ec51c0944f0c8c0f88fc56af2f15978 Mon Sep 17 00:00:00 2001
From: The Gitter Badger <badger@gitter.im>
Date: Mon, 7 Sep 2015 21:50:44 +0000
Subject: [PATCH 091/489] Added Gitter link

---
 README | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README b/README
index 8e783e1d0..56b36a902 100644
--- a/README
+++ b/README
@@ -10,3 +10,5 @@ Details can be found in the HTML files in the `docs` folder.
 For more information please visit the Babel web site:
 
   <http://babel.pocoo.org/>
+
+Join the chat at https://gitter.im/mitsuhiko/babel

From edc5eb57b2f7c36bb419be4d23396746d233767b Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Thu, 10 Sep 2015 01:41:15 +0100
Subject: [PATCH 092/489] Add format_timedelta(format='narrow') support

---
 babel/dates.py      | 13 ++++++++++---
 tests/test_dates.py |  8 ++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 388da6d25..f9498d80a 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -739,6 +739,13 @@ def format_timedelta(delta, granularity='second', threshold=.85,
     >>> format_timedelta(timedelta(hours=-1), add_direction=True, locale='en')
     u'1 hour ago'
 
+    The format parameter controls how compact or wide the presentation is:
+
+    >>> format_timedelta(timedelta(hours=3), format='short', locale='en')
+    u'3 hrs'
+    >>> format_timedelta(timedelta(hours=3), format='narrow', locale='en')
+    u'3h'
+
     :param delta: a ``timedelta`` object representing the time difference to
                   format, or the delta in seconds as an `int` value
     :param granularity: determines the smallest unit that should be displayed,
@@ -751,13 +758,13 @@ def format_timedelta(delta, granularity='second', threshold=.85,
                           positive timedelta will include the information about
                           it being in the future, a negative will be information
                           about the value being in the past.
-    :param format: the format (currently only "long" and "short" are supported,
+    :param format: the format, can be "narrow", "short" or "long". (
                    "medium" is deprecated, currently converted to "long" to
                    maintain compatibility)
     :param locale: a `Locale` object or a locale identifier
     """
-    if format not in ('short', 'medium', 'long'):
-        raise TypeError('Format can only be one of "short" or "medium"')
+    if format not in ('narrow', 'short', 'medium', 'long'):
+        raise TypeError('Format must be one of "narrow", "short" or "long"')
     if format == 'medium':
         warnings.warn('"medium" value for format param of format_timedelta'
                       ' is deprecated. Use "long" instead',
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 1f6e7e7dd..34b8a89a2 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -310,6 +310,14 @@ def test_direction_adding(self):
                                         add_direction=True)
         self.assertEqual('1 hour ago', string)
 
+    def test_format_narrow(self):
+        string = dates.format_timedelta(timedelta(hours=1),
+                                        locale='en', format='narrow')
+        self.assertEqual('1h', string)
+        string = dates.format_timedelta(timedelta(hours=-2),
+                                        locale='en', format='narrow')
+        self.assertEqual('2h', string)
+
 
 class TimeZoneAdjustTestCase(unittest.TestCase):
     def _utc(self):

From bdeaf59aaac98a0ac00a616cddf0474efd4a31b2 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Thu, 10 Sep 2015 13:54:22 +0100
Subject: [PATCH 093/489] Test invalid format_timedelta() format parameters

---
 tests/test_dates.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/test_dates.py b/tests/test_dates.py
index 34b8a89a2..1b03cbf00 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -318,6 +318,14 @@ def test_format_narrow(self):
                                         locale='en', format='narrow')
         self.assertEqual('2h', string)
 
+    def test_format_invalid(self):
+        self.assertRaises(TypeError, dates.format_timedelta,
+                          timedelta(hours=1), format='')
+        self.assertRaises(TypeError, dates.format_timedelta,
+                          timedelta(hours=1), format='bold italic')
+        self.assertRaises(TypeError, dates.format_timedelta,
+                          timedelta(hours=1), format=None)
+
 
 class TimeZoneAdjustTestCase(unittest.TestCase):
     def _utc(self):

From d9b20136c8314c56c7f7c26cc93d3eebcdfae29e Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Thu, 10 Sep 2015 19:31:16 +0100
Subject: [PATCH 094/489] Remove unneeded relpath() polyfill

It looks like this dates back all the way to 2007,
and the initial import of the code in commit 00f16f9.

Since Python 2.6 is the minimum supported version, and that has
os.path.relpath this is no longer needed.
---
 babel/util.py | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/babel/util.py b/babel/util.py
index c36621418..b5a3eabda 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -12,6 +12,7 @@
 import codecs
 from datetime import timedelta, tzinfo
 import os
+from os.path import relpath
 import re
 import textwrap
 from babel._compat import izip, imap
@@ -232,29 +233,6 @@ def itervalues(self):
         return imap(self.get, self._keys)
 
 
-try:
-    relpath = os.path.relpath
-except AttributeError:
-    def relpath(path, start='.'):
-        """Compute the relative path to one path from another.
-
-        >>> relpath('foo/bar.txt', '').replace(os.sep, '/')
-        'foo/bar.txt'
-        >>> relpath('foo/bar.txt', 'foo').replace(os.sep, '/')
-        'bar.txt'
-        >>> relpath('foo/bar.txt', 'baz').replace(os.sep, '/')
-        '../foo/bar.txt'
-        """
-        start_list = os.path.abspath(start).split(os.sep)
-        path_list = os.path.abspath(path).split(os.sep)
-
-        # Work out how much of the filepath is shared by start and path.
-        i = len(os.path.commonprefix([start_list, path_list]))
-
-        rel_list = [os.path.pardir] * (len(start_list) - i) + path_list[i:]
-        return os.path.join(*rel_list)
-
-
 class FixedOffsetTimezone(tzinfo):
     """Fixed offset in minutes east from UTC."""
 

From cb496dd9d1aafd28869a100f1a20a405b8b5ffca Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse@schuirmann.net>
Date: Thu, 10 Sep 2015 20:54:59 +0200
Subject: [PATCH 095/489] CHANGES: Add "narrow" support for format_timedelta

This was introduced in
https://github.com/moreati/babel/commit/edc5eb57b2f7c36bb419be4d23396746d233767b
and forgotten to add to CHANGES.
---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index 4dbe07cf7..16151b77d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ Version 3.0
 - Add official support for Python 3.4
 - Improved odict performance which is used during localization file
   build, should improve compilation time for large projects
+- Add support for "narrow" format for format_timedelta
 
 Version 2.0
 -----------

From d816803400444d116ec285c38d6367d08a17b374 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Thu, 10 Sep 2015 20:25:45 +0100
Subject: [PATCH 096/489] FixedOffsetTimezone: fix display of negative offsets

---
 babel/util.py      |  2 +-
 tests/test_util.py | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/babel/util.py b/babel/util.py
index c36621418..495e94312 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -261,7 +261,7 @@ class FixedOffsetTimezone(tzinfo):
     def __init__(self, offset, name=None):
         self._offset = timedelta(minutes=offset)
         if name is None:
-            name = 'Etc/GMT+%d' % offset
+            name = 'Etc/GMT%+d' % offset
         self.zone = name
 
     def __str__(self):
diff --git a/tests/test_util.py b/tests/test_util.py
index 6ec73dc52..bb2bfdb4b 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -11,6 +11,7 @@
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
 
+import unittest
 
 from babel import util
 
@@ -39,3 +40,15 @@ def test_odict_pop():
         assert False
     except KeyError:
         assert True
+
+
+class FixedOffsetTimezoneTestCase(unittest.TestCase):
+    def test_zone_negative_offset(self):
+        self.assertEqual('Etc/GMT-60', util.FixedOffsetTimezone(-60).zone)
+
+    def test_zone_zero_offset(self):
+        self.assertEqual('Etc/GMT+0', util.FixedOffsetTimezone(0).zone)
+
+    def test_zone_positive_offset(self):
+        self.assertEqual('Etc/GMT+330', util.FixedOffsetTimezone(330).zone)
+

From e0bdf686d8b895fe997cb154a9a1b27cdf0cb6c1 Mon Sep 17 00:00:00 2001
From: Ryan J Ollos <ryan.j.ollos@gmail.com>
Date: Wed, 16 Sep 2015 20:51:50 -0700
Subject: [PATCH 097/489] Remove duplicate `sudo: false` entry.

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6ba4fbd97..c7a79b1be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: python
 
+# Use travis docker infrastructure for greater speed
 sudo: false
 
 cache:
@@ -55,9 +56,6 @@ install:
   - pip install pytest pytest-cov
   - pip install --editable .
 
-# Use travis docker infrastructure for greater speed
-sudo: false
-
 script:
   - make test-cov
   - bash .ci/deploy.${TRAVIS_OS_NAME}.sh

From fb084c1be1731805f2bc8cd00a86b176cfa6f906 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Mon, 21 Sep 2015 13:47:09 +0200
Subject: [PATCH 098/489] docs: Change repository adress

The repository moved.
---
 README                             | 2 +-
 docs/_templates/sidebar-links.html | 4 ++--
 docs/conf.py                       | 2 +-
 docs/installation.rst              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 56b36a902..f329291b3 100644
--- a/README
+++ b/README
@@ -11,4 +11,4 @@ For more information please visit the Babel web site:
 
   <http://babel.pocoo.org/>
 
-Join the chat at https://gitter.im/mitsuhiko/babel
+Join the chat at https://gitter.im/python-babel/babel
diff --git a/docs/_templates/sidebar-links.html b/docs/_templates/sidebar-links.html
index 856aa1bab..a55b2dd96 100644
--- a/docs/_templates/sidebar-links.html
+++ b/docs/_templates/sidebar-links.html
@@ -10,6 +10,6 @@ <h3>Useful Links</h3>
 <ul>
   <li><a href="http://babel.pocoo.org/">Babel Website</a></li>
   <li><a href="http://pypi.python.org/pypi/Babel">Babel @ PyPI</a></li>
-  <li><a href="http://github.com/mitsuhiko/babel">Babel @ github</a></li>
-  <li><a href="http://github.com/mitsuhiko/babel/issues">Issue Tracker</a></li>
+  <li><a href="http://github.com/python-babel/babel">Babel @ github</a></li>
+  <li><a href="http://github.com/python-babel/babel/issues">Issue Tracker</a></li>
 </ul>
diff --git a/docs/conf.py b/docs/conf.py
index c84ebaef4..ed75a531f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -257,6 +257,6 @@
 }
 
 extlinks = {
-    'gh': ('https://github.com/mitsuhiko/babel/issues/%s', '#'),
+    'gh': ('https://github.com/python-babel/babel/issues/%s', '#'),
     'trac': ('http://babel.edgewall.org/ticket/%s', 'ticket #'),
 }
diff --git a/docs/installation.rst b/docs/installation.rst
index 07f0306d9..0aea3abfe 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -80,7 +80,7 @@ use a git checkout.
 
 Get the git checkout in a new virtualenv and run in development mode::
 
-    $ git clone http://github.com/mitsuhiko/babel.git
+    $ git clone http://github.com/python-babel/babel.git
     Initialized empty Git repository in ~/dev/babel/.git/
     $ cd babel
     $ virtualenv venv

From 6a9f60f98a593014837dbb0625c85e219d842be7 Mon Sep 17 00:00:00 2001
From: Ryan J Ollos <ryanollos@verasonics.com>
Date: Mon, 21 Sep 2015 10:33:47 -0700
Subject: [PATCH 099/489] Enforce Python version in `setup.py`

Print error message and exit if Python version requirement not satisfied.
---
 setup.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index bc2ed02a5..fa77fcc45 100755
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,16 @@
 # -*- coding: utf-8 -*-
 
-import os
 import sys
+if sys.version_info < (2, 6) or (3,) <= sys.version_info < (3, 3):
+    print("Babel requires Python 2.6, 2.7 or 3.3+")
+    sys.exit(1)
+
+
+import os
 import subprocess
 from setuptools import setup
 
+
 sys.path.append(os.path.join('doc', 'common'))
 try:
     from doctools import build_doc, test_doc

From 5ab419202016167252d14e5bd5ae47c8f5916d33 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Mon, 21 Sep 2015 19:24:10 +0200
Subject: [PATCH 100/489] setup.cfg: Use universal wheel

---
 setup.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index ffe7c8f94..61207e66d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,3 +6,6 @@ release = egg_info -RDb ''
 
 [pytest]
 norecursedirs = .* _* scripts {args}
+
+[bdist_wheel]
+universal = 1

From d1a6f1a3f2e4e0d11643782f36ed1259337dfcfb Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Thu, 6 Aug 2015 08:10:44 +0200
Subject: [PATCH 101/489] rultor: Linearize commit history on merge

This will make rultor rebase a PR and then fastforwarding the master
branch if a merge action is requested.
---
 .rultor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.rultor.yml b/.rultor.yml
index 087129698..9f313a88f 100644
--- a/.rultor.yml
+++ b/.rultor.yml
@@ -1,2 +1,4 @@
 merge:
+  fast-forward: only
+  rebase: true
   script: echo "Nothing to do (yet)."

From e0cd108ddc56fbc95f28a3d76e55df21ddee34f7 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Thu, 6 Aug 2015 08:16:21 +0200
Subject: [PATCH 102/489] rultor: Run tests on merge

This will revalidate a PR at least naively (i.e. only for one platform
and python version) right before doing the actual merge and thus may
prevent breaking master.
---
 .rultor.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.rultor.yml b/.rultor.yml
index 9f313a88f..d2b7106dd 100644
--- a/.rultor.yml
+++ b/.rultor.yml
@@ -1,4 +1,14 @@
+install:
+  - pip install pytest
+
+docker:
+  as_root: true  # for pip installation
+  image: "coala/rultor-python"
+
 merge:
   fast-forward: only
   rebase: true
-  script: echo "Nothing to do (yet)."
+  script:
+    - pip install .
+    - python setup.py import_cldr
+    - py.test

From 1174bff582e4a8c41bec10b7114aa202a32c6b48 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Tue, 22 Sep 2015 23:21:20 +0200
Subject: [PATCH 103/489] Add CONTRIBUTING

This finally fixes our review process and gives users a bug template.
---
 CONTRIBUTING.md | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..2fa0a6584
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,52 @@
+# Babel Contribution Guidelines
+
+Welcome to Babel! These guidelines will give you a short overview over how we
+handle issues and PRs in this repository. Note that they are preliminary and
+still need proper phrasing - if you'd like to help - be sure to make a PR.
+
+Please know that we do appreciate all contributions - bug reports as well as
+Pull Requests.
+
+## Filing Issues
+
+When filing an issue, please use this template:
+
+```
+# Overview Description
+
+# Steps to Reproduce
+
+1.
+2.
+3.
+
+# Actual Results
+
+# Expected Results
+
+# Reproducibility
+
+# Additional Information:
+
+```
+
+## PR Merge Criteria
+
+For a PR to be merged, the following statements must hold true:
+
+- All CI services pass. (Windows build, linux build, sufficient test coverage.)
+- All commits must have been reviewed and approved by a babel maintainer who is
+  not the author of the PR. Commits shall comply to the "Good Commits" standards
+  outlined below.
+
+## Correcting PRs
+
+Rebasing PRs is preferred over merging master into the source branches again
+and again cluttering our history. If a reviewer has suggestions, the commit
+shall be amended so the history is not cluttered by "fixup commits".
+
+## Writing Good Commits
+
+Please see
+http://coala.readthedocs.org/en/latest/Getting_Involved/Writing_Good_Commits/
+for guidelines on how to write good commits and proper commit messages.

From b6d10186309e6c6bee6292c93c2245d30c9ff989 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Thu, 24 Sep 2015 16:05:14 +0200
Subject: [PATCH 104/489] rultor: Remove test execution

Something's wrong here and we do need to debug that first. So in order
for us  being able to do rultor merges, let's just not execute tests for
now.
---
 .rultor.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.rultor.yml b/.rultor.yml
index d2b7106dd..6267e49ac 100644
--- a/.rultor.yml
+++ b/.rultor.yml
@@ -9,6 +9,4 @@ merge:
   fast-forward: only
   rebase: true
   script:
-    - pip install .
-    - python setup.py import_cldr
-    - py.test
+    - echo "Nothing to do (yet!)"

From 88c978c33c3510e7624d786aabc95dac20ad714f Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Fri, 25 Sep 2015 14:54:47 +0200
Subject: [PATCH 105/489] CHANGES: Update changes from last release

---
 CHANGES | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 16151b77d..d28b0f715 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,9 +8,31 @@ Version 3.0
 
 - Upgraded data to CLDR 26
 - Add official support for Python 3.4
+
+Version 2.2
+-----------
+
+(Bugfix/minor feature release, to be released.)
+
+- TODO
+
+Version 2.1
+-----------
+
+(Bugfix/minor feature release, released on September 25th 2015)
+
+- Fix Locale.parse using ``global.dat`` incompatible types 
+  (https://github.com/python-babel/babel/issues/174)
+- Fix display of negative offsets in ``FixedOffsetTimezone``
+  (https://github.com/python-babel/babel/issues/214)
 - Improved odict performance which is used during localization file
   build, should improve compilation time for large projects
-- Add support for "narrow" format for format_timedelta
+- Add support for "narrow" format for ``format_timedelta``
+- Add universal wheel support
+- Support 'Language' header field in .PO files 
+  (fixes https://github.com/python-babel/babel/issues/76)
+- Test suite enhancements (coverage, broken tests fixed, etc)
+- Documentation updated
 
 Version 2.0
 -----------

From d36d495ca8ff740fcc69aaf4fc9cadac59ce9c91 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Fri, 25 Sep 2015 14:48:12 +0200
Subject: [PATCH 106/489] setup.cfg: Update release alias

We'll want to do a source distribution and a wheel when the release is
triggered.
---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 61207e66d..40a113522 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 tag_date = true
 
 [aliases]
-release = egg_info -RDb ''
+release = sdist bdist_wheel
 
 [pytest]
 norecursedirs = .* _* scripts {args}

From 68e0720e3cd4696c76f0f5f38ad86bc96b445ab9 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Fri, 25 Sep 2015 14:49:09 +0200
Subject: [PATCH 107/489] setup: Use version from babel package

DRY
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index fa77fcc45..ed46467a3 100755
--- a/setup.py
+++ b/setup.py
@@ -10,6 +10,7 @@
 import subprocess
 from setuptools import setup
 
+from babel import __version__
 
 sys.path.append(os.path.join('doc', 'common'))
 try:
@@ -38,7 +39,7 @@ def run(self):
 
 setup(
     name='Babel',
-    version='3.0-dev',
+    version=__version__,
     description='Internationalization utilities',
     long_description=\
 """A collection of tools for internationalizing Python applications.""",

From 43638b27a0a2abf71d636c8c16c1ce0b3c010cc4 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Fri, 25 Sep 2015 19:15:15 +0200
Subject: [PATCH 108/489] babel: Change version to 2.2.0.dev0

We will from now on use the maintenance branches only for bugfix only
releases (i.e. micro versions) to avoid all this backporting. Because of
this, what we develop on master will be the 2.2 version.
---
 babel/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index c977c732d..d2e52599c 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
      negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '3.0-dev'
+__version__ = '2.2.0.dev0'

From 665212002e923500c7d40efc845024ff7a039d19 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Fri, 25 Sep 2015 19:16:48 +0200
Subject: [PATCH 109/489] setup.cfg: Remove date tagging

This would tag every release with the date which is not what we want for
the production releases. We can use dev0 for local releases and generate
a version number including a date for development releases we will
introduce later.
---
 setup.cfg | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 40a113522..38a441db4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,3 @@
-[egg_info]
-tag_date = true
-
 [aliases]
 release = sdist bdist_wheel
 

From d4a1a20de73069ba305820a4cbf934d684d505ca Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Tue, 22 Sep 2015 23:36:20 +0200
Subject: [PATCH 110/489] Revert "Fixed issue #109: `ImportWarning` warned when
 `import babel`"

This reverts commit 7d387f95f4f41ed646bcb2b4fa39dae4a601b6ce.

Another fix will be applied to get rid of #109 because of
https://github.com/python-babel/babel/issues/240 .

Fixes https://github.com/python-babel/babel/issues/240
---
 babel/{localedata/__init__.py => localedata.py} | 12 ++++++------
 babel/localedata/.gitignore                     |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)
 rename babel/{localedata/__init__.py => localedata.py} (94%)

diff --git a/babel/localedata/__init__.py b/babel/localedata.py
similarity index 94%
rename from babel/localedata/__init__.py
rename to babel/localedata.py
index c48b9f586..1d3af9bf8 100644
--- a/babel/localedata/__init__.py
+++ b/babel/localedata.py
@@ -5,8 +5,8 @@
 
     Low-level locale data access.
 
-    :note: The `Locale` class, which uses this module under the hood, provides
-           a more convenient interface for accessing the locale data.
+    :note: The `Locale` class, which uses this module under the hood, provides a
+           more convenient interface for accessing the locale data.
 
     :copyright: (c) 2013 by the Babel Team.
     :license: BSD, see LICENSE for more details.
@@ -21,7 +21,7 @@
 
 _cache = {}
 _cache_lock = threading.RLock()
-_dirname = os.path.dirname(__file__)
+_dirname = os.path.join(os.path.dirname(__file__), 'localedata')
 
 
 def exists(name):
@@ -190,13 +190,13 @@ def __iter__(self):
 
     def __getitem__(self, key):
         orig = val = self._data[key]
-        if isinstance(val, Alias):  # resolve an alias
+        if isinstance(val, Alias): # resolve an alias
             val = val.resolve(self.base)
-        if isinstance(val, tuple):  # Merge a partial dict with an alias
+        if isinstance(val, tuple): # Merge a partial dict with an alias
             alias, others = val
             val = alias.resolve(self.base).copy()
             merge(val, others)
-        if type(val) is dict:  # Return a nested alias-resolving dict
+        if type(val) is dict: # Return a nested alias-resolving dict
             val = LocaleDataDict(val, base=self.base)
         if val is not orig:
             self._data[key] = val
diff --git a/babel/localedata/.gitignore b/babel/localedata/.gitignore
index 2cbf0fc75..72e8ffc0d 100644
--- a/babel/localedata/.gitignore
+++ b/babel/localedata/.gitignore
@@ -1,2 +1 @@
 *
-!__init__.py

From 2d1882edeef621f3bacbfa6af2d7b5a5d34a81f1 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Tue, 22 Sep 2015 23:46:08 +0200
Subject: [PATCH 111/489] localedata: Rename to locale-data

To fix the ImportError because of the name clash with localedata.py.
locale-data is no valid python identifier and thus a nice indicator that
this directory actually contains data.
---
 MANIFEST.in                                  |  2 +-
 Makefile                                     |  2 +-
 babel/{localedata => locale-data}/.gitignore |  0
 babel/localedata.py                          |  2 +-
 scripts/import_cldr.py                       |  2 +-
 setup.py                                     |  2 +-
 tests/test_core.py                           | 14 +++++++-------
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename babel/{localedata => locale-data}/.gitignore (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
index a53a51f14..6c1e7aff4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 include Makefile CHANGES LICENSE AUTHORS
 include conftest.py tox.ini
 include babel/global.dat
-include babel/localedata/*.dat
+include babel/locale-data/*.dat
 recursive-include docs *
 recursive-exclude docs/_build *
 include scripts/*
diff --git a/Makefile b/Makefile
index 12dbb5eb3..74b9a673d 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ import-cldr:
 	@python scripts/download_import_cldr.py
 
 clean-cldr:
-	@rm -f babel/localedata/*.dat
+	@rm -f babel/locale-data/*.dat
 	@rm -f babel/global.dat
 
 clean-pyc:
diff --git a/babel/localedata/.gitignore b/babel/locale-data/.gitignore
similarity index 100%
rename from babel/localedata/.gitignore
rename to babel/locale-data/.gitignore
diff --git a/babel/localedata.py b/babel/localedata.py
index 1d3af9bf8..79b4d8639 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -21,7 +21,7 @@
 
 _cache = {}
 _cache_lock = threading.RLock()
-_dirname = os.path.join(os.path.dirname(__file__), 'localedata')
+_dirname = os.path.join(os.path.dirname(__file__), 'locale-data')
 
 
 def exists(name):
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 789924c20..85132c7e1 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -271,7 +271,7 @@ def main():
             continue
 
         full_filename = os.path.join(srcdir, 'main', filename)
-        data_filename = os.path.join(destdir, 'localedata', stem + '.dat')
+        data_filename = os.path.join(destdir, 'locale-data', stem + '.dat')
 
         data = {}
         if not need_conversion(data_filename, data, full_filename):
diff --git a/setup.py b/setup.py
index ed46467a3..4b8db0270 100755
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@ def run(self):
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     packages=['babel', 'babel.messages', 'babel.localtime'],
-    package_data={'babel': ['global.dat', 'localedata/*.dat']},
+    package_data={'babel': ['global.dat', 'locale-data/*.dat']},
     install_requires=[
         # This version identifier is currently necessary as
         # pytz otherwise does not install on pip 1.4 or
diff --git a/tests/test_core.py b/tests/test_core.py
index a4253d806..a643b36a9 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -288,10 +288,10 @@ def load(filename):
             return Unpickler(f).load()
 
     load('babel/global.dat')
-    load('babel/localedata/root.dat')
-    load('babel/localedata/en.dat')
-    load('babel/localedata/en_US.dat')
-    load('babel/localedata/en_US_POSIX.dat')
-    load('babel/localedata/zh_Hans_CN.dat')
-    load('babel/localedata/zh_Hant_TW.dat')
-    load('babel/localedata/es_419.dat')
+    load('babel/locale-data/root.dat')
+    load('babel/locale-data/en.dat')
+    load('babel/locale-data/en_US.dat')
+    load('babel/locale-data/en_US_POSIX.dat')
+    load('babel/locale-data/zh_Hans_CN.dat')
+    load('babel/locale-data/zh_Hant_TW.dat')
+    load('babel/locale-data/es_419.dat')

From b88e2308972034562e084e06835ad80a8ded83d5 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse@schuirmann.net>
Date: Sat, 26 Sep 2015 18:38:42 +0200
Subject: [PATCH 112/489] CHANGES: Make 2.2 next version

We recently changed branching and this was missing from
43638b27a0a2abf71d636c8c16c1ce0b3c010cc4
---
 CHANGES | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index d28b0f715..61875654b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,21 +1,14 @@
 Babel Changelog
 ===============
 
-Version 3.0
+Version 2.2
 -----------
 
-(release date to be decided; codename to be picked)
+(Feature release, release date to be decided)
 
 - Upgraded data to CLDR 26
 - Add official support for Python 3.4
 
-Version 2.2
------------
-
-(Bugfix/minor feature release, to be released.)
-
-- TODO
-
 Version 2.1
 -----------
 

From 4be8d50bbc21b4eba228b2f1e8706681c9b4354e Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Sat, 26 Sep 2015 21:35:06 +0200
Subject: [PATCH 113/489] CHANGES: Add an older change that was skipped

When merging https://github.com/python-babel/babel/pull/180, the CHANGES file
modification was not performed.
---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 61875654b..79723f7e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,8 @@ Version 2.1
 
 (Bugfix/minor feature release, released on September 25th 2015)
 
+- Parse and honour the locale inheritance exceptions
+  (https://github.com/python-babel/babel/issues/97)
 - Fix Locale.parse using ``global.dat`` incompatible types 
   (https://github.com/python-babel/babel/issues/174)
 - Fix display of negative offsets in ``FixedOffsetTimezone``

From a7e80a22c77371069e3d06b70520d9576e69db3d Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Mon, 17 Nov 2014 17:51:49 +0100
Subject: [PATCH 114/489] Import currency fraction and rounding information

Process and save the <fractions> element of the supplemental data, which
indicates how many decimal places should be displayed for each currency.
---
 scripts/import_cldr.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 85132c7e1..59dfeac6d 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -144,6 +144,7 @@ def main():
         likely_subtags = global_data.setdefault('likely_subtags', {})
         territory_currencies = global_data.setdefault('territory_currencies', {})
         parent_exceptions = global_data.setdefault('parent_exceptions', {})
+        currency_fractions = global_data.setdefault('currency_fractions', {})
 
         # create auxiliary zone->territory map from the windows zones (we don't set
         # the 'zones_territories' map directly here, because there are some zones
@@ -228,6 +229,15 @@ def main():
             for child in paternity.attrib['locales'].split():
                 parent_exceptions[child] = parent
 
+        # Currency decimal and rounding digits
+        for fraction in sup.findall('.//currencyData/fractions/info'):
+            cur_code = fraction.attrib['iso4217']
+            cur_digits = int(fraction.attrib['digits'])
+            cur_rounding = int(fraction.attrib['rounding'])
+            cur_cdigits = int(fraction.attrib.get('cashDigits', cur_digits))
+            cur_crounding = int(fraction.attrib.get('cashRounding', cur_rounding))
+            currency_fractions[cur_code] = (cur_digits, cur_rounding, cur_cdigits, cur_crounding)
+
         outfile = open(global_path, 'wb')
         try:
             pickle.dump(global_data, outfile, 2)

From f7673904a17cbbd4a661a00642602d6b5bb597a7 Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Mon, 17 Nov 2014 18:42:33 +0100
Subject: [PATCH 115/489] numbers: New parameter to override precision

The NumberFormat class uses the amount of decimal digits specified by
the given format.  We want to be able to ignore the amount of decimal
digits under some special circumstances.

Care must be taken since the NumberFormat instances seem to be cached.
---
 babel/numbers.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 0841d2c56..2117ce938 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -602,7 +602,8 @@ def __init__(self, pattern, prefix, suffix, grouping,
     def __repr__(self):
         return '<%s %r>' % (type(self).__name__, self.pattern)
 
-    def apply(self, value, locale, currency=None):
+    def apply(self, value, locale, currency=None, force_frac=None):
+        frac_prec = force_frac or self.frac_prec
         if isinstance(value, float):
             value = Decimal(str(value))
         value *= self.scale
@@ -632,8 +633,7 @@ def apply(self, value, locale, currency=None):
                 exp_sign = get_plus_sign_symbol(locale)
             exp = abs(exp)
             number = u'%s%s%s%s' % \
-                 (self._format_sigdig(value, self.frac_prec[0],
-                                     self.frac_prec[1]),
+                 (self._format_sigdig(value, frac_prec[0], frac_prec[1]),
                   get_exponential_symbol(locale),  exp_sign,
                   self._format_int(str(exp), self.exp_prec[0],
                                    self.exp_prec[1], locale))
@@ -650,12 +650,11 @@ def apply(self, value, locale, currency=None):
             else:
                 number = self._format_int(text, 0, 1000, locale)
         else: # A normal number pattern
-            a, b = split_number(bankersround(abs(value),
-                                             self.frac_prec[1]))
+            a, b = split_number(bankersround(abs(value), frac_prec[1]))
             b = b or '0'
             a = self._format_int(a, self.int_prec[0],
                                  self.int_prec[1], locale)
-            b = self._format_frac(b, locale)
+            b = self._format_frac(b, locale, force_frac)
             number = a + b
         retval = u'%s%s%s' % (self.prefix[is_negative], number,
                                 self.suffix[is_negative])
@@ -705,8 +704,8 @@ def _format_int(self, value, min, max, locale):
             gsize = self.grouping[1]
         return value + ret
 
-    def _format_frac(self, value, locale):
-        min, max = self.frac_prec
+    def _format_frac(self, value, locale, force_frac=None):
+        min, max = force_frac or self.frac_prec
         if len(value) < min:
             value += ('0' * (min - len(value)))
         if max == 0 or (min == 0 and int(value) == 0):

From 201ed50bc0d8a7baf332eb0596d3c2ac944b7b43 Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Mon, 17 Nov 2014 18:24:47 +0100
Subject: [PATCH 116/489] numbers: Use currency decimal digits by default

When formatting a price, the number of decimals to use should be defined
by the currency.  For example, JPY do not use decimal numbers at all.

However, we still allow the user to override the currency decimal digits
setting with the one from the number format.

Fixes https://github.com/mitsuhiko/babel/issues/139
---
 babel/numbers.py      | 30 ++++++++++++++++++++++++++++--
 tests/test_numbers.py | 11 +++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 2117ce938..19a376bea 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -256,7 +256,7 @@ def format_decimal(number, format=None, locale=LC_NUMERIC):
     return pattern.apply(number, locale)
 
 
-def format_currency(number, currency, format=None, locale=LC_NUMERIC):
+def format_currency(number, currency, format=None, locale=LC_NUMERIC, currency_digits=True):
     u"""Return formatted currency value.
 
     >>> format_currency(1099.98, 'USD', locale='en_US')
@@ -276,15 +276,41 @@ def format_currency(number, currency, format=None, locale=LC_NUMERIC):
     >>> format_currency(1099.98, 'EUR', u'#,##0.00 \xa4\xa4\xa4', locale='en_US')
     u'1,099.98 euros'
 
+    Currencies usually have a specific number of decimal digits. This function
+    favours that information over the given format:
+
+    >>> format_currency(1099.98, 'JPY', locale='en_US')
+    u'\\xa51,100'
+    >>> format_currency(1099.98, 'COP', u'#,##0.00', locale='es_ES')
+    u'1.100'
+
+    However, the number of decimal digits can be overriden from the currency
+    information, by setting the last parameter to ``True``:
+
+    >>> format_currency(1099.98, 'JPY', locale='en_US', currency_digits=False)
+    u'\\xa51,099.98'
+    >>> format_currency(1099.98, 'COP', u'#,##0.00', locale='es_ES', currency_digits=False)
+    u'1.099,98'
+
     :param number: the number to format
     :param currency: the currency code
     :param locale: the `Locale` object or locale identifier
+    :param currency_digits: use the currency's number of decimal digits
     """
     locale = Locale.parse(locale)
     if not format:
         format = locale.currency_formats.get(format)
     pattern = parse_pattern(format)
-    return pattern.apply(number, locale, currency=currency)
+    if currency_digits:
+        fractions = get_global('currency_fractions')
+        try:
+            digits = fractions[currency][0]
+        except KeyError:
+            digits = fractions['DEFAULT'][0]
+        frac = (digits, digits)
+    else:
+        frac = None
+    return pattern.apply(number, locale, currency=currency, force_frac=frac)
 
 
 def format_percent(number, format=None, locale=LC_NUMERIC):
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 6fe67c04e..741b75378 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -252,6 +252,17 @@ def test_format_currency():
     assert (numbers.format_currency(1099.98, 'EUR', locale='nl_NL')
             != numbers.format_currency(-1099.98, 'EUR', locale='nl_NL'))
 
+    assert (numbers.format_currency(1099.98, 'JPY', locale='en_US')
+            == u'\xa51,100')
+    assert (numbers.format_currency(1099.98, 'COP', u'#,##0.00', locale='es_ES')
+            == u'1.100')
+    assert (numbers.format_currency(1099.98, 'JPY', locale='en_US',
+                                    currency_digits=False)
+            == u'\xa51,099.98')
+    assert (numbers.format_currency(1099.98, 'COP', u'#,##0.00', locale='es_ES',
+                                    currency_digits=False)
+            == u'1.099,98')
+
 
 def test_format_percent():
     assert numbers.format_percent(0.34, locale='en_US') == u'34%'

From 50fe9c91555a2afa88a13ece617d1e697182501a Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Fri, 28 Aug 2015 21:21:01 +0200
Subject: [PATCH 117/489] Update CHANGES

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 79723f7e6..87394d48a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,8 @@ Version 2.2
 
 - Upgraded data to CLDR 26
 - Add official support for Python 3.4
+- Use the CLDR recommended amount of decimal digits when formatting
+  currencies (https://github.com/python-babel/babel/issues/139)
 
 Version 2.1
 -----------

From df676ab8dbeabb48e2a60ff8da74fc3bee21a979 Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Sun, 16 Aug 2015 11:27:03 +0200
Subject: [PATCH 118/489] numbers: Properly load and expose currency format
 types

The type of the currency format (e.g. "standard", "accounting") was not
interpreted correctly from the CLDR data.  Now there should not be any currency
format identified by "None".

Fixes https://github.com/mitsuhiko/babel/issues/201
---
 babel/core.py          |  4 +++-
 babel/numbers.py       |  6 ++----
 scripts/import_cldr.py | 15 +++++++++++----
 tests/test_core.py     |  4 +++-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 712585856..43d3bc323 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -544,7 +544,9 @@ def decimal_formats(self):
     def currency_formats(self):
         """Locale patterns for currency number formatting.
 
-        >>> print Locale('en', 'US').currency_formats[None]
+        >>> print Locale('en', 'US').currency_formats['standard']
+        <NumberPattern u'\\xa4#,##0.00'>
+        >>> print Locale('en', 'US').currency_formats['accounting']
         <NumberPattern u'\\xa4#,##0.00'>
         """
         return self._data['currency_formats']
diff --git a/babel/numbers.py b/babel/numbers.py
index 19a376bea..672fd226b 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -256,7 +256,7 @@ def format_decimal(number, format=None, locale=LC_NUMERIC):
     return pattern.apply(number, locale)
 
 
-def format_currency(number, currency, format=None, locale=LC_NUMERIC, currency_digits=True):
+def format_currency(number, currency, format='standard', locale=LC_NUMERIC, currency_digits=True):
     u"""Return formatted currency value.
 
     >>> format_currency(1099.98, 'USD', locale='en_US')
@@ -298,9 +298,7 @@ def format_currency(number, currency, format=None, locale=LC_NUMERIC, currency_d
     :param currency_digits: use the currency's number of decimal digits
     """
     locale = Locale.parse(locale)
-    if not format:
-        format = locale.currency_formats.get(format)
-    pattern = parse_pattern(format)
+    pattern = parse_pattern(locale.currency_formats.get(format, format))
     if currency_digits:
         fractions = get_global('currency_fractions')
         try:
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 59dfeac6d..b56d07789 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -586,13 +586,20 @@ def main():
                 numbers.parse_pattern(pattern)
 
         currency_formats = data.setdefault('currency_formats', {})
-        for elem in tree.findall('.//currencyFormats/currencyFormatLength'):
+        for elem in tree.findall('.//currencyFormats/currencyFormatLength/currencyFormat'):
             if ('draft' in elem.attrib or 'alt' in elem.attrib) \
                     and elem.attrib.get('type') in currency_formats:
                 continue
-            pattern = text_type(elem.findtext('currencyFormat/pattern'))
-            currency_formats[elem.attrib.get('type')] = \
-                numbers.parse_pattern(pattern)
+            for child in elem.getiterator():
+                if child.tag == 'alias':
+                    currency_formats[elem.attrib.get('type')] = Alias(
+                        _translate_alias(['currency_formats', elem.attrib['type']],
+                                         child.attrib['path'])
+                    )
+                elif child.tag == 'pattern':
+                    pattern = text_type(child.text)
+                    currency_formats[elem.attrib.get('type')] = \
+                        numbers.parse_pattern(pattern)
 
         percent_formats = data.setdefault('percent_formats', {})
         for elem in tree.findall('.//percentFormats/percentFormatLength'):
diff --git a/tests/test_core.py b/tests/test_core.py
index a643b36a9..9d9548194 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -157,7 +157,9 @@ def test_decimal_formats(self):
         assert Locale('en', 'US').decimal_formats[None].pattern == '#,##0.###'
 
     def test_currency_formats_property(self):
-        assert (Locale('en', 'US').currency_formats[None].pattern ==
+        assert (Locale('en', 'US').currency_formats['standard'].pattern ==
+                u'\xa4#,##0.00')
+        assert (Locale('en', 'US').currency_formats['accounting'].pattern ==
                 u'\xa4#,##0.00')
 
     def test_percent_formats_property(self):

From 15ad946567a35132912329a35225176a8e34d525 Mon Sep 17 00:00:00 2001
From: Craig Loftus <craig@regulusweb.com>
Date: Mon, 17 Aug 2015 10:34:59 +0100
Subject: [PATCH 119/489] Retain the behaviour of format in
 numbers.format_currency

Previous commit introduced an API change by changing the behaviour of
the format param, instead this commit adds a format_type param and the
documentation and tests to accompany it.

Note that currency_formats returns a NumberPattern already, so there is
no need to call parse_pattern on the value returned.
---
 babel/numbers.py      | 34 +++++++++++++++++++++++++++++++---
 tests/test_numbers.py | 18 ++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 672fd226b..bd2e99030 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -256,7 +256,12 @@ def format_decimal(number, format=None, locale=LC_NUMERIC):
     return pattern.apply(number, locale)
 
 
-def format_currency(number, currency, format='standard', locale=LC_NUMERIC, currency_digits=True):
+class UnknownCurrencyFormatError(KeyError):
+    """Exception raised when an unknown currency format is requested."""
+
+
+def format_currency(number, currency, format=None, locale=LC_NUMERIC,
+                    currency_digits=True, format_type='standard'):
     u"""Return formatted currency value.
 
     >>> format_currency(1099.98, 'USD', locale='en_US')
@@ -266,7 +271,7 @@ def format_currency(number, currency, format='standard', locale=LC_NUMERIC, curr
     >>> format_currency(1099.98, 'EUR', locale='de_DE')
     u'1.099,98\\xa0\\u20ac'
 
-    The pattern can also be specified explicitly.  The currency is
+    The format can also be specified explicitly.  The currency is
     placed with the '¤' sign.  As the sign gets repeated the format
     expands (¤ being the symbol, ¤¤ is the currency abbreviation and
     ¤¤¤ is the full name of the currency):
@@ -292,13 +297,36 @@ def format_currency(number, currency, format='standard', locale=LC_NUMERIC, curr
     >>> format_currency(1099.98, 'COP', u'#,##0.00', locale='es_ES', currency_digits=False)
     u'1.099,98'
 
+    If a format is not specified the type of currency format to use
+    from the locale can be specified:
+
+    >>> format_currency(1099.98, 'EUR', locale='en_US', format_type='standard')
+    u'\\u20ac1,099.98'
+
+    When the given currency format type is not available, an exception is
+    raised:
+
+    >>> format_currency('1099.98', 'EUR', locale='root', format_type='unknown')
+    Traceback (most recent call last):
+        ...
+    UnknownCurrencyFormatError: "'unknown' is not a known currency format type"
+
     :param number: the number to format
     :param currency: the currency code
+    :param format: the format string to use
     :param locale: the `Locale` object or locale identifier
     :param currency_digits: use the currency's number of decimal digits
+    :param format_type: the currency format type to use
     """
     locale = Locale.parse(locale)
-    pattern = parse_pattern(locale.currency_formats.get(format, format))
+    if format:
+        pattern = parse_pattern(format)
+    else:
+        try:
+            pattern = locale.currency_formats[format_type]
+        except KeyError:
+            raise UnknownCurrencyFormatError("%r is not a known currency format"
+                                             " type" % format_type)
     if currency_digits:
         fractions = get_global('currency_fractions')
         try:
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 741b75378..a773f48f8 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -251,6 +251,24 @@ def test_format_currency():
             == u'EUR 1,099.98')
     assert (numbers.format_currency(1099.98, 'EUR', locale='nl_NL')
             != numbers.format_currency(-1099.98, 'EUR', locale='nl_NL'))
+    assert (numbers.format_currency(1099.98, 'USD', format=None,
+                                    locale='en_US')
+            == u'$1,099.98')
+
+
+def test_format_currency_format_type():
+    assert (numbers.format_currency(1099.98, 'USD', locale='en_US',
+                                    format_type="standard")
+            == u'$1,099.98')
+
+    assert (numbers.format_currency(1099.98, 'USD', locale='en_US',
+                                    format_type="accounting")
+            == u'$1,099.98')
+
+    with pytest.raises(numbers.UnknownCurrencyFormatError) as excinfo:
+        numbers.format_currency(1099.98, 'USD', locale='en_US',
+                                    format_type='unknown')
+    assert excinfo.value.args[0] == "'unknown' is not a known currency format type"
 
     assert (numbers.format_currency(1099.98, 'JPY', locale='en_US')
             == u'\xa51,100')

From f1195832ffde046c94565b6a47b39312fbca2a6e Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Fri, 28 Aug 2015 20:50:52 +0200
Subject: [PATCH 120/489] Update CHANGES and AUTHORS information

---
 AUTHORS | 2 ++
 CHANGES | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 09d0bc03b..b9208fe59 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,8 @@ Contributors:
 - Nick Retallack <nick@bitcasa.com>
 - Thomas Waldmann <tw@waldmann-edv.de>
 - Lennart Regebro <regebro@gmail.com>
+- Isaac Jurado <diptongo@gmail.com>
+- Craig Loftus <craig@regulusweb.com>
 
 Babel was previously developed under the Copyright of Edgewall Software.  The
 following copyright notice holds true for releases before 2013: "Copyright (c)
diff --git a/CHANGES b/CHANGES
index 87394d48a..77c426c2c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,8 @@ Version 2.2
 - Add official support for Python 3.4
 - Use the CLDR recommended amount of decimal digits when formatting
   currencies (https://github.com/python-babel/babel/issues/139)
+- Properly load and use currency format types
+  (https://github.com/python-babel/babel/issues/201)
 
 Version 2.1
 -----------

From 0e4af920834722c249f06c7f4b9f897250cdbbe2 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Mon, 28 Sep 2015 12:31:26 +0200
Subject: [PATCH 121/489] numbers: Sync docstring with actual examples.

---
 babel/numbers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index bd2e99030..af9413f57 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -290,7 +290,7 @@ def format_currency(number, currency, format=None, locale=LC_NUMERIC,
     u'1.100'
 
     However, the number of decimal digits can be overriden from the currency
-    information, by setting the last parameter to ``True``:
+    information, by setting the last parameter to ``False``:
 
     >>> format_currency(1099.98, 'JPY', locale='en_US', currency_digits=False)
     u'\\xa51,099.98'

From 37ce4faed19243a7c2a0b7554d3138ae06980c6a Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@starleaf.com>
Date: Wed, 30 Sep 2015 19:01:30 +0100
Subject: [PATCH 122/489] Add list_patterns to Locale

---
 babel/core.py          | 13 +++++++++++++
 scripts/import_cldr.py |  7 +++++++
 2 files changed, 20 insertions(+)

diff --git a/babel/core.py b/babel/core.py
index 43d3bc323..7d2425714 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -743,6 +743,19 @@ def plural_form(self):
         """
         return self._data.get('plural_form', _default_plural_rule)
 
+    @property
+    def list_patterns(self):
+        """Patterns for generating lists
+
+        >>> Locale('en').list_patterns['start']
+        u'{0}, {1}'
+        >>> Locale('en').list_patterns['end']
+        u'{0}, and {1}'
+        >>> Locale('en_GB').list_patterns['end']
+        u'{0} and {1}'
+        """
+        return self._data['list_patterns']
+
 
 def default_locale(category=None, aliases=LOCALE_ALIASES):
     """Returns the system default locale for a given category, based on
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index b56d07789..68bf454b6 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -343,6 +343,13 @@ def main():
                 continue
             scripts[elem.attrib['type']] = _text(elem)
 
+        list_patterns = data.setdefault('list_patterns', {})
+        for listType in tree.findall('.//listPatterns/listPattern'):
+            if 'type' in listType.attrib:
+                continue
+            for listPattern in listType.findall('listPatternPart'):
+                list_patterns[listPattern.attrib['type']] = _text(listPattern)
+
         # <dates>
 
         week_data = data.setdefault('week_data', {})

From 6e495cd58364976ac67ffc3e2368298818b95132 Mon Sep 17 00:00:00 2001
From: Joseph Breihan <josephbreihan@gmail.com>
Date: Mon, 5 Oct 2015 01:17:32 -0400
Subject: [PATCH 123/489] documentation: Correct timezone in example.

Update example in Date and Time documentation to reflect metazone
translation.

Fixes https://github.com/python-babel/babel/issues/108
---
 docs/dates.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/dates.rst b/docs/dates.rst
index 818a3941b..f35ee15f7 100644
--- a/docs/dates.rst
+++ b/docs/dates.rst
@@ -352,7 +352,7 @@ functions in the ``babel.dates`` module, most importantly the
 
     >>> tz = get_timezone('Europe/Berlin')
     >>> get_timezone_name(tz, locale=Locale.parse('pt_PT'))
-    u'Hor\xe1rio Alemanha'
+    u'Hora da Europa Central'
 
 You can pass the function either a ``datetime.tzinfo`` object, or a
 ``datetime.date`` or ``datetime.datetime`` object. If you pass an actual date,

From 6ec5679c6d647243b3cefe15af23486c573544a3 Mon Sep 17 00:00:00 2001
From: "Todd M. Guerra" <toddguerra@gmail.com>
Date: Wed, 30 Sep 2015 16:11:06 -0400
Subject: [PATCH 124/489] setup: change to using include_package_data

Instead of manually writing includes to various package data,
we now just set include_package_data to True to make it more efficient.
Reference: http://pythonhosted.org/setuptools/setuptools.html#new-and-changed-setup-keywords

Fixes https://github.com/python-babel/babel/issues/260
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 4b8db0270..83cd65170 100755
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@ def run(self):
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     packages=['babel', 'babel.messages', 'babel.localtime'],
-    package_data={'babel': ['global.dat', 'locale-data/*.dat']},
+    include_package_data=True,
     install_requires=[
         # This version identifier is currently necessary as
         # pytz otherwise does not install on pip 1.4 or

From be6e23d1bd14d74ded228fab6f640fab51970fce Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@starleaf.com>
Date: Thu, 1 Oct 2015 14:38:58 +0100
Subject: [PATCH 125/489] Add format_list function

---
 babel/lists.py      | 48 +++++++++++++++++++++++++++++++++++++++++++++
 tests/test_lists.py | 14 +++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 babel/lists.py
 create mode 100644 tests/test_lists.py

diff --git a/babel/lists.py b/babel/lists.py
new file mode 100644
index 000000000..6e6fbd192
--- /dev/null
+++ b/babel/lists.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+"""
+    babel.lists
+    ~~~~~~~~~~~
+
+    Locale dependent formatting of lists.
+
+    The default locale for the functions in this module is determined by the
+    following environment variables, in that order:
+
+     * ``LC_ALL``, and
+     * ``LANG``
+
+    :copyright: (c) 2015 by the Babel Team.
+    :license: BSD, see LICENSE for more details.
+"""
+
+from babel.core import Locale, default_locale
+
+DEFAULT_LOCALE = default_locale()
+
+
+def format_list(lst, locale=DEFAULT_LOCALE):
+    """ Formats `lst` as a list
+
+    e.g.
+    >>> format_list(['apples', 'oranges', 'pears'], 'en')
+    u'apples, oranges, and pears'
+    >>> format_list(['apples', 'oranges', 'pears'], 'zh')
+    u'apples\u3001oranges\u548cpears'
+
+    :param lst: a sequence of items to format in to a list
+    :param locale: the locale
+    """
+    locale = Locale.parse(locale)
+    if not lst:
+        return ''
+    if len(lst) == 1:
+        return lst[0]
+    if len(lst) == 2:
+        return locale.list_patterns['2'].format(*lst)
+
+    result = locale.list_patterns['start'].format(lst[0], lst[1])
+    for elem in lst[2:-1]:
+        result = locale.list_patterns['middle'].format(result, elem)
+    result = locale.list_patterns['end'].format(result, lst[-1])
+
+    return result
diff --git a/tests/test_lists.py b/tests/test_lists.py
new file mode 100644
index 000000000..f5021ea50
--- /dev/null
+++ b/tests/test_lists.py
@@ -0,0 +1,14 @@
+# coding=utf-8
+from babel import lists
+
+
+def test_format_list():
+    for list, locale, expected in [
+        ([], 'en', ''),
+        ([u'string'], 'en', u'string'),
+        (['string1', 'string2'], 'en', u'string1 and string2'),
+        (['string1', 'string2', 'string3'], 'en', u'string1, string2, and string3'),
+        (['string1', 'string2', 'string3'], 'zh', u'string1、string2和string3'),
+        (['string1', 'string2', 'string3', 'string4'], 'ne', u'string1 र string2, string3 र string4'),
+    ]:
+        assert lists.format_list(list, locale=locale) == expected

From 85f8eba6122c10bc6b19aa964cf485b366690884 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Wed, 14 Oct 2015 12:56:27 +0200
Subject: [PATCH 126/489] README: Make it markdown

This way GitHub (and many other UIs and editors) will render the
document more nicely.
---
 README => README.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename README => README.md (100%)

diff --git a/README b/README.md
similarity index 100%
rename from README
rename to README.md

From 417ec3c695c80e6d88e09fed22c0495fa838f561 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Wed, 14 Oct 2015 13:08:24 +0200
Subject: [PATCH 127/489] README: Add contribution note

---
 README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/README.md b/README.md
index f329291b3..4fa81e609 100644
--- a/README.md
+++ b/README.md
@@ -12,3 +12,13 @@ For more information please visit the Babel web site:
   <http://babel.pocoo.org/>
 
 Join the chat at https://gitter.im/python-babel/babel
+
+Contributing to Babel
+=====================
+
+If you want to contribute code to Babel, please take a look at our
+CONTRIBUTING.md.
+
+If you know your way around Babels codebase a bit and like to help further, we
+would appreciate any help in reviewing pull requests. Please contact us at
+<https://gitter.im/python-babel/babel> if you're interested!

From 41f8faac068e5ca296f92f735f33fb58db5aff6a Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Sun, 4 Oct 2015 20:36:02 +0200
Subject: [PATCH 128/489] numbers: Implement rounding with Decimal

Drop the old bankersround related code and implement rounding using the decimal
module instead.  This change will enable some other goodies such as: use the
drop-in replacement cdecimal when available, or allow for more rounding
algorithms by exposing one more parameter.
---
 babel/numbers.py      | 205 +++++++++++++-----------------------------
 tests/test_numbers.py |  20 -----
 2 files changed, 60 insertions(+), 165 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index af9413f57..f92c714ca 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -18,10 +18,9 @@
 # TODO:
 #  Padding and rounding increments in pattern:
 #  - http://www.unicode.org/reports/tr35/ (Appendix G.6)
-from decimal import Decimal, InvalidOperation
-import math
 import re
 from datetime import date as date_, datetime as datetime_
+from decimal import Decimal, InvalidOperation, ROUND_HALF_EVEN
 
 from babel.core import default_locale, Locale, get_global
 from babel._compat import range_type
@@ -455,94 +454,6 @@ def parse_decimal(string, locale=LC_NUMERIC):
 number_re = re.compile(r"%s%s%s" % (PREFIX_PATTERN, NUMBER_PATTERN,
                                     SUFFIX_PATTERN))
 
-def split_number(value):
-    """Convert a number into a (intasstring, fractionasstring) tuple"""
-    if isinstance(value, Decimal):
-        # NB can't just do text = str(value) as str repr of Decimal may be
-        # in scientific notation, e.g. for small numbers.
-
-        sign, digits, exp = value.as_tuple()
-        # build list of digits in reverse order, then reverse+join
-        # as per http://docs.python.org/library/decimal.html#recipes
-        int_part = []
-        frac_part = []
-
-        digits = list(map(str, digits))
-
-        # get figures after decimal point
-        for i in range(-exp):
-            # add digit if available, else 0
-            if digits:
-                frac_part.append(digits.pop())
-            else:
-                frac_part.append('0')
-
-        # add in some zeroes...
-        for i in range(exp):
-            int_part.append('0')
-
-        # and the rest
-        while digits:
-            int_part.append(digits.pop())
-
-        # if < 1, int_part must be set to '0'
-        if len(int_part) == 0:
-            int_part = '0',
-
-        if sign:
-            int_part.append('-')
-
-        return ''.join(reversed(int_part)), ''.join(reversed(frac_part))
-    text = ('%.9f' % value).rstrip('0')
-    if '.' in text:
-        a, b = text.split('.', 1)
-        if b == '0':
-            b = ''
-    else:
-        a, b = text, ''
-    return a, b
-
-
-def bankersround(value, ndigits=0):
-    """Round a number to a given precision.
-
-    Works like round() except that the round-half-even (banker's rounding)
-    algorithm is used instead of round-half-up.
-
-    >>> bankersround(5.5, 0)
-    6.0
-    >>> bankersround(6.5, 0)
-    6.0
-    >>> bankersround(-6.5, 0)
-    -6.0
-    >>> bankersround(1234.0, -2)
-    1200.0
-    """
-    sign = int(value < 0) and -1 or 1
-    value = abs(value)
-    a, b = split_number(value)
-    digits = a + b
-    add = 0
-    i = len(a) + ndigits
-    if i < 0 or i >= len(digits):
-        pass
-    elif digits[i] > '5':
-        add = 1
-    elif digits[i] == '5' and digits[i-1] in '13579':
-        add = 1
-    elif digits[i] == '5':     # previous digit is even
-        # We round up unless all following digits are zero.
-        for j in range_type(i + 1, len(digits)):
-            if digits[j] != '0':
-                add = 1
-                break
-
-    scale = 10**ndigits
-    if isinstance(value, Decimal):
-        return Decimal(int(value * scale + add)) / scale * sign
-    else:
-        return float(int(value * scale + add)) / scale * sign
-
 
 def parse_grouping(p):
     """Parse primary and secondary digit grouping
@@ -645,35 +556,30 @@ def __init__(self, pattern, prefix, suffix, grouping,
         self.exp_prec = exp_prec
         self.exp_plus = exp_plus
         if '%' in ''.join(self.prefix + self.suffix):
-            self.scale = 100
+            self.scale = 2
         elif u'‰' in ''.join(self.prefix + self.suffix):
-            self.scale = 1000
+            self.scale = 3
         else:
-            self.scale = 1
+            self.scale = 0
 
     def __repr__(self):
         return '<%s %r>' % (type(self).__name__, self.pattern)
 
     def apply(self, value, locale, currency=None, force_frac=None):
         frac_prec = force_frac or self.frac_prec
-        if isinstance(value, float):
+        if not isinstance(value, Decimal):
             value = Decimal(str(value))
-        value *= self.scale
-        is_negative = int(value < 0)
+        value = value.scaleb(self.scale)
+        is_negative = int(value.is_signed())
         if self.exp_prec: # Scientific notation
+            exp = value.adjusted()
             value = abs(value)
-            if value:
-                exp = int(math.floor(math.log(value, 10)))
-            else:
-                exp = 0
             # Minimum number of integer digits
             if self.int_prec[0] == self.int_prec[1]:
                 exp -= self.int_prec[0] - 1
             # Exponent grouping
             elif self.int_prec[1]:
                 exp = int(exp / self.int_prec[1]) * self.int_prec[1]
-            if not isinstance(value, Decimal):
-                value = float(value)
             if exp < 0:
                 value = value * 10**(-exp)
             else:
@@ -685,29 +591,25 @@ def apply(self, value, locale, currency=None, force_frac=None):
                 exp_sign = get_plus_sign_symbol(locale)
             exp = abs(exp)
             number = u'%s%s%s%s' % \
-                 (self._format_sigdig(value, frac_prec[0], frac_prec[1]),
+                 (self._format_significant(value, frac_prec[0], frac_prec[1]),
                   get_exponential_symbol(locale),  exp_sign,
                   self._format_int(str(exp), self.exp_prec[0],
                                    self.exp_prec[1], locale))
         elif '@' in self.pattern: # Is it a siginificant digits pattern?
-            text = self._format_sigdig(abs(value),
-                                      self.int_prec[0],
-                                      self.int_prec[1])
-            if '.' in text:
-                a, b = text.split('.')
-                a = self._format_int(a, 0, 1000, locale)
-                if b:
-                    b = get_decimal_symbol(locale) + b
-                number = a + b
-            else:
-                number = self._format_int(text, 0, 1000, locale)
+            text = self._format_significant(abs(value),
+                                            self.int_prec[0],
+                                            self.int_prec[1])
+            a, sep, b = text.partition(".")
+            number = self._format_int(a, 0, 1000, locale)
+            if sep:
+                number += get_decimal_symbol(locale) + b
         else: # A normal number pattern
-            a, b = split_number(bankersround(abs(value), frac_prec[1]))
-            b = b or '0'
-            a = self._format_int(a, self.int_prec[0],
-                                 self.int_prec[1], locale)
-            b = self._format_frac(b, locale, force_frac)
-            number = a + b
+            precision = Decimal('1.' + '1' * frac_prec[1])
+            rounded = value.quantize(precision, ROUND_HALF_EVEN)
+            a, sep, b = str(abs(rounded)).partition(".")
+            number = (self._format_int(a, self.int_prec[0],
+                                       self.int_prec[1], locale) +
+                      self._format_frac(b or '0', locale, force_frac))
         retval = u'%s%s%s' % (self.prefix[is_negative], number,
                                 self.suffix[is_negative])
         if u'¤' in retval:
@@ -717,31 +619,44 @@ def apply(self, value, locale, currency=None, force_frac=None):
             retval = retval.replace(u'¤', get_currency_symbol(currency, locale))
         return retval
 
-    def _format_sigdig(self, value, min, max):
-        """Convert value to a string.
-
-        The resulting string will contain between (min, max) number of
-        significant digits.
-        """
-        a, b = split_number(value)
-        ndecimals = len(a)
-        if a == '0' and b != '':
-            ndecimals = 0
-            while b.startswith('0'):
-                b = b[1:]
-                ndecimals -= 1
-        a, b = split_number(bankersround(value, max - ndecimals))
-        digits = len((a + b).lstrip('0'))
-        if not digits:
-            digits = 1
-        # Figure out if we need to add any trailing '0':s
-        if len(a) >= max and a != '0':
-            return a
-        if digits < min:
-            b += ('0' * (min - digits))
-        if b:
-            return '%s.%s' % (a, b)
-        return a
+    #
+    # This is one tricky piece of code.  The idea is to rely as much as possible
+    # on the decimal module to minimize the amount of code.
+    #
+    # Conceptually, the implementation of this method can be summarized in the
+    # following steps:
+    #
+    #   - Move or shift the decimal point (i.e. the exponent) so the maximum
+    #     amount of significant digits fall into the integer part (i.e. to the
+    #     left of the decimal point)
+    #
+    #   - Round the number to the nearest integer, discarding all the fractional
+    #     part which contained extra digits to be eliminated
+    #
+    #   - Convert the rounded integer to a string, that will contain the final
+    #     sequence of significant digits already trimmed to the maximum
+    #
+    #   - Restore the original position of the decimal point, potentially
+    #     padding with zeroes on either side
+    #
+    def _format_significant(self, value, minimum, maximum):
+        exp = value.adjusted()
+        scale = maximum - 1 - exp
+        digits = str(value.scaleb(scale).quantize(Decimal(1), ROUND_HALF_EVEN))
+        if scale <= 0:
+            result = digits + '0' * -scale
+        else:
+            intpart = digits[:-scale]
+            i = len(intpart)
+            j = i + max(minimum - i, 0)
+            result = "{intpart}.{pad:0<{fill}}{fracpart}{fracextra}".format(
+                    intpart=intpart or '0',
+                    pad='',
+                    fill=-min(exp + 1, 0),
+                    fracpart=digits[i:j],
+                    fracextra=digits[j:].rstrip('0'),
+            ).rstrip('.')
+        return result
 
     def _format_int(self, value, min, max, locale):
         width = len(value)
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index a773f48f8..fd3e7c815 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -151,19 +151,6 @@ def test_formatting_of_very_small_decimals(self):
         self.assertEqual('0.000000700', fmt)
 
 
-class BankersRoundTestCase(unittest.TestCase):
-    def test_round_to_nearest_integer(self):
-        self.assertEqual(1, numbers.bankersround(Decimal('0.5001')))
-
-    def test_round_to_even_for_two_nearest_integers(self):
-        self.assertEqual(0, numbers.bankersround(Decimal('0.5')))
-        self.assertEqual(2, numbers.bankersround(Decimal('1.5')))
-        self.assertEqual(-2, numbers.bankersround(Decimal('-2.5')))
-
-        self.assertEqual(0, numbers.bankersround(Decimal('0.05'), ndigits=1))
-        self.assertEqual(Decimal('0.2'), numbers.bankersround(Decimal('0.15'), ndigits=1))
-
-
 class NumberParsingTestCase(unittest.TestCase):
     def test_can_parse_decimals(self):
         self.assertEqual(Decimal('1099.98'),
@@ -320,13 +307,6 @@ def test_parse_decimal():
     assert excinfo.value.args[0] == "'2,109,998' is not a valid decimal number"
 
 
-def test_bankersround():
-    assert numbers.bankersround(5.5, 0) == 6.0
-    assert numbers.bankersround(6.5, 0) == 6.0
-    assert numbers.bankersround(-6.5, 0) == -6.0
-    assert numbers.bankersround(1234.0, -2) == 1200.0
-
-
 def test_parse_grouping():
     assert numbers.parse_grouping('##') == (1000, 1000)
     assert numbers.parse_grouping('#,###') == (3, 3)

From 4dc13017aaaaa1dd63fe87e7dbb41e4462be8f88 Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Wed, 14 Oct 2015 19:49:22 +0200
Subject: [PATCH 129/489] tests: Add more testing coverage to format_percent

---
 tests/test_numbers.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index fd3e7c815..0d8fa00fc 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -271,6 +271,8 @@ def test_format_currency_format_type():
 
 def test_format_percent():
     assert numbers.format_percent(0.34, locale='en_US') == u'34%'
+    assert numbers.format_percent(0.34, u'##0%', locale='en_US') == u'34%'
+    assert numbers.format_percent(34, u'##0', locale='en_US') == u'34'
     assert numbers.format_percent(25.1234, locale='en_US') == u'2,512%'
     assert (numbers.format_percent(25.1234, locale='sv_SE')
             == u'2\xa0512\xa0%')

From d177d5eb746693e0e7bb861ece87a4824008c649 Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Sun, 11 Oct 2015 14:20:01 +0200
Subject: [PATCH 130/489] travis: Add new environments that install cdecimal

For the next change, we will need alternate environments for Python 2.6 and 2.7
where the cdecimal module can be installed and tested.  This commit adds new
environments to Tox and Travis to automate the process.
---
 .travis.yml | 24 +++++++++++++++++++++++-
 tox.ini     |  5 ++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c7a79b1be..d25ad5f2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,16 @@ matrix:
   include:
     - os: linux
       python: 2.6
+    - os: linux
+      python: 2.6
+      env:
+      - CDECIMAL=cdecimal
     - os: linux
       python: 2.7
+    - os: linux
+      python: 2.7
+      env:
+      - CDECIMAL=cdecimal
     - os: linux
       python: pypy
     - os: linux
@@ -25,12 +33,26 @@ matrix:
       - PYTHON_VERSION=2.6.6
       - PYENV_ROOT=~/.pyenv
       - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=2.6.6
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+      - CDECIMAL=cdecimal
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=2.7.10
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
     - os: osx
       language: generic
       env:
       - PYTHON_VERSION=2.7.10
       - PYENV_ROOT=~/.pyenv
       - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+      - CDECIMAL=cdecimal
     - os: osx
       language: generic
       env:
@@ -53,7 +75,7 @@ matrix:
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
-  - pip install pytest pytest-cov
+  - pip install --allow-external cdecimal pytest pytest-cov $CDECIMAL
   - pip install --editable .
 
 script:
diff --git a/tox.ini b/tox.ini
index 311da6e6f..a5b23e41d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,11 @@
 [tox]
-envlist = py26, py27, pypy, py33, py34
+envlist = py26, py27, pypy, py33, py34, py26-cdecimal, py27-cdecimal
 
 [testenv]
+install_command =
+    pip install --allow-external cdecimal {opts} {packages}
 deps =
     pytest
+    cdecimal: cdecimal
 whitelist_externals = make
 commands = make clean-cldr test

From b6169be329e121111dc9c3242c3538ee3b0a3aaa Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Sun, 4 Oct 2015 20:49:23 +0200
Subject: [PATCH 131/489] numbers: Use cdecimal by default when available

The drop-in replacement cdecimal is a CPython extension that implements the same
decimal interface with a much better performance.  Whenever it is installed, we
favour its use.
---
 babel/_compat.py | 19 +++++++++++++++++++
 babel/numbers.py |  3 +--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/babel/_compat.py b/babel/_compat.py
index 0f7640de1..78cd35a37 100644
--- a/babel/_compat.py
+++ b/babel/_compat.py
@@ -54,3 +54,22 @@
 
 
 number_types = integer_types + (float,)
+
+
+#
+# Use cdecimal when available
+#
+from decimal import (Decimal as _dec,
+                     InvalidOperation as _invop,
+                     ROUND_HALF_EVEN as _RHE)
+try:
+    from cdecimal import (Decimal as _cdec,
+                          InvalidOperation as _cinvop,
+                          ROUND_HALF_EVEN as _CRHE)
+    Decimal = _cdec
+    InvalidOperation = (_invop, _cinvop)
+    ROUND_HALF_EVEN = _CRHE
+except ImportError:
+    Decimal = _dec
+    InvalidOperation = _invop
+    ROUND_HALF_EVEN = _RHE
diff --git a/babel/numbers.py b/babel/numbers.py
index f92c714ca..a15f399bb 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -20,10 +20,9 @@
 #  - http://www.unicode.org/reports/tr35/ (Appendix G.6)
 import re
 from datetime import date as date_, datetime as datetime_
-from decimal import Decimal, InvalidOperation, ROUND_HALF_EVEN
 
 from babel.core import default_locale, Locale, get_global
-from babel._compat import range_type
+from babel._compat import range_type, Decimal, InvalidOperation, ROUND_HALF_EVEN
 
 
 LC_NUMERIC = default_locale('LC_NUMERIC')

From fe77bb3e66a7838b119e6b8ca92c2e0396ed84dd Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Sun, 11 Oct 2015 14:26:04 +0200
Subject: [PATCH 132/489] tests: Use the automatically chosen Decimal class

Now that the babel._compat module can automatically select a faster decimal
implementation if available, be more consistent across the rest of the code when
dealing with Decimal instances.
---
 babel/plural.py       |  7 ++++---
 tests/test_numbers.py |  2 +-
 tests/test_plural.py  | 23 ++++++++++++-----------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index 50bf54181..b5ce9ba65 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -8,10 +8,11 @@
     :copyright: (c) 2013 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
-import decimal
 import re
 import sys
 
+from babel._compat import Decimal
+
 
 _plural_tags = ('zero', 'one', 'two', 'few', 'many', 'other')
 _fallback_tag = 'other'
@@ -32,9 +33,9 @@ def extract_operands(source):
             # 2.6's Decimal cannot convert from float directly
             if sys.version_info < (2, 7):
                 n = str(n)
-            n = decimal.Decimal(n)
+            n = Decimal(n)
 
-    if isinstance(n, decimal.Decimal):
+    if isinstance(n, Decimal):
         dec_tuple = n.as_tuple()
         exp = dec_tuple.exponent
         fraction_digits = dec_tuple.digits[exp:] if exp < 0 else ()
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 0d8fa00fc..f042833b3 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -11,13 +11,13 @@
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
 
-from decimal import Decimal
 import unittest
 import pytest
 
 from datetime import date
 
 from babel import numbers
+from babel._compat import Decimal
 
 
 class FormatDecimalTestCase(unittest.TestCase):
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 278b5dba8..b0cad8da2 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -10,10 +10,11 @@
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
-import decimal
 import unittest
 import pytest
+
 from babel import plural
+from babel._compat import Decimal
 
 
 def test_plural_rule():
@@ -33,29 +34,29 @@ def test_plural_rule_operands_i():
 
 def test_plural_rule_operands_v():
     rule = plural.PluralRule({'one': 'v is 2'})
-    assert rule(decimal.Decimal('1.20')) == 'one'
-    assert rule(decimal.Decimal('1.2')) == 'other'
+    assert rule(Decimal('1.20')) == 'one'
+    assert rule(Decimal('1.2')) == 'other'
     assert rule(2) == 'other'
 
 
 def test_plural_rule_operands_w():
     rule = plural.PluralRule({'one': 'w is 2'})
-    assert rule(decimal.Decimal('1.23')) == 'one'
-    assert rule(decimal.Decimal('1.20')) == 'other'
+    assert rule(Decimal('1.23')) == 'one'
+    assert rule(Decimal('1.20')) == 'other'
     assert rule(1.2) == 'other'
 
 
 def test_plural_rule_operands_f():
     rule = plural.PluralRule({'one': 'f is 20'})
-    assert rule(decimal.Decimal('1.23')) == 'other'
-    assert rule(decimal.Decimal('1.20')) == 'one'
+    assert rule(Decimal('1.23')) == 'other'
+    assert rule(Decimal('1.20')) == 'one'
     assert rule(1.2) == 'other'
 
 
 def test_plural_rule_operands_t():
     rule = plural.PluralRule({'one': 't = 5'})
-    assert rule(decimal.Decimal('1.53')) == 'other'
-    assert rule(decimal.Decimal('1.50')) == 'one'
+    assert rule(Decimal('1.53')) == 'other'
+    assert rule(Decimal('1.50')) == 'one'
     assert rule(1.5) == 'one'
 
 
@@ -250,6 +251,6 @@ def test_or_and(self):
 
 @pytest.mark.parametrize('source,n,i,v,w,f,t', EXTRACT_OPERANDS_TESTS)
 def test_extract_operands(source, n, i, v, w, f, t):
-    source = decimal.Decimal(source) if isinstance(source, str) else source
+    source = Decimal(source) if isinstance(source, str) else source
     assert (plural.extract_operands(source) ==
-            decimal.Decimal(n), i, v, w, f, t)
+            Decimal(n), i, v, w, f, t)

From 531f666c163cfa406dfcb6545027001018995051 Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@gmail.com>
Date: Wed, 21 Oct 2015 22:01:59 +0100
Subject: [PATCH 133/489] plurals: Fix selection for chinese

Provide only one option in chinese. The 3 previous options where all the
same any how and I've checked with a chinese colleague she thinks that
applies to all variants on the chinese language.

Refactor the get_plural tests a bit so they are split up to test specific
things
---
 babel/messages/plurals.py      |  6 ++----
 tests/messages/test_plurals.py | 27 ++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
index c00a21108..05f91102b 100644
--- a/babel/messages/plurals.py
+++ b/babel/messages/plurals.py
@@ -192,10 +192,8 @@
     'vi': (1, '0'),
     # Xhosa - From Pootle's PO's
     'xh': (2, '(n != 1)'),
-    # Chinese - From Pootle's PO's
-    'zh_CN': (1, '0'),
-    'zh_HK': (1, '0'),
-    'zh_TW': (1, '0'),
+    # Chinese - From Pootle's PO's (modified)
+    'zh': (1, '0'),
 }
 
 
diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py
index 9466decfc..8c11745ff 100644
--- a/tests/messages/test_plurals.py
+++ b/tests/messages/test_plurals.py
@@ -10,17 +10,34 @@
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
+import pytest
 
-import doctest
-import unittest
-
+from babel import Locale
 from babel.messages import plurals
 
 
-def test_get_plural():
-    assert plurals.get_plural(locale='en') == (2, '(n != 1)')
+@pytest.mark.parametrize(('locale', 'num_plurals', 'plural_expr'), [
+    (Locale('en'), 2, '(n != 1)'),
+    (Locale('en', 'US'), 2, '(n != 1)'),
+    (Locale('zh'), 1, '0'),
+    (Locale('zh', script='Hans'), 1, '0'),
+    (Locale('zh', script='Hant'), 1, '0'),
+    (Locale('zh', 'CN', 'Hans'), 1, '0'),
+    (Locale('zh', 'TW', 'Hant'), 1, '0'),
+])
+def test_get_plural_selection(locale, num_plurals, plural_expr):
+    assert plurals.get_plural(locale) == (num_plurals, plural_expr)
+
+
+def test_get_plural_accpets_strings():
     assert plurals.get_plural(locale='ga') == (3, '(n==1 ? 0 : n==2 ? 1 : 2)')
 
+
+def test_get_plural_falls_back_to_default():
+    assert plurals.get_plural('aa') == (2, '(n != 1)')
+
+
+def test_plural_tuple_attributes():
     tup = plurals.get_plural("ja")
     assert tup.num_plurals == 1
     assert tup.plural_expr == '0'

From b3f3430d2e77871fdca0b119adf0b22b9140ffa2 Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@starleaf.com>
Date: Wed, 30 Sep 2015 18:57:30 +0100
Subject: [PATCH 134/489] Add an ordinal_form property to Locale

---
 babel/core.py          | 17 +++++++++++++++++
 scripts/import_cldr.py | 26 +++++++++++++++++---------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 7d2425714..0b314cd3a 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -756,6 +756,23 @@ def list_patterns(self):
         """
         return self._data['list_patterns']
 
+    @property
+    def ordinal_form(self):
+        """Plural rules for the locale.
+
+        >>> Locale('en').ordinal_form(1)
+        'one'
+        >>> Locale('en').ordinal_form(2)
+        'two'
+        >>> Locale('en').ordinal_form(3)
+        'few'
+        >>> Locale('fr').ordinal_form(2)
+        'other'
+        >>> Locale('ru').ordinal_form(100)
+        'other'
+        """
+        return self._data.get('ordinal_form', _default_plural_rule)
+
 
 def default_locale(category=None, aliases=LOCALE_ALIASES):
     """Returns the system default locale for a given category, based on
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 68bf454b6..d179604c1 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -109,6 +109,19 @@ def _currency_sort_key(tup):
     return int(not tender), start or (1, 1, 1)
 
 
+def _extract_plural_rules(file_path):
+    rule_dict = {}
+    prsup = parse(file_path)
+    for elem in prsup.findall('.//plurals/pluralRules'):
+        rules = []
+        for rule in elem.findall('pluralRule'):
+            rules.append((rule.attrib['count'], text_type(rule.text)))
+        pr = PluralRule(rules)
+        for locale in elem.attrib['locales'].split():
+            rule_dict[locale] = pr
+    return rule_dict
+
+
 def main():
     parser = OptionParser(usage='%prog path/to/cldr')
     options, args = parser.parse_args()
@@ -260,15 +273,8 @@ def main():
             containers.add(group)
 
     # prepare the per-locale plural rules definitions
-    plural_rules = {}
-    prsup = parse(os.path.join(srcdir, 'supplemental', 'plurals.xml'))
-    for elem in prsup.findall('.//plurals/pluralRules'):
-        rules = []
-        for rule in elem.findall('pluralRule'):
-            rules.append((rule.attrib['count'], text_type(rule.text)))
-        pr = PluralRule(rules)
-        for locale in elem.attrib['locales'].split():
-            plural_rules[locale] = pr
+    plural_rules = _extract_plural_rules(os.path.join(srcdir, 'supplemental', 'plurals.xml'))
+    ordinal_rules = _extract_plural_rules(os.path.join(srcdir, 'supplemental', 'ordinals.xml'))
 
     filenames = os.listdir(os.path.join(srcdir, 'main'))
     filenames.remove('root.xml')
@@ -312,6 +318,8 @@ def main():
         ]))
         if locale_id in plural_rules:
             data['plural_form'] = plural_rules[locale_id]
+        if locale_id in ordinal_rules:
+            data['ordinal_form'] = ordinal_rules[locale_id]
 
         # <localeDisplayNames>
 

From 79bc78182f82c44ea40b5d182b69f321e8da4373 Mon Sep 17 00:00:00 2001
From: Florian Schulze <florian.schulze@gmx.net>
Date: Wed, 4 Nov 2015 19:08:10 +0100
Subject: [PATCH 135/489] Allow file locations without line numbers.

---
 babel/messages/pofile.py      | 12 +++++++++---
 tests/messages/test_pofile.py | 17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 3d7dc3283..41fad0a8a 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -218,6 +218,8 @@ def _process_message_line(lineno, line):
                         except ValueError:
                             continue
                         locations.append((location[:pos], lineno))
+                    else:
+                        locations.append((location, None))
             elif line[1:].startswith(','):
                 for flag in line[2:].lstrip().split(','):
                     flags.append(flag.strip())
@@ -449,9 +451,13 @@ def _write_message(message, prefix=''):
             _write_comment(comment, prefix='.')
 
         if not no_location:
-            locs = u' '.join([u'%s:%d' % (filename.replace(os.sep, '/'), lineno)
-                              for filename, lineno in message.locations])
-            _write_comment(locs, prefix=':')
+            locs = []
+            for filename, lineno in message.locations:
+                if lineno:
+                    locs.append(u'%s:%d' % (filename.replace(os.sep, '/'), lineno))
+                else:
+                    locs.append(u'%s' % filename.replace(os.sep, '/'))
+            _write_comment(' '.join(locs), prefix=':')
         if message.flags:
             _write('#%s\n' % ', '.join([''] + sorted(message.flags)))
 
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 3bb055714..4e991c63c 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -513,6 +513,21 @@ def test_sorted_po(self):
 msgstr[1] "Voeh"''' in value
         assert value.find(b'msgid ""') < value.find(b'msgid "bar"') < value.find(b'msgid "foo"')
 
+    def test_file_with_no_lineno(self):
+        catalog = Catalog()
+        catalog.add(u'bar', locations=[('utils.py', None)],
+                    user_comments=['Comment About `bar` with',
+                                   'multiple lines.'])
+        buf = BytesIO()
+        pofile.write_po(buf, catalog, sort_output=True)
+        value = buf.getvalue().strip()
+        assert b'''\
+# Comment About `bar` with
+# multiple lines.
+#: utils.py
+msgid "bar"
+msgstr ""''' in value
+
     def test_silent_location_fallback(self):
         buf = BytesIO(b'''\
 #: broken_file.py
@@ -523,7 +538,7 @@ def test_silent_location_fallback(self):
 msgid "broken line number"
 msgstr ""''')
         catalog = pofile.read_po(buf)
-        self.assertEqual(catalog['missing line number'].locations, [])
+        self.assertEqual(catalog['missing line number'].locations, [(u'broken_file.py', None)])
         self.assertEqual(catalog['broken line number'].locations, [])
 
 

From 3f585165bc75f293c67d75146aebad3a11c202e1 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 20 Dec 2015 18:16:18 +0200
Subject: [PATCH 136/489] Allow passing a callable to `extract()`

---
 babel/messages/extract.py      | 8 ++++++--
 tests/messages/test_extract.py | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 2f8084af5..a0608d797 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -212,7 +212,8 @@ def extract(method, fileobj, keywords=DEFAULT_KEYWORDS, comment_tags=(),
     ...     print message
     (3, u'Hello, world!', [], None)
 
-    :param method: a string specifying the extraction method (.e.g. "python");
+    :param method: an extraction method (a callable), or
+                   a string specifying the extraction method (.e.g. "python");
                    if this is a simple name, the extraction function will be
                    looked up by entry point; if it is an explicit reference
                    to a function (of the form ``package.module:funcname`` or
@@ -231,7 +232,9 @@ def extract(method, fileobj, keywords=DEFAULT_KEYWORDS, comment_tags=(),
     :raise ValueError: if the extraction method is not registered
     """
     func = None
-    if ':' in method or '.' in method:
+    if callable(method):
+        func = method
+    elif ':' in method or '.' in method:
         if ':' not in method:
             lastdot = method.rfind('.')
             module, attrname = method[:lastdot], method[lastdot + 1:]
@@ -258,6 +261,7 @@ def extract(method, fileobj, keywords=DEFAULT_KEYWORDS, comment_tags=(),
                 'javascript': extract_javascript
             }
             func = builtin.get(method)
+
     if func is None:
         raise ValueError('Unknown extraction method %r' % method)
 
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index ded697f7f..fa03207c4 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -546,3 +546,9 @@ def test_warn_if_empty_string_msgid_found_in_context_aware_extraction_method(sel
             assert 'warning: Empty msgid.' in sys.stderr.getvalue()
         finally:
             sys.stderr = stderr
+
+    def test_extract_allows_callable(self):
+        def arbitrary_extractor(fileobj, keywords, comment_tags, options):
+            return [(1, None, (), ())]
+        for x in extract.extract(arbitrary_extractor, BytesIO(b"")):
+            assert x[0] == 1

From 9ab038fb0556d20788397a450f52f6cd6e94b6c7 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 21 Dec 2015 00:43:39 +0200
Subject: [PATCH 137/489] Test/CI: Add requisite doctest flags; ignore setup.py
 and venvs

This requires a newer version of py.test, so the requirement is pinned in
the CI configuration.

See https://pytest.org/latest/doctest.html
See https://pytest.org/latest/example/pythoncollection.html#customizing-test-collection-to-find-all-py-files
---
 .ci/appveyor.yml | 3 ++-
 .gitignore       | 1 +
 .travis.yml      | 3 ++-
 conftest.py      | 2 +-
 setup.cfg        | 3 ++-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index 67ca84b14..5a9fd008b 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -43,7 +43,8 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   # Build data files
-  - "pip install . pytest"
+  - "pip install --upgrade pytest==2.8.5"
+  - "pip install --editable ."
   - "python setup.py import_cldr"
 
 build: false  # Not a C# project, build stuff at the test step instead.
diff --git a/.gitignore b/.gitignore
index 0006e76c9..7c27f0e60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ babel/global.dat
 tests/messages/data/project/i18n/long_messages.pot
 tests/messages/data/project/i18n/temp.pot
 tests/messages/data/project/i18n/en_US
+/venv*
diff --git a/.travis.yml b/.travis.yml
index d25ad5f2b..7bf5e9c4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ sudo: false
 cache:
   directories:
   - cldr
+  - "$HOME/.cache/pip"
 
 matrix:
   include:
@@ -75,7 +76,7 @@ matrix:
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
-  - pip install --allow-external cdecimal pytest pytest-cov $CDECIMAL
+  - pip install --allow-external cdecimal --upgrade pytest==2.8.5 pytest-cov==2.2.0 $CDECIMAL
   - pip install --editable .
 
 script:
diff --git a/conftest.py b/conftest.py
index 55e27a2ca..15a589a6c 100644
--- a/conftest.py
+++ b/conftest.py
@@ -6,7 +6,7 @@
 PY2 = sys.version_info[0] < 3
 
 
-collect_ignore = ['tests/messages/data']
+collect_ignore = ['tests/messages/data', 'setup.py']
 
 
 def pytest_collect_file(path, parent):
diff --git a/setup.cfg b/setup.cfg
index 38a441db4..8069749f5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,8 @@
 release = sdist bdist_wheel
 
 [pytest]
-norecursedirs = .* _* scripts {args}
+norecursedirs = venv* .* _* scripts {args}
+doctest_optionflags = ELLIPSIS NORMALIZE_WHITESPACE ALLOW_UNICODE
 
 [bdist_wheel]
 universal = 1

From 62a368c31e5136ee1c33b4cf305fbb2a82778887 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 21 Dec 2015 10:15:07 +0200
Subject: [PATCH 138/489] Test/CI: Make doctests run on both Py2 and Py3

Fixes #293
---
 babel/core.py              |  4 ++--
 babel/dates.py             |  4 ++--
 babel/localedata.py        |  2 +-
 babel/messages/catalog.py  | 10 +++++-----
 babel/messages/extract.py  | 10 +++++-----
 babel/messages/frontend.py | 13 ++++++-------
 babel/messages/mofile.py   | 10 +++++++---
 babel/messages/pofile.py   | 33 +++++++++++++++++----------------
 babel/support.py           |  4 ++--
 babel/util.py              |  4 ++--
 conftest.py                | 15 ++++-----------
 setup.cfg                  |  2 +-
 12 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 0b314cd3a..84ee18920 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -544,9 +544,9 @@ def decimal_formats(self):
     def currency_formats(self):
         """Locale patterns for currency number formatting.
 
-        >>> print Locale('en', 'US').currency_formats['standard']
+        >>> Locale('en', 'US').currency_formats['standard']
         <NumberPattern u'\\xa4#,##0.00'>
-        >>> print Locale('en', 'US').currency_formats['accounting']
+        >>> Locale('en', 'US').currency_formats['accounting']
         <NumberPattern u'\\xa4#,##0.00'>
         """
         return self._data['currency_formats']
diff --git a/babel/dates.py b/babel/dates.py
index f9498d80a..56677030f 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -539,7 +539,7 @@ def get_timezone_name(dt_or_tzinfo=None, width='long', uncommon=False,
 def format_date(date=None, format='medium', locale=LC_TIME):
     """Return a date formatted according to the given pattern.
 
-    >>> d = date(2007, 04, 01)
+    >>> d = date(2007, 4, 1)
     >>> format_date(d, locale='en_US')
     u'Apr 1, 2007'
     >>> format_date(d, format='full', locale='de_DE')
@@ -573,7 +573,7 @@ def format_datetime(datetime=None, format='medium', tzinfo=None,
                     locale=LC_TIME):
     r"""Return a date formatted according to the given pattern.
 
-    >>> dt = datetime(2007, 04, 01, 15, 30)
+    >>> dt = datetime(2007, 4, 1, 15, 30)
     >>> format_datetime(dt, locale='en_US')
     u'Apr 1, 2007, 3:30:00 PM'
 
diff --git a/babel/localedata.py b/babel/localedata.py
index 79b4d8639..437f49fae 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -111,7 +111,7 @@ def merge(dict1, dict2):
 
     >>> d = {1: 'foo', 3: 'baz'}
     >>> merge(d, {1: 'Foo', 2: 'Bar'})
-    >>> items = d.items(); items.sort(); items
+    >>> sorted(d.items())
     [(1, 'Foo'), (2, 'Bar'), (3, 'baz')]
 
     :param dict1: the dictionary to merge into
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 12e878348..e289bef76 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -331,7 +331,7 @@ def _set_header_comment(self, string):
 
     >>> catalog = Catalog(project='Foobar', version='1.0',
     ...                   copyright_holder='Foo Company')
-    >>> print catalog.header_comment #doctest: +ELLIPSIS
+    >>> print(catalog.header_comment) #doctest: +ELLIPSIS
     # Translations template for Foobar.
     # Copyright (C) ... Foo Company
     # This file is distributed under the same license as the Foobar project.
@@ -349,7 +349,7 @@ def _set_header_comment(self, string):
     ... # This file is distributed under the same license as the PROJECT
     ... # project.
     ... #'''
-    >>> print catalog.header_comment
+    >>> print(catalog.header_comment)
     # The POT for my really cool Foobar project.
     # Copyright (C) 1990-2003 Foo Company
     # This file is distributed under the same license as the Foobar
@@ -433,7 +433,7 @@ def _set_mime_headers(self, headers):
     >>> catalog = Catalog(project='Foobar', version='1.0',
     ...                   creation_date=created)
     >>> for name, value in catalog.mime_headers:
-    ...     print '%s: %s' % (name, value)
+    ...     print('%s: %s' % (name, value))
     Project-Id-Version: Foobar 1.0
     Report-Msgid-Bugs-To: EMAIL@ADDRESS
     POT-Creation-Date: 1990-04-01 15:30+0000
@@ -453,7 +453,7 @@ def _set_mime_headers(self, headers):
     ...                   last_translator='John Doe <jd@example.com>',
     ...                   language_team='de_DE <de@example.com>')
     >>> for name, value in catalog.mime_headers:
-    ...     print '%s: %s' % (name, value)
+    ...     print('%s: %s' % (name, value))
     Project-Id-Version: Foobar 1.0
     Report-Msgid-Bugs-To: EMAIL@ADDRESS
     POT-Creation-Date: 1990-04-01 15:30+0000
@@ -720,7 +720,7 @@ def update(self, template, no_fuzzy_matching=False):
 
         >>> 'head' in catalog
         False
-        >>> catalog.obsolete.values()
+        >>> list(catalog.obsolete.values())
         [<Message 'head' (flags: [])>]
 
         :param template: the reference catalog, usually read from a POT file
diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index a0608d797..be2e6303c 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -202,14 +202,14 @@ def extract(method, fileobj, keywords=DEFAULT_KEYWORDS, comment_tags=(),
     The implementation dispatches the actual extraction to plugins, based on the
     value of the ``method`` parameter.
 
-    >>> source = '''# foo module
+    >>> source = b'''# foo module
     ... def run(argv):
-    ...    print _('Hello, world!')
+    ...    print(_('Hello, world!'))
     ... '''
 
-    >>> from StringIO import StringIO
-    >>> for message in extract('python', StringIO(source)):
-    ...     print message
+    >>> from babel._compat import BytesIO
+    >>> for message in extract('python', BytesIO(source)):
+    ...     print(message)
     (3, u'Hello, world!', [], None)
 
     :param method: an extraction method (a callable), or
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index cd79ebf20..56f1b7677 100755
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -8,7 +8,7 @@
     :copyright: (c) 2013 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
-
+from __future__ import print_function
 try:
     from ConfigParser import RawConfigParser
 except ImportError:
@@ -35,7 +35,7 @@
 from babel.messages.mofile import write_mo
 from babel.messages.pofile import read_po, write_po
 from babel.util import odict, LOCALTZ
-from babel._compat import string_types, BytesIO, PY2
+from babel._compat import string_types, StringIO, PY2
 
 
 class compile_catalog(Command):
@@ -332,7 +332,7 @@ def _get_mappings(self):
             message_extractors = self.distribution.message_extractors
             for dirname, mapping in message_extractors.items():
                 if isinstance(mapping, string_types):
-                    method_map, options_map = parse_mapping(BytesIO(mapping))
+                    method_map, options_map = parse_mapping(StringIO(mapping))
                 else:
                     method_map, options_map = [], {}
                     for pattern, method, options in mapping:
@@ -1154,7 +1154,7 @@ def main():
 def parse_mapping(fileobj, filename=None):
     """Parse an extraction method mapping from a file-like object.
 
-    >>> buf = BytesIO(b'''
+    >>> buf = StringIO('''
     ... [extractors]
     ... custom = mypackage.module:myfunc
     ...
@@ -1227,10 +1227,9 @@ def parse_mapping(fileobj, filename=None):
 def parse_keywords(strings=[]):
     """Parse keywords specifications from the given list of strings.
 
-    >>> kw = parse_keywords(['_', 'dgettext:2', 'dngettext:2,3', 'pgettext:1c,2']).items()
-    >>> kw.sort()
+    >>> kw = sorted(parse_keywords(['_', 'dgettext:2', 'dngettext:2,3', 'pgettext:1c,2']).items())
     >>> for keyword, indices in kw:
-    ...     print (keyword, indices)
+    ...     print((keyword, indices))
     ('_', None)
     ('dgettext', (2,))
     ('dngettext', (2, 3))
diff --git a/babel/messages/mofile.py b/babel/messages/mofile.py
index 18503287b..2ab96d523 100644
--- a/babel/messages/mofile.py
+++ b/babel/messages/mofile.py
@@ -108,9 +108,10 @@ def write_mo(fileobj, catalog, use_fuzzy=False):
     """Write a catalog to the specified file-like object using the GNU MO file
     format.
 
+    >>> import sys
     >>> from babel.messages import Catalog
     >>> from gettext import GNUTranslations
-    >>> from StringIO import StringIO
+    >>> from babel._compat import BytesIO
 
     >>> catalog = Catalog(locale='en_US')
     >>> catalog.add('foo', 'Voh')
@@ -123,11 +124,14 @@ def write_mo(fileobj, catalog, use_fuzzy=False):
     <Message ...>
     >>> catalog.add(('Fuzz', 'Fuzzes'), ('', ''))
     <Message ...>
-    >>> buf = StringIO()
+    >>> buf = BytesIO()
 
     >>> write_mo(buf, catalog)
-    >>> buf.seek(0)
+    >>> x = buf.seek(0)
     >>> translations = GNUTranslations(fp=buf)
+    >>> if sys.version_info[0] >= 3:
+    ...     translations.ugettext = translations.gettext
+    ...     translations.ungettext = translations.ngettext
     >>> translations.ugettext('foo')
     u'Voh'
     >>> translations.ungettext('bar', 'baz', 1)
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 41fad0a8a..226ac1ce9 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -10,6 +10,7 @@
     :license: BSD, see LICENSE for more details.
 """
 
+from __future__ import print_function
 import os
 import re
 
@@ -21,7 +22,7 @@
 def unescape(string):
     r"""Reverse `escape` the given string.
 
-    >>> print unescape('"Say:\\n  \\"hello, world!\\"\\n"')
+    >>> print(unescape('"Say:\\n  \\"hello, world!\\"\\n"'))
     Say:
       "hello, world!"
     <BLANKLINE>
@@ -44,18 +45,18 @@ def replace_escapes(match):
 def denormalize(string):
     r"""Reverse the normalization done by the `normalize` function.
 
-    >>> print denormalize(r'''""
+    >>> print(denormalize(r'''""
     ... "Say:\n"
-    ... "  \"hello, world!\"\n"''')
+    ... "  \"hello, world!\"\n"'''))
     Say:
       "hello, world!"
     <BLANKLINE>
 
-    >>> print denormalize(r'''""
+    >>> print(denormalize(r'''""
     ... "Say:\n"
     ... "  \"Lorem ipsum dolor sit "
     ... "amet, consectetur adipisicing"
-    ... " elit, \"\n"''')
+    ... " elit, \"\n"'''))
     Say:
       "Lorem ipsum dolor sit amet, consectetur adipisicing elit, "
     <BLANKLINE>
@@ -77,7 +78,7 @@ def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=No
     file-like object and return a `Catalog`.
 
     >>> from datetime import datetime
-    >>> from StringIO import StringIO
+    >>> from babel._compat import StringIO
     >>> buf = StringIO('''
     ... #: main.py:1
     ... #, fuzzy, python-format
@@ -93,13 +94,13 @@ def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=No
     ... msgstr[1] "baaz"
     ... ''')
     >>> catalog = read_po(buf)
-    >>> catalog.revision_date = datetime(2007, 04, 01)
+    >>> catalog.revision_date = datetime(2007, 4, 1)
 
     >>> for message in catalog:
     ...     if message.id:
-    ...         print (message.id, message.string)
-    ...         print ' ', (message.locations, sorted(list(message.flags)))
-    ...         print ' ', (message.user_comments, message.auto_comments)
+    ...         print((message.id, message.string))
+    ...         print(' ', (message.locations, sorted(list(message.flags))))
+    ...         print(' ', (message.user_comments, message.auto_comments))
     (u'foo %(name)s', u'quux %(name)s')
       ([(u'main.py', 1)], [u'fuzzy', u'python-format'])
       ([], [])
@@ -278,16 +279,16 @@ def escape(string):
 def normalize(string, prefix='', width=76):
     r"""Convert a string into a format that is appropriate for .po files.
 
-    >>> print normalize('''Say:
+    >>> print(normalize('''Say:
     ...   "hello, world!"
-    ... ''', width=None)
+    ... ''', width=None))
     ""
     "Say:\n"
     "  \"hello, world!\"\n"
 
-    >>> print normalize('''Say:
+    >>> print(normalize('''Say:
     ...   "Lorem ipsum dolor sit amet, consectetur adipisicing elit, "
-    ... ''', width=32)
+    ... ''', width=32))
     ""
     "Say:\n"
     "  \"Lorem ipsum dolor sit "
@@ -348,10 +349,10 @@ def write_po(fileobj, catalog, width=76, no_location=False, omit_header=False,
     <Message...>
     >>> catalog.add((u'bar', u'baz'), locations=[('main.py', 3)])
     <Message...>
-    >>> from io import BytesIO
+    >>> from babel._compat import BytesIO
     >>> buf = BytesIO()
     >>> write_po(buf, catalog, omit_header=True)
-    >>> print buf.getvalue()
+    >>> print(buf.getvalue().decode("utf8"))
     #: main.py:1
     #, fuzzy, python-format
     msgid "foo %(name)s"
diff --git a/babel/support.py b/babel/support.py
index 5ab97a5b2..3b4869cdb 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -137,7 +137,7 @@ class LazyProxy(object):
     >>> def greeting(name='world'):
     ...     return 'Hello, %s!' % name
     >>> lazy_greeting = LazyProxy(greeting, name='Joe')
-    >>> print lazy_greeting
+    >>> print(lazy_greeting)
     Hello, Joe!
     >>> u'  ' + lazy_greeting
     u'  Hello, Joe!'
@@ -160,7 +160,7 @@ class LazyProxy(object):
     ... ]
     >>> greetings.sort()
     >>> for greeting in greetings:
-    ...     print greeting
+    ...     print(greeting)
     Hello, Joe!
     Hello, universe!
     Hello, world!
diff --git a/babel/util.py b/babel/util.py
index 1c7264594..0f3fb9947 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -26,9 +26,9 @@ def distinct(iterable):
     Unlike when using sets for a similar effect, the original ordering of the
     items in the collection is preserved by this function.
 
-    >>> print list(distinct([1, 2, 1, 3, 4, 4]))
+    >>> print(list(distinct([1, 2, 1, 3, 4, 4])))
     [1, 2, 3, 4]
-    >>> print list(distinct('foobar'))
+    >>> print(list(distinct('foobar')))
     ['f', 'o', 'b', 'a', 'r']
 
     :param iterable: the iterable collection providing the data
diff --git a/conftest.py b/conftest.py
index 15a589a6c..32bd1362a 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,18 +1,11 @@
-import sys
 from _pytest.doctest import DoctestModule
 from py.path import local
 
-
-PY2 = sys.version_info[0] < 3
-
-
 collect_ignore = ['tests/messages/data', 'setup.py']
+babel_path = local(__file__).dirpath().join('babel')
 
 
 def pytest_collect_file(path, parent):
-    babel_path = local(__file__).dirpath().join('babel')
-    config = parent.config
-    if PY2:
-        if babel_path.common(path) == babel_path:
-            if path.ext == ".py":
-                return DoctestModule(path, parent)
+    if babel_path.common(path) == babel_path:
+        if path.ext == ".py":
+            return DoctestModule(path, parent)
diff --git a/setup.cfg b/setup.cfg
index 8069749f5..c2d8f87e9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,7 +3,7 @@ release = sdist bdist_wheel
 
 [pytest]
 norecursedirs = venv* .* _* scripts {args}
-doctest_optionflags = ELLIPSIS NORMALIZE_WHITESPACE ALLOW_UNICODE
+doctest_optionflags = ELLIPSIS NORMALIZE_WHITESPACE ALLOW_UNICODE IGNORE_EXCEPTION_DETAIL
 
 [bdist_wheel]
 universal = 1

From 5a633c8fdb39d563ba7b95d1a9d118c2f22dbdad Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 20 Dec 2015 21:53:27 +0200
Subject: [PATCH 139/489] Parametrize
 test_compatible_classes_in_global_and_localedata test

---
 tests/test_core.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/tests/test_core.py b/tests/test_core.py
index 9d9548194..4ce92ddbc 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -272,7 +272,18 @@ def test_parse_locale():
     assert (core.parse_locale('de_DE.iso885915@euro') ==
             ('de', 'DE', None, None))
 
-def test_compatible_classes_in_global_and_localedata():
+
+@pytest.mark.parametrize('filename', [
+    'babel/global.dat',
+    'babel/locale-data/root.dat',
+    'babel/locale-data/en.dat',
+    'babel/locale-data/en_US.dat',
+    'babel/locale-data/en_US_POSIX.dat',
+    'babel/locale-data/zh_Hans_CN.dat',
+    'babel/locale-data/zh_Hant_TW.dat',
+    'babel/locale-data/es_419.dat',
+])
+def test_compatible_classes_in_global_and_localedata(filename):
     # Use pickle module rather than cPickle since cPickle.Unpickler is a method
     # on Python 2
     import pickle
@@ -285,15 +296,5 @@ def find_class(self, module, name):
             raise pickle.UnpicklingError("global '%s.%s' is forbidden" %
                                          (module, name))
 
-    def load(filename):
-        with open(filename, 'rb') as f:
-            return Unpickler(f).load()
-
-    load('babel/global.dat')
-    load('babel/locale-data/root.dat')
-    load('babel/locale-data/en.dat')
-    load('babel/locale-data/en_US.dat')
-    load('babel/locale-data/en_US_POSIX.dat')
-    load('babel/locale-data/zh_Hans_CN.dat')
-    load('babel/locale-data/zh_Hant_TW.dat')
-    load('babel/locale-data/es_419.dat')
+    with open(filename, 'rb') as f:
+        return Unpickler(f).load()

From 03b0a7babfa67020e9af574b9a8dff2e35f0ea60 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 20 Dec 2015 23:33:50 +0200
Subject: [PATCH 140/489] Test that Lithuanian long-form dates are formatted
 with the correct genitive form of the month

Fixes #288
---
 tests/test_dates.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/test_dates.py b/tests/test_dates.py
index 1b03cbf00..0f099f31f 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -540,3 +540,10 @@ def test_parse_pattern():
     assert (dates.parse_pattern("H:mm' Uhr 'z").format ==
             u'%(H)s:%(mm)s Uhr %(z)s')
     assert dates.parse_pattern("hh' o''clock'").format == u"%(hh)s o'clock"
+
+
+def test_lithuanian_long_format():
+    assert (
+        dates.format_date(date(2015, 12, 10), locale='lt_LT', format='long') ==
+        u'2015 m. gruodžio 10 d.'
+    )

From 0ae0b2c03262ea2d45bc186a0f28282a14e4f678 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Sat, 31 Oct 2015 23:32:01 +0100
Subject: [PATCH 141/489] numbers: Remove unneeded trailing spaces

Done with coala.
---
 babel/numbers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index a15f399bb..ac03e7141 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -33,7 +33,7 @@ def get_currency_name(currency, count=None, locale=LC_NUMERIC):
 
     >>> get_currency_name('USD', locale='en_US')
     u'US Dollar'
-    
+
     .. versionadded:: 0.9.4
 
     :param currency: the currency code

From 27ec384abf02721e003831b93e3bc50e0a831f12 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Sat, 31 Oct 2015 23:33:33 +0100
Subject: [PATCH 142/489] Add coafile

This allows using coala to check this code.
---
 .coafile | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .coafile

diff --git a/.coafile b/.coafile
new file mode 100644
index 000000000..cd1c7f0fc
--- /dev/null
+++ b/.coafile
@@ -0,0 +1,5 @@
+[Default]
+bears = SpaceConsistencyBear,LineLengthBear
+use_spaces = true
+max_line_length = 120
+files = babel/**/*.py

From 1a53d5f5e0e6f71eb0b6805f7c06b595c1c1b0ab Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Sun, 20 Dec 2015 17:50:52 +0100
Subject: [PATCH 143/489] util.sh: Move out relpath import

This was detected by coala, rightfully, as an unused import.
---
 babel/messages/extract.py | 3 ++-
 babel/util.py             | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index be2e6303c..8fe3f606c 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -18,10 +18,11 @@
 """
 
 import os
+from os.path import relpath
 import sys
 from tokenize import generate_tokens, COMMENT, NAME, OP, STRING
 
-from babel.util import parse_encoding, pathmatch, relpath
+from babel.util import parse_encoding, pathmatch
 from babel._compat import PY2, text_type
 from textwrap import dedent
 
diff --git a/babel/util.py b/babel/util.py
index 0f3fb9947..1849e8a04 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -12,7 +12,6 @@
 import codecs
 from datetime import timedelta, tzinfo
 import os
-from os.path import relpath
 import re
 import textwrap
 from babel._compat import izip, imap

From 6bb8a03ed03bab40ca25de9732e1084d889f7b29 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Sun, 20 Dec 2015 17:40:41 +0100
Subject: [PATCH 144/489] codestyle: Check for unused python code

---
 .coafile                    | 2 +-
 babel/_compat.py            | 3 ++-
 babel/dates.py              | 1 -
 babel/localtime/__init__.py | 2 +-
 babel/numbers.py            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.coafile b/.coafile
index cd1c7f0fc..666eefe95 100644
--- a/.coafile
+++ b/.coafile
@@ -1,5 +1,5 @@
 [Default]
-bears = SpaceConsistencyBear,LineLengthBear
+bears = SpaceConsistencyBear,LineLengthBear,PyUnusedCodeBear
 use_spaces = true
 max_line_length = 120
 files = babel/**/*.py
diff --git a/babel/_compat.py b/babel/_compat.py
index 78cd35a37..75abf9eb1 100644
--- a/babel/_compat.py
+++ b/babel/_compat.py
@@ -45,7 +45,8 @@
     from StringIO import StringIO
     import cPickle as pickle
 
-    from itertools import izip, imap
+    from itertools import imap
+    from itertools import izip
     range_type = xrange
 
     cmp = cmp
diff --git a/babel/dates.py b/babel/dates.py
index 56677030f..0b7353880 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1011,7 +1011,6 @@ def format_week(self, char, num):
             if week == 0:
                 date = self.value - timedelta(days=self.value.day)
                 week = self.get_week_number(date.day, date.weekday())
-                pass
             return '%d' % week
 
     def format_weekday(self, char, num):
diff --git a/babel/localtime/__init__.py b/babel/localtime/__init__.py
index cdb3e9b5d..4cab2364e 100644
--- a/babel/localtime/__init__.py
+++ b/babel/localtime/__init__.py
@@ -13,7 +13,7 @@
 import sys
 import pytz
 import time
-from datetime import timedelta, datetime
+from datetime import timedelta
 from datetime import tzinfo
 from threading import RLock
 
diff --git a/babel/numbers.py b/babel/numbers.py
index ac03e7141..f0b0ca1bd 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -22,7 +22,7 @@
 from datetime import date as date_, datetime as datetime_
 
 from babel.core import default_locale, Locale, get_global
-from babel._compat import range_type, Decimal, InvalidOperation, ROUND_HALF_EVEN
+from babel._compat import Decimal, InvalidOperation, ROUND_HALF_EVEN
 
 
 LC_NUMERIC = default_locale('LC_NUMERIC')

From 5b371279f1e7781d827097e851c509eb836f98d4 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Mon, 21 Dec 2015 10:50:45 +0100
Subject: [PATCH 145/489] catalog: Remove unneeded documentation

Those documentation comments aren't adding any new information compared
to the documentation comment of their respective functions and are thus
redundant.

Those comments where introduced first in 7ab115ce with no notice why
they exist.
---
 babel/messages/catalog.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index e289bef76..21499ae6d 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -93,10 +93,10 @@ def __init__(self, id, string=u'', locations=(), flags=(), auto_comments=(),
                        PO file, if any
         :param context: the message context
         """
-        self.id = id #: The message ID
+        self.id = id
         if not string and self.pluralizable:
             string = (u'', u'')
-        self.string = string #: The message translation
+        self.string = string
         self.locations = list(distinct(locations))
         self.flags = set(flags)
         if id and self.python_format:
@@ -274,15 +274,15 @@ def __init__(self, locale=None, domain=None, header_comment=DEFAULT_HEADER,
         :param charset: the encoding to use in the output (defaults to utf-8)
         :param fuzzy: the fuzzy bit on the catalog header
         """
-        self.domain = domain #: The message domain
+        self.domain = domain
         if locale:
             locale = Locale.parse(locale)
-        self.locale = locale #: The locale or `None`
+        self.locale = locale
         self._header_comment = header_comment
         self._messages = odict()
 
-        self.project = project or 'PROJECT' #: The project name
-        self.version = version or 'VERSION' #: The project version
+        self.project = project or 'PROJECT'
+        self.version = version or 'VERSION'
         self.copyright_holder = copyright_holder or 'ORGANIZATION'
         self.msgid_bugs_address = msgid_bugs_address or 'EMAIL@ADDRESS'
 
@@ -297,15 +297,15 @@ def __init__(self, locale=None, domain=None, header_comment=DEFAULT_HEADER,
             creation_date = datetime.now(LOCALTZ)
         elif isinstance(creation_date, datetime) and not creation_date.tzinfo:
             creation_date = creation_date.replace(tzinfo=LOCALTZ)
-        self.creation_date = creation_date #: Creation date of the template
+        self.creation_date = creation_date
         if revision_date is None:
             revision_date = 'YEAR-MO-DA HO:MI+ZONE'
         elif isinstance(revision_date, datetime) and not revision_date.tzinfo:
             revision_date = revision_date.replace(tzinfo=LOCALTZ)
-        self.revision_date = revision_date #: Last revision date of the catalog
-        self.fuzzy = fuzzy #: Catalog header fuzzy bit (`True` or `False`)
+        self.revision_date = revision_date
+        self.fuzzy = fuzzy
 
-        self.obsolete = odict() #: Dictionary of obsolete messages
+        self.obsolete = odict()  # Dictionary of obsolete messages
         self._num_plurals = None
         self._plural_expr = None
 

From 4c8515aae11b2faf4ab81c7412df3d89ee65c6ec Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 20 Dec 2015 23:51:18 +0200
Subject: [PATCH 146/489] download_import_cldr: unzip into versioned dir

---
 scripts/download_import_cldr.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index f8ba1fa92..f9523aac5 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -71,8 +71,9 @@ def is_good_file(filename):
 def main():
     scripts_path = os.path.dirname(os.path.abspath(__file__))
     repo = os.path.dirname(scripts_path)
-    cldr_path = os.path.join(repo, 'cldr')
-    zip_path = os.path.join(cldr_path, FILENAME)
+    cldr_dl_path = os.path.join(repo, 'cldr')
+    cldr_path = os.path.join(repo, 'cldr', os.path.splitext(FILENAME)[0])
+    zip_path = os.path.join(cldr_dl_path, FILENAME)
     changed = False
 
     while not is_good_file(zip_path):

From 29b1724668a2804c48e8950577741c99fb9e2d57 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 20 Dec 2015 21:53:06 +0200
Subject: [PATCH 147/489] import_cldr: support currency format lengths

Non-default currency format lengths acquire colon-separated suffixes like units already do since 9327e0824a1bbed538e73d42b971988f8214b490
---
 scripts/import_cldr.py | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index d179604c1..4f70ef9b4 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -600,21 +600,7 @@ def main():
             scientific_formats[elem.attrib.get('type')] = \
                 numbers.parse_pattern(pattern)
 
-        currency_formats = data.setdefault('currency_formats', {})
-        for elem in tree.findall('.//currencyFormats/currencyFormatLength/currencyFormat'):
-            if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                    and elem.attrib.get('type') in currency_formats:
-                continue
-            for child in elem.getiterator():
-                if child.tag == 'alias':
-                    currency_formats[elem.attrib.get('type')] = Alias(
-                        _translate_alias(['currency_formats', elem.attrib['type']],
-                                         child.attrib['path'])
-                    )
-                elif child.tag == 'pattern':
-                    pattern = text_type(child.text)
-                    currency_formats[elem.attrib.get('type')] = \
-                        numbers.parse_pattern(pattern)
+        parse_currency_formats(data, tree)
 
         percent_formats = data.setdefault('percent_formats', {})
         for elem in tree.findall('.//percentFormats/percentFormatLength'):
@@ -674,5 +660,27 @@ def main():
             outfile.close()
 
 
+def parse_currency_formats(data, tree):
+    currency_formats = data.setdefault('currency_formats', {})
+    for length_elem in tree.findall('.//currencyFormats/currencyFormatLength'):
+        curr_length_type = length_elem.attrib.get('type')
+        for elem in length_elem.findall('currencyFormat'):
+            type = elem.attrib.get('type')
+            if curr_length_type:
+                # Handle `<currencyFormatLength type="short">`, etc.
+                type = '%s:%s' % (type, curr_length_type)
+            if ('draft' in elem.attrib or 'alt' in elem.attrib) and type in currency_formats:
+                continue
+            for child in elem.getiterator():
+                if child.tag == 'alias':
+                    currency_formats[type] = Alias(
+                            _translate_alias(['currency_formats', elem.attrib['type']],
+                                             child.attrib['path'])
+                    )
+                elif child.tag == 'pattern':
+                    pattern = text_type(child.text)
+                    currency_formats[type] = numbers.parse_pattern(pattern)
+
+
 if __name__ == '__main__':
     main()

From 6b6c5f1f8d95d24f028be1da3c79a93ff9f3f4ec Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 20 Dec 2015 21:45:07 +0200
Subject: [PATCH 148/489] import_cldr: Add `--force` flag

---
 scripts/import_cldr.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 4f70ef9b4..b4ceffd4d 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -124,10 +124,14 @@ def _extract_plural_rules(file_path):
 
 def main():
     parser = OptionParser(usage='%prog path/to/cldr')
+    parser.add_option(
+        '-f', '--force', dest='force', action='store_true', default=False,
+        help='force import even if destination file seems up to date'
+    )
     options, args = parser.parse_args()
     if len(args) != 1:
         parser.error('incorrect number of arguments')
-
+    force = bool(options.force)
     srcdir = args[0]
     destdir = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),
                            '..', 'babel')
@@ -145,7 +149,7 @@ def main():
     # Import global data from the supplemental files
     global_path = os.path.join(destdir, 'global.dat')
     global_data = {}
-    if need_conversion(global_path, global_data, sup_filename):
+    if force or need_conversion(global_path, global_data, sup_filename):
         territory_zones = global_data.setdefault('territory_zones', {})
         zone_aliases = global_data.setdefault('zone_aliases', {})
         zone_territories = global_data.setdefault('zone_territories', {})
@@ -290,7 +294,7 @@ def main():
         data_filename = os.path.join(destdir, 'locale-data', stem + '.dat')
 
         data = {}
-        if not need_conversion(data_filename, data, full_filename):
+        if not (force or need_conversion(data_filename, data, full_filename)):
             continue
 
         tree = parse(full_filename)

From 23c4a550c6073a1f6948196539d0c8c51c950a3a Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 20 Dec 2015 22:15:12 +0200
Subject: [PATCH 149/489] import_cldr: Add `--dump-json` debug flag

These JSON files are easier to inspect by eye to figure out what might be
going wrong.  They are never used by Babel itself.
---
 .gitignore             |  1 +
 scripts/import_cldr.py | 33 +++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c27f0e60..67ba223aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ dist
 test-env
 **/__pycache__
 babel/global.dat
+babel/global.dat.json
 tests/messages/data/project/i18n/long_messages.pot
 tests/messages/data/project/i18n/temp.pot
 tests/messages/data/project/i18n/en_US
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index b4ceffd4d..2925acc8a 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -122,16 +122,37 @@ def _extract_plural_rules(file_path):
     return rule_dict
 
 
+def debug_repr(obj):
+    if isinstance(obj, PluralRule):
+        return obj.abstract
+    return repr(obj)
+
+
+def write_datafile(path, data, dump_json=False):
+    with open(path, 'wb') as outfile:
+        pickle.dump(data, outfile, 2)
+    if dump_json:
+        import json
+        with open(path + '.json', 'w') as outfile:
+            json.dump(data, outfile, indent=4, default=debug_repr)
+
+
 def main():
     parser = OptionParser(usage='%prog path/to/cldr')
     parser.add_option(
         '-f', '--force', dest='force', action='store_true', default=False,
         help='force import even if destination file seems up to date'
     )
+    parser.add_option(
+        '-j', '--json', dest='dump_json', action='store_true', default=False,
+        help='also export debugging JSON dumps of locale data'
+    )
+
     options, args = parser.parse_args()
     if len(args) != 1:
         parser.error('incorrect number of arguments')
     force = bool(options.force)
+    dump_json = bool(options.dump_json)
     srcdir = args[0]
     destdir = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),
                            '..', 'babel')
@@ -255,11 +276,7 @@ def main():
             cur_crounding = int(fraction.attrib.get('cashRounding', cur_rounding))
             currency_fractions[cur_code] = (cur_digits, cur_rounding, cur_cdigits, cur_crounding)
 
-        outfile = open(global_path, 'wb')
-        try:
-            pickle.dump(global_data, outfile, 2)
-        finally:
-            outfile.close()
+        write_datafile(global_path, global_data, dump_json=dump_json)
 
     # build a territory containment mapping for inheritance
     regions = {}
@@ -657,11 +674,7 @@ def main():
                     date_fields[field_type].setdefault(rel_time_type, {})\
                         [pattern.attrib['count']] = text_type(pattern.text)
 
-        outfile = open(data_filename, 'wb')
-        try:
-            pickle.dump(data, outfile, 2)
-        finally:
-            outfile.close()
+        write_datafile(data_filename, data, dump_json=dump_json)
 
 
 def parse_currency_formats(data, tree):

From 9f7f4d02998955719a8d18bfcbec8f700bec9923 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 20 Dec 2015 21:29:21 +0200
Subject: [PATCH 150/489] Update to CLDR 28 (with test updates)

* Aside from the usual data changes, the provisional aa locale is no longer,
  so we can't use it for tests. Instead, ii is used (chosen by virtue of ii.xml
  being fairly small, i.e. probably as incomplete as aa).
* ms_Latn_SG is not in use anymore either; use sr_Latn_ME instead.

Closes #226
Closes #290
---
 babel/core.py                   | 8 ++++----
 babel/dates.py                  | 4 ++--
 babel/numbers.py                | 2 +-
 scripts/download_import_cldr.py | 9 ++++-----
 tests/messages/test_plurals.py  | 2 +-
 tests/test_dates.py             | 6 +++---
 tests/test_numbers.py           | 2 +-
 tests/test_plural.py            | 8 ++++----
 8 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 84ee18920..06070d515 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -113,10 +113,10 @@ class Locale(object):
     If a locale is requested for which no locale data is available, an
     `UnknownLocaleError` is raised:
 
-    >>> Locale.parse('en_DE')
+    >>> Locale.parse('en_XX')
     Traceback (most recent call last):
         ...
-    UnknownLocaleError: unknown locale 'en_DE'
+    UnknownLocaleError: unknown locale 'en_XX'
 
     For more information see :rfc:`3066`.
     """
@@ -432,8 +432,8 @@ def get_script_name(self, locale=None):
     script_name = property(get_script_name, doc="""\
         The localized script name of the locale if available.
 
-        >>> Locale('ms', 'SG', script='Latn').script_name
-        u'Latin'
+        >>> Locale('sr', 'ME', script='Latn').script_name
+        u'latinica'
     """)
 
     @property
diff --git a/babel/dates.py b/babel/dates.py
index 0b7353880..ab2d4fb29 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -582,7 +582,7 @@ def format_datetime(datetime=None, format='medium', tzinfo=None,
 
     >>> format_datetime(dt, 'full', tzinfo=get_timezone('Europe/Paris'),
     ...                 locale='fr_FR')
-    u'dimanche 1 avril 2007 17:30:00 heure d\u2019\xe9t\xe9 d\u2019Europe centrale'
+    u'dimanche 1 avril 2007 \xe0 17:30:00 heure d\u2019\xe9t\xe9 d\u2019Europe centrale'
     >>> format_datetime(dt, "yyyy.MM.dd G 'at' HH:mm:ss zzz",
     ...                 tzinfo=get_timezone('US/Eastern'), locale='en')
     u'2007.04.01 AD at 11:30:00 EDT'
@@ -742,7 +742,7 @@ def format_timedelta(delta, granularity='second', threshold=.85,
     The format parameter controls how compact or wide the presentation is:
 
     >>> format_timedelta(timedelta(hours=3), format='short', locale='en')
-    u'3 hrs'
+    u'3 hr'
     >>> format_timedelta(timedelta(hours=3), format='narrow', locale='en')
     u'3h'
 
diff --git a/babel/numbers.py b/babel/numbers.py
index f0b0ca1bd..e4b3e8ee4 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -265,7 +265,7 @@ def format_currency(number, currency, format=None, locale=LC_NUMERIC,
     >>> format_currency(1099.98, 'USD', locale='en_US')
     u'$1,099.98'
     >>> format_currency(1099.98, 'USD', locale='es_CO')
-    u'US$1.099,98'
+    u'US$\\xa01.099,98'
     >>> format_currency(1099.98, 'EUR', locale='de_DE')
     u'1.099,98\\xa0\\u20ac'
 
diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index f9523aac5..4da342349 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -5,7 +5,6 @@
 import shutil
 import hashlib
 import zipfile
-import urllib
 import subprocess
 try:
     from urllib.request import urlretrieve
@@ -13,9 +12,9 @@
     from urllib import urlretrieve
 
 
-URL = 'http://unicode.org/Public/cldr/26/core.zip'
-FILENAME = 'core-26.zip'
-FILESUM = '46220170238b092685fd24221f895e3d'
+URL = 'http://unicode.org/Public/cldr/28/core.zip'
+FILENAME = 'core-28.zip'
+FILESUM = 'bc545b4c831e1987ea931b04094d7b9fc59ec3d8'
 BLKSIZE = 131072
 
 
@@ -53,7 +52,7 @@ def is_good_file(filename):
     if not os.path.isfile(filename):
         log('Local copy \'%s\' not found', filename)
         return False
-    h = hashlib.md5()
+    h = hashlib.sha1()
     with open(filename, 'rb') as f:
         while 1:
             blk = f.read(BLKSIZE)
diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py
index 8c11745ff..d54857f7b 100644
--- a/tests/messages/test_plurals.py
+++ b/tests/messages/test_plurals.py
@@ -34,7 +34,7 @@ def test_get_plural_accpets_strings():
 
 
 def test_get_plural_falls_back_to_default():
-    assert plurals.get_plural('aa') == (2, '(n != 1)')
+    assert plurals.get_plural('ii') == (2, '(n != 1)')
 
 
 def test_plural_tuple_attributes():
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 0f099f31f..ea4805bb8 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -282,14 +282,14 @@ def test_zero_seconds(self):
         self.assertEqual('0 seconds', string)
         string = dates.format_timedelta(timedelta(seconds=0), locale='en',
                                         format='short')
-        self.assertEqual('0 secs', string)
+        self.assertEqual('0 sec', string)
         string = dates.format_timedelta(timedelta(seconds=0),
                                         granularity='hour', locale='en')
         self.assertEqual('0 hours', string)
         string = dates.format_timedelta(timedelta(seconds=0),
                                         granularity='hour', locale='en',
                                         format='short')
-        self.assertEqual('0 hrs', string)
+        self.assertEqual('0 hr', string)
 
     def test_small_value_with_granularity(self):
         string = dates.format_timedelta(timedelta(seconds=42),
@@ -465,7 +465,7 @@ def test_format_datetime():
 
     full = dates.format_datetime(dt, 'full', tzinfo=timezone('Europe/Paris'),
                                  locale='fr_FR')
-    assert full == (u'dimanche 1 avril 2007 17:30:00 heure '
+    assert full == (u'dimanche 1 avril 2007 à 17:30:00 heure '
                     u'd\u2019\xe9t\xe9 d\u2019Europe centrale')
     custom = dates.format_datetime(dt, "yyyy.MM.dd G 'at' HH:mm:ss zzz",
                                    tzinfo=timezone('US/Eastern'), locale='en')
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index f042833b3..4b8a48dce 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -230,7 +230,7 @@ def test_format_currency():
     assert (numbers.format_currency(1099.98, 'USD', locale='en_US')
             == u'$1,099.98')
     assert (numbers.format_currency(1099.98, 'USD', locale='es_CO')
-            == u'US$1.099,98')
+            == u'US$\xa01.099,98')
     assert (numbers.format_currency(1099.98, 'EUR', locale='de_DE')
             == u'1.099,98\xa0\u20ac')
     assert (numbers.format_currency(1099.98, 'EUR', u'\xa4\xa4 #,##0.00',
diff --git a/tests/test_plural.py b/tests/test_plural.py
index b0cad8da2..fce1b8e0e 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -133,10 +133,10 @@ def test_plural_within_rules():
 
 def test_locales_with_no_plural_rules_have_default():
     from babel import Locale
-    aa_plural = Locale.parse('aa').plural_form
-    assert aa_plural(1) == 'other'
-    assert aa_plural(2) == 'other'
-    assert aa_plural(15) == 'other'
+    pf = Locale.parse('ii').plural_form
+    assert pf(1) == 'other'
+    assert pf(2) == 'other'
+    assert pf(15) == 'other'
 
 
 WELL_FORMED_TOKEN_TESTS = (

From e47064ed88c5dc5223f87ee8452d02964e9fe373 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 23 Dec 2015 20:16:18 +0200
Subject: [PATCH 151/489] Mark Python 3.5 as supported

Fixes #222
Refs #221
---
 .ci/appveyor.yml | 8 ++++++++
 .travis.yml      | 9 +++++++++
 setup.py         | 2 ++
 3 files changed, 19 insertions(+)

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index 5a9fd008b..8bec9251e 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -32,6 +32,14 @@ environment:
       PYTHON_VERSION: "3.4.x"
       PYTHON_ARCH: "64"
 
+    - PYTHON: "C:\\Python35"
+      PYTHON_VERSION: "3.5.x"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python35-x64"
+      PYTHON_VERSION: "3.5.x"
+      PYTHON_ARCH: "64"
+
 branches:  # Only build official branches, PRs are built anyway.
   only:
     - master
diff --git a/.travis.yml b/.travis.yml
index 7bf5e9c4d..8d5433ebf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ cache:
   directories:
   - cldr
   - "$HOME/.cache/pip"
+  - "$HOME/.pyenv"
 
 matrix:
   include:
@@ -28,6 +29,8 @@ matrix:
       python: 3.3
     - os: linux
       python: 3.4
+    - os: linux
+      python: 3.5
     - os: osx
       language: generic
       env:
@@ -72,6 +75,12 @@ matrix:
       - PYTHON_VERSION=3.4.3
       - PYENV_ROOT=~/.pyenv
       - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
+    - os: osx
+      language: generic
+      env:
+      - PYTHON_VERSION=3.5.1
+      - PYENV_ROOT=~/.pyenv
+      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
 
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
diff --git a/setup.py b/setup.py
index 83cd65170..7e70a0320 100755
--- a/setup.py
+++ b/setup.py
@@ -59,6 +59,8 @@ def run(self):
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     packages=['babel', 'babel.messages', 'babel.localtime'],

From 1bcd5a68655d268ee995a02442dae80261e587ac Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Mon, 28 Dec 2015 22:14:05 +0100
Subject: [PATCH 152/489] Install m3-cdecimal in Tox environments.

Apparently, the cdecimal package has been renamed to m3-cdecimal.  Being unable
to install it breaks the test suite, so this should fix the problem.
---
 tox.ini | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index a5b23e41d..6f552d8b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,10 +2,8 @@
 envlist = py26, py27, pypy, py33, py34, py26-cdecimal, py27-cdecimal
 
 [testenv]
-install_command =
-    pip install --allow-external cdecimal {opts} {packages}
 deps =
     pytest
-    cdecimal: cdecimal
+    cdecimal: m3-cdecimal
 whitelist_externals = make
 commands = make clean-cldr test

From b5d400f3cfe53bd2683bb95711b7117bc3a5e9f0 Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Tue, 29 Dec 2015 01:15:20 +0100
Subject: [PATCH 153/489] Install m3-cdecimal in Travis environments.

Follow the cdecimal to m3-cdecimal package rename within TravisCI configuration.
---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d5433ebf..29eedd43a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,13 +16,13 @@ matrix:
     - os: linux
       python: 2.6
       env:
-      - CDECIMAL=cdecimal
+      - CDECIMAL=m3-cdecimal
     - os: linux
       python: 2.7
     - os: linux
       python: 2.7
       env:
-      - CDECIMAL=cdecimal
+      - CDECIMAL=m3-cdecimal
     - os: linux
       python: pypy
     - os: linux
@@ -43,7 +43,7 @@ matrix:
       - PYTHON_VERSION=2.6.6
       - PYENV_ROOT=~/.pyenv
       - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
-      - CDECIMAL=cdecimal
+      - CDECIMAL=m3-cdecimal
     - os: osx
       language: generic
       env:
@@ -56,7 +56,7 @@ matrix:
       - PYTHON_VERSION=2.7.10
       - PYENV_ROOT=~/.pyenv
       - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
-      - CDECIMAL=cdecimal
+      - CDECIMAL=m3-cdecimal
     - os: osx
       language: generic
       env:
@@ -85,7 +85,7 @@ matrix:
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
-  - pip install --allow-external cdecimal --upgrade pytest==2.8.5 pytest-cov==2.2.0 $CDECIMAL
+  - pip install --upgrade pytest==2.8.5 pytest-cov==2.2.0 $CDECIMAL
   - pip install --editable .
 
 script:

From ad11101f5e74abd0c6d9dc2d65ecd600b854da22 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 23 Dec 2015 23:21:33 +0200
Subject: [PATCH 154/489] Flatten NullTranslations.files into a list

`filter` is special in Python 3, and latter usages would error out in
strange ways.

Fixes #92 (https://github.com/python-babel/babel/pull/92)
Fixes #162 (https://github.com/python-babel/babel/pull/162)
---
 babel/support.py      |  2 +-
 tests/test_support.py | 27 ++++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/babel/support.py b/babel/support.py
index 3b4869cdb..e803138e0 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -298,7 +298,7 @@ def __init__(self, fp=None):
         self._catalog = {}
         self.plural = lambda n: int(n != 1)
         super(NullTranslations, self).__init__(fp=fp)
-        self.files = filter(None, [getattr(fp, 'name', None)])
+        self.files = list(filter(None, [getattr(fp, 'name', None)]))
         self.domain = self.DEFAULT_DOMAIN
         self._domains = {}
 
diff --git a/tests/test_support.py b/tests/test_support.py
index 4647f6b13..efdddeb71 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -22,7 +22,7 @@
 from babel import support
 from babel.messages import Catalog
 from babel.messages.mofile import write_mo
-from babel._compat import BytesIO
+from babel._compat import BytesIO, PY2
 
 
 @pytest.mark.usefixtures("os_environ")
@@ -328,3 +328,28 @@ def greeting(name='world'):
         u"Hello, universe!",
         u"Hello, world!",
     ]
+
+
+def test_catalog_merge_files():
+    # Refs issues #92, #162
+    t1 = support.Translations()
+    assert t1.files == []
+    t1._catalog["foo"] = "bar"
+    if PY2:
+        # Explicitly use the pure-Python `StringIO` class, as we need to
+        # augment it with the `name` attribute, which we can't do for
+        # `babel._compat.BytesIO`, which is `cStringIO.StringIO` under
+        # `PY2`...
+        from StringIO import StringIO
+        fp = StringIO()
+    else:
+        fp = BytesIO()
+    write_mo(fp, Catalog())
+    fp.seek(0)
+    fp.name = "pro.mo"
+    t2 = support.Translations(fp)
+    assert t2.files == ["pro.mo"]
+    t2._catalog["bar"] = "quux"
+    t1.merge(t2)
+    assert t1.files == ["pro.mo"]
+    assert set(t1._catalog.keys()) == set(('', 'foo', 'bar'))

From 2aa80748f6123aa95f752353263c6ca2567b735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roy=20Wellington=20=E2=85=A3?= <roy@mybasis.com>
Date: Tue, 31 Mar 2015 14:44:10 -0700
Subject: [PATCH 155/489] Add __hash__ to Locale.

---
 babel/core.py      | 3 +++
 tests/test_core.py | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/babel/core.py b/babel/core.py
index 84ee18920..2df139c2c 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -326,6 +326,9 @@ def __eq__(self, other):
     def __ne__(self, other):
         return not self.__eq__(other)
 
+    def __hash__(self):
+        return hash((self.language, self.territory, self.script, self.variant))
+
     def __repr__(self):
         parameters = ['']
         for key in ('territory', 'script', 'variant'):
diff --git a/tests/test_core.py b/tests/test_core.py
index 4ce92ddbc..c887d5f53 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -57,6 +57,11 @@ def test_get_global():
 
 class TestLocaleClass:
 
+    def test_hash(self):
+        locale_a = Locale('en', 'US')
+        locale_b = Locale('en', 'US')
+        assert hash(locale_a) == hash(locale_b)
+
     def test_repr(self):
         assert repr(Locale('en', 'US')) == "Locale('en', territory='US')"
 

From fd2447fc8b131ed5bb3a0ee9f23295a124ddd8ba Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 29 Dec 2015 17:55:15 +0200
Subject: [PATCH 156/489] Improve Locale equality and hashing tests

---
 tests/test_core.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/tests/test_core.py b/tests/test_core.py
index c887d5f53..48eb9fe7e 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -24,18 +24,26 @@ def test_locale_provides_access_to_cldr_locale_data():
     assert u'English (United States)' == locale.display_name
     assert u'.' == locale.number_symbols['decimal']
 
+
 def test_locale_repr():
+    assert repr(Locale('en', 'US')) == "Locale('en', territory='US')"
     assert ("Locale('de', territory='DE')" == repr(Locale('de', 'DE')))
     assert ("Locale('zh', territory='CN', script='Hans')" ==
             repr(Locale('zh', 'CN', script='Hans')))
 
 def test_locale_comparison():
     en_US = Locale('en', 'US')
+    en_US_2 = Locale('en', 'US')
+    fi_FI = Locale('fi', 'FI')
+    bad_en_US = Locale('en_US')
     assert en_US == en_US
+    assert en_US == en_US_2
+    assert en_US != fi_FI
+    assert not (en_US != en_US_2)
     assert None != en_US
-
-    bad_en_US = Locale('en_US')
     assert en_US != bad_en_US
+    assert fi_FI != bad_en_US
+
 
 def test_can_return_default_locale(os_environ):
     os_environ['LC_MESSAGES'] = 'fr_FR.UTF-8'
@@ -55,16 +63,15 @@ def test_get_global():
     assert core.get_global('zone_territories')['Europe/Berlin'] == 'DE'
 
 
-class TestLocaleClass:
-
-    def test_hash(self):
-        locale_a = Locale('en', 'US')
-        locale_b = Locale('en', 'US')
-        assert hash(locale_a) == hash(locale_b)
+def test_hash():
+    locale_a = Locale('en', 'US')
+    locale_b = Locale('en', 'US')
+    locale_c = Locale('fi', 'FI')
+    assert hash(locale_a) == hash(locale_b)
+    assert hash(locale_a) != hash(locale_c)
 
-    def test_repr(self):
-        assert repr(Locale('en', 'US')) == "Locale('en', territory='US')"
 
+class TestLocaleClass:
     def test_attributes(self):
         locale = Locale('en', 'US')
         assert locale.language == 'en'
@@ -262,6 +269,7 @@ def test_negotiate_locale():
             'ja_JP')
     assert core.negotiate_locale(['no', 'sv'], ['nb_NO', 'sv_SE']) == 'nb_NO'
 
+
 def test_parse_locale():
     assert core.parse_locale('zh_CN') == ('zh', 'CN', None, None)
     assert core.parse_locale('zh_Hans_CN') == ('zh', 'CN', 'Hans', None)

From 5784501a7584438f83756f260d912b777585ab48 Mon Sep 17 00:00:00 2001
From: Lukas B <lukas-b@users.noreply.github.com>
Date: Tue, 4 Nov 2014 15:49:28 -0800
Subject: [PATCH 157/489] Fix typo and add semicolon in plural_forms

Fix typo and add semicolon in plural_forms (missing l in 'plural' and semicolon at the end).

It currently produces incorrect plural form string.
---
 babel/messages/plurals.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
index 05f91102b..cc7b79e3e 100644
--- a/babel/messages/plurals.py
+++ b/babel/messages/plurals.py
@@ -208,7 +208,7 @@ class _PluralTuple(tuple):
     The number of plurals used by the locale.""")
     plural_expr = property(itemgetter(1), doc="""
     The plural expression used by the locale.""")
-    plural_forms = property(lambda x: 'npurals=%s; plural=%s' % x, doc="""
+    plural_forms = property(lambda x: 'nplurals=%s; plural=%s;' % x, doc="""
     The plural expression used by the catalog or locale.""")
 
     def __str__(self):
@@ -233,13 +233,13 @@ def get_plural(locale=LC_CTYPE):
     >>> tup.plural_expr
     '0'
     >>> tup.plural_forms
-    'npurals=1; plural=0'
+    'nplurals=1; plural=0;'
 
     Converting the tuple into a string prints the plural forms for a
     gettext catalog:
 
     >>> str(tup)
-    'npurals=1; plural=0'
+    'nplurals=1; plural=0;'
     """
     locale = Locale.parse(locale)
     try:

From 52a835b0d1b664a514770925de96d586d0f429d5 Mon Sep 17 00:00:00 2001
From: Lukas B <lukas-b@users.noreply.github.com>
Date: Tue, 4 Nov 2014 15:51:39 -0800
Subject: [PATCH 158/489] Beef up test_plurals.py

Update test coverage in test_plurals.py
---
 tests/messages/test_plurals.py | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py
index 8c11745ff..63ede13e2 100644
--- a/tests/messages/test_plurals.py
+++ b/tests/messages/test_plurals.py
@@ -37,9 +37,28 @@ def test_get_plural_falls_back_to_default():
     assert plurals.get_plural('aa') == (2, '(n != 1)')
 
 
-def test_plural_tuple_attributes():
-    tup = plurals.get_plural("ja")
-    assert tup.num_plurals == 1
-    assert tup.plural_expr == '0'
-    assert tup.plural_forms == 'npurals=1; plural=0'
-    assert str(tup) == 'npurals=1; plural=0'
+def test_get_plural():
+    # See http://localization-guide.readthedocs.org/en/latest/l10n/pluralforms.html for more details.
+    assert plurals.get_plural(locale='en') == (2, '(n != 1)')
+    assert plurals.get_plural(locale='ga') == (3, '(n==1 ? 0 : n==2 ? 1 : 2)')
+
+    plural_ja = plurals.get_plural("ja")
+    assert str(plural_ja) == 'nplurals=1; plural=0;'
+    assert plural_ja.num_plurals == 1
+    assert plural_ja.plural_expr == '0'
+    assert plural_ja.plural_forms == 'nplurals=1; plural=0;'
+
+    plural_en_US = plurals.get_plural('en_US')
+    assert str(plural_en_US) == 'nplurals=2; plural=(n != 1);'
+    assert plural_en_US.num_plurals == 2
+    assert plural_en_US.plural_expr == '(n != 1)'
+
+    plural_fr_FR = plurals.get_plural('fr_FR')
+    assert str(plural_fr_FR) == 'nplurals=2; plural=(n > 1);'
+    assert plural_fr_FR.num_plurals == 2
+    assert plural_fr_FR.plural_expr == '(n > 1)'
+
+    plural_pl_PL = plurals.get_plural('pl_PL')
+    assert str(plural_pl_PL) == 'nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);'
+    assert plural_pl_PL.num_plurals == 3
+    assert plural_pl_PL.plural_expr == '(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)'

From e0e7ef168856bb431076cfe45f6c456d12091233 Mon Sep 17 00:00:00 2001
From: David Stanek <dstanek@dstanek.com>
Date: Thu, 5 Sep 2013 13:15:57 -0400
Subject: [PATCH 159/489] Updates a catalog's header to from the template

A language specific catalog's initial header is based on the template
when it is created.  Updates to the template's header were previously
not getting into the catalog during the update_catalog process.
---
 babel/messages/catalog.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 21499ae6d..f72a34fca 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -797,6 +797,11 @@ def _merge(message, oldkey, newkey):
         for msgid in remaining:
             if no_fuzzy_matching or msgid not in fuzzy_matches:
                 self.obsolete[msgid] = remaining[msgid]
+
+        # Allow the updated catalog's header to be rewritten based on the
+        # template's header
+        self.header_comment = template.header_comment
+
         # Make updated catalog's POT-Creation-Date equal to the template
         # used to update the catalog
         self.creation_date = template.creation_date

From 018aa8526c470086b2e10c3eb81ccfcc3525071d Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 30 Dec 2015 16:39:48 +0200
Subject: [PATCH 160/489] Add a test for header_comment updating.

---
 tests/messages/test_catalog.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index 31bb1d140..7d18d80a9 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -428,7 +428,7 @@ def test_catalog_add():
 
 
 def test_catalog_update():
-    template = catalog.Catalog()
+    template = catalog.Catalog(header_comment="# A Custom Header")
     template.add('green', locations=[('main.py', 99)])
     template.add('blue', locations=[('main.py', 100)])
     template.add(('salad', 'salads'), locations=[('util.py', 42)])
@@ -440,6 +440,7 @@ def test_catalog_update():
 
     cat.update(template)
     assert len(cat) == 3
+    assert cat.header_comment == template.header_comment  # Header comment also gets updated
 
     msg1 = cat['green']
     msg1.string

From bbacb6c28a07558c51286b491ca4c1c89f1f38a3 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 30 Dec 2015 17:00:25 +0200
Subject: [PATCH 161/489] Post coverage results to Codecov from Appveyor

---
 .ci/appveyor.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index 8bec9251e..e7b13f20b 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -51,11 +51,12 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   # Build data files
-  - "pip install --upgrade pytest==2.8.5"
+  - "pip install --upgrade pytest==2.8.5 pytest-cov==2.2.0 codecov"
   - "pip install --editable ."
   - "python setup.py import_cldr"
 
 build: false  # Not a C# project, build stuff at the test step instead.
 
 test_script:
-  - "%CMD_IN_ENV% python -m pytest"
+  - "%CMD_IN_ENV% python -m pytest --cov=babel"
+  - "codecov"

From 327bcdf9e83d3e07619912a980e3b1e5eba38a89 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Sat, 2 Jan 2016 14:54:14 +0100
Subject: [PATCH 162/489] Release 2.2

---
 CHANGES           | 44 ++++++++++++++++++++++++++++++++++++--------
 babel/__init__.py |  2 +-
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 77c426c2c..dc0e82179 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,17 +1,45 @@
 Babel Changelog
 ===============
 
-Version 2.2
+Version 2.3
 -----------
 
-(Feature release, release date to be decided)
+(Feature release, release data to be decided)
+
+Version 2.2
+-----------
 
-- Upgraded data to CLDR 26
-- Add official support for Python 3.4
-- Use the CLDR recommended amount of decimal digits when formatting
-  currencies (https://github.com/python-babel/babel/issues/139)
-- Properly load and use currency format types
-  (https://github.com/python-babel/babel/issues/201)
+(Feature release, released on January 2nd 2016)
+
+### Bugfixes
+
+* General: Add __hash__ to Locale. (#303) (2aa8074)
+* General: Allow files with BOM if they're UTF-8 (#189) (da87edd)
+* General: localedata directory is now locale-data (#109) (2d1882e)
+* General: odict: Fix pop method (0a9e97e)
+* General: Removed uses of datetime.date class from *.dat files (#174) (94f6830)
+* Messages: Fix plural selection for chinese (531f666)
+* Messages: Fix typo and add semicolon in plural_forms (5784501)
+* Messages: Flatten NullTranslations.files into a list (ad11101)
+* Times: FixedOffsetTimezone: fix display of negative offsets (d816803)
+
+### Features
+
+* CLDR: Update to CLDR 28 (#292) (9f7f4d0)
+* General: Add __copy__ and __deepcopy__ to LazyProxy. (a1cc3f1)
+* General: Add official support for Python 3.4 and 3.5
+* General: Improve odict performance by making key search O(1) (6822b7f)
+* Locale: Add an ordinal_form property to Locale (#270) (b3f3430)
+* Locale: Add support for list formatting (37ce4fa, be6e23d)
+* Locale: Check inheritance exceptions first (3ef0d6d)
+* Messages: Allow file locations without line numbers (#279) (79bc781)
+* Messages: Allow passing a callable to `extract()` (#289) (3f58516)
+* Messages: Support 'Language' header field of PO files (#76) (3ce842b)
+* Messages: Update catalog headers from templates (e0e7ef1)
+* Numbers: Properly load and expose currency format types (#201) (df676ab)
+* Numbers: Use cdecimal by default when available (b6169be)
+* Numbers: Use the CLDR's suggested number of decimals for format_currency (#139) (201ed50)
+* Times: Add format_timedelta(format='narrow') support (edc5eb5)
 
 Version 2.1
 -----------
diff --git a/babel/__init__.py b/babel/__init__.py
index d2e52599c..c58e972fb 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
      negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.2.0.dev0'
+__version__ = '2.2.0'

From 80380ffc70ceb2403ad9a3ff678a6d8b13b94301 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Sat, 2 Jan 2016 20:29:04 +0100
Subject: [PATCH 163/489] Set version to development

---
 babel/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index c58e972fb..d2e52599c 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
      negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.2.0'
+__version__ = '2.2.0.dev0'

From f9b04a5fb2ee166ca75358ff574f00d1cd62a916 Mon Sep 17 00:00:00 2001
From: Roman Imankulov <roman.imankulov@gmail.com>
Date: Tue, 13 Oct 2015 11:18:48 +0000
Subject: [PATCH 164/489] Fix UnicodeEncodeError on file encoding detection

If the first line of a python file is not a valid latin-1 string,
parse_encoding dies with "UnicodeDecodeError". These strings nonetheless can be
valid in some scenarios (for example, Mako extractor uses
babel.messages.extract.extract_python), and it makes more sense to ignore this
exception and return None.
---
 babel/util.py      |  2 +-
 tests/test_util.py | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/babel/util.py b/babel/util.py
index 1849e8a04..54f7d2db0 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -65,7 +65,7 @@ def parse_encoding(fp):
             try:
                 import parser
                 parser.suite(line1.decode('latin-1'))
-            except (ImportError, SyntaxError):
+            except (ImportError, SyntaxError, UnicodeEncodeError):
                 # Either it's a real syntax error, in which case the source is
                 # not valid python source, or line2 is a continuation of line1,
                 # in which case we don't want to scan line2 for a magic
diff --git a/tests/test_util.py b/tests/test_util.py
index bb2bfdb4b..d4b4be523 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -14,6 +14,7 @@
 import unittest
 
 from babel import util
+from babel._compat import BytesIO
 
 
 def test_distinct():
@@ -52,3 +53,17 @@ def test_zone_zero_offset(self):
     def test_zone_positive_offset(self):
         self.assertEqual('Etc/GMT+330', util.FixedOffsetTimezone(330).zone)
 
+
+parse_encoding = lambda s: util.parse_encoding(BytesIO(s.encode('utf-8')))
+
+
+def test_parse_encoding_defined():
+    assert parse_encoding(u'# coding: utf-8') == 'utf-8'
+
+
+def test_parse_encoding_undefined():
+    assert parse_encoding(u'') is None
+
+
+def test_parse_encoding_non_ascii():
+    assert parse_encoding(u'K\xf6ln') is None

From 65e20c11bd8c8edececd54b20795e6a4f42d966e Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@starleaf.com>
Date: Mon, 28 Sep 2015 17:44:30 +0100
Subject: [PATCH 165/489] Add support for date-time skeletons

The skeletons for dates and times are described on
http://cldr.unicode.org/translation/date-time-patterns under
Additional Date-Time Formats. And are useful when you want to some more
control over formatting dates and times but don't want to force all
locales to use the same pattern.
---
 babel/core.py          | 13 +++++++++++++
 babel/dates.py         | 28 ++++++++++++++++++++++++++++
 scripts/import_cldr.py |  5 +++++
 tests/test_core.py     |  4 ++++
 tests/test_dates.py    |  9 +++++++++
 5 files changed, 59 insertions(+)

diff --git a/babel/core.py b/babel/core.py
index 813a61a96..c08cfa737 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -731,6 +731,19 @@ def datetime_formats(self):
         """
         return self._data['datetime_formats']
 
+    @property
+    def datetime_skeletons(self):
+        """Locale patterns for formatting parts of a datetime.
+
+        >>> Locale('en').datetime_skeletons['MEd']
+        <DateTimePattern u'E, M/d'>
+        >>> Locale('fr').datetime_skeletons['MEd']
+        <DateTimePattern u'E dd/MM'>
+        >>> Locale('fr').datetime_skeletons['H']
+        <DateTimePattern u"HH 'h'">
+        """
+        return self._data['datetime_skeletons']
+
     @property
     def plural_form(self):
         """Plural rules for the locale.
diff --git a/babel/dates.py b/babel/dates.py
index ab2d4fb29..4f66adbe5 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -694,6 +694,34 @@ def format_time(time=None, format='medium', tzinfo=None, locale=LC_TIME):
     return parse_pattern(format).apply(time, locale)
 
 
+def format_skeleton(skeleton, datetime=None, tzinfo=None, locale=LC_TIME):
+    r"""Return a time and/or date formatted according to the given pattern.
+
+    The skeletons are defined in the CLDR data and provide more flexibility
+    than the simple short/long/medium formats, but are a bit harder to use.
+    The are defined using the date/time symbols without order or punctuation
+    and map to a suitable format for the given locale.
+
+    >>> t = datetime(2007, 4, 1, 15, 30)
+    >>> format_skeleton('MMMEd', t, locale='fr')
+    u'dim. 1 avr.'
+    >>> format_skeleton('MMMEd', t, locale='en')
+    u'Sun, Apr 1'
+
+    After the skeleton is resolved to a pattern `format_datetime` is called so
+    all timezone processing etc is the same as for that.
+
+    :param skeleton: A date time skeleton as defined in the cldr data.
+    :param datetime: the ``time`` or ``datetime`` object; if `None`, the current
+                 time in UTC is used
+    :param tzinfo: the time-zone to apply to the time for display
+    :param locale: a `Locale` object or a locale identifier
+    """
+    locale = Locale.parse(locale)
+    format = locale.datetime_skeletons[skeleton]
+    return format_datetime(datetime, format, tzinfo, locale)
+
+
 TIMEDELTA_UNITS = (
     ('year',   3600 * 24 * 365),
     ('month',  3600 * 24 * 30),
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 2925acc8a..a5d0ad5dd 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -576,6 +576,7 @@ def main():
                         )
 
             datetime_formats = data.setdefault('datetime_formats', {})
+            datetime_skeletons = data.setdefault('datetime_skeletons', {})
             for format in calendar.findall('dateTimeFormats'):
                 for elem in format.getiterator():
                     if elem.tag == 'dateTimeFormatLength':
@@ -591,6 +592,10 @@ def main():
                         datetime_formats = Alias(_translate_alias(
                             ['datetime_formats'], elem.attrib['path'])
                         )
+                    elif elem.tag == 'availableFormats':
+                        for datetime_skeleton in elem.findall('dateFormatItem'):
+                            datetime_skeletons[datetime_skeleton.attrib['id']] = \
+                                dates.parse_pattern(text_type(datetime_skeleton.text))
 
         # <numbers>
 
diff --git a/tests/test_core.py b/tests/test_core.py
index 48eb9fe7e..54cf37dde 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -236,6 +236,10 @@ def test_datetime_formats_property(self):
         assert Locale('en').datetime_formats['full'] == u"{1} 'at' {0}"
         assert Locale('th').datetime_formats['medium'] == u'{1} {0}'
 
+    def test_datetime_skeleton_property(self):
+        assert Locale('en').datetime_skeletons['Md'].pattern == u"M/d"
+        assert Locale('th').datetime_skeletons['Md'].pattern == u'd/M'
+
     def test_plural_form_property(self):
         assert Locale('en').plural_form(1) == 'one'
         assert Locale('en').plural_form(0) == 'other'
diff --git a/tests/test_dates.py b/tests/test_dates.py
index ea4805bb8..30a0ea3d5 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -498,6 +498,15 @@ def test_format_time():
     assert us_east == u'3:30:00 PM Eastern Standard Time'
 
 
+def test_format_skeleton():
+    dt = datetime(2007, 4, 1, 15, 30)
+    assert (dates.format_skeleton('yMEd', dt, locale='en_US') == u'Sun, 4/1/2007')
+    assert (dates.format_skeleton('yMEd', dt, locale='th') == u'อา. 1/4/2007')
+
+    assert (dates.format_skeleton('EHm', dt, locale='en') == u'Sun 15:30')
+    assert (dates.format_skeleton('EHm', dt, tzinfo=timezone('Asia/Bangkok'), locale='th') == u'อา. 22:30 น.')
+
+
 def test_format_timedelta():
     assert (dates.format_timedelta(timedelta(weeks=12), locale='en_US')
             == u'3 months')

From 0ee2920521f683f8e3acd43d444c45b655751adf Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 30 Dec 2015 21:53:12 +0200
Subject: [PATCH 166/489] Frontend: Use Distutils commands also for the CLI

---
 babel/messages/frontend.py      | 588 ++++++--------------------------
 tests/messages/test_frontend.py |   3 -
 2 files changed, 113 insertions(+), 478 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 56f1b7677..572d71113 100755
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -14,8 +14,8 @@
 except ImportError:
     from configparser import RawConfigParser
 from datetime import datetime
-from distutils import log
-from distutils.cmd import Command
+from distutils import log as distutils_log
+from distutils.cmd import Command as _Command
 from distutils.errors import DistutilsOptionError, DistutilsSetupError
 from locale import getpreferredencoding
 import logging
@@ -35,7 +35,31 @@
 from babel.messages.mofile import write_mo
 from babel.messages.pofile import read_po, write_po
 from babel.util import odict, LOCALTZ
-from babel._compat import string_types, StringIO, PY2
+from babel._compat import string_types, StringIO
+
+
+class Command(_Command):
+    # This class is a small shim between Distutils commands and
+    # optparse option parsing in the frontend command line.
+
+    #: Option name to be input as `args` on the script command line.
+    as_args = None
+
+    #: Options which allow multiple values.
+    multiple_value_options = ()
+
+    #: Log object. To allow replacement in the script command line runner.
+    log = distutils_log
+
+    def __init__(self, dist=None):
+        # A less strict version of distutils' `__init__`.
+        self.distribution = dist
+        self.initialize_options()
+        self._dry_run = None
+        self.verbose = False
+        self.force = None
+        self.help = 0
+        self.finalized = 0
 
 
 class compile_catalog(Command):
@@ -142,19 +166,19 @@ def run(self):
                 percentage = 0
                 if len(catalog):
                     percentage = translated * 100 // len(catalog)
-                log.info('%d of %d messages (%d%%) translated in %r',
+                self.log.info('%d of %d messages (%d%%) translated in %r',
                          translated, len(catalog), percentage, po_file)
 
             if catalog.fuzzy and not self.use_fuzzy:
-                log.warn('catalog %r is marked as fuzzy, skipping', po_file)
+                self.log.info('catalog %r is marked as fuzzy, skipping', po_file)
                 continue
 
             for message, errors in catalog.check():
                 for error in errors:
-                    log.error('error: %s:%d: %s', po_file, message.lineno,
+                    self.log.error('error: %s:%d: %s', po_file, message.lineno,
                               error)
 
-            log.info('compiling catalog %r to %r', po_file, mo_file)
+            self.log.info('compiling catalog %r to %r', po_file, mo_file)
 
             outfile = open(mo_file, 'wb')
             try:
@@ -181,7 +205,7 @@ class extract_messages(Command):
     description = 'extract localizable strings from the project code'
     user_options = [
         ('charset=', None,
-         'charset to use in the output file'),
+         'charset to use in the output file (default "utf-8")'),
         ('keywords=', 'k',
          'space-separated list of keywords to look for in addition to the '
          'defaults'),
@@ -208,6 +232,10 @@ class extract_messages(Command):
          'set report address for msgid'),
         ('copyright-holder=', None,
          'set copyright holder in output'),
+        ('project=', None,
+         'set project name in output'),
+        ('version=', None,
+         'set project version in output'),
         ('add-comments=', 'c',
          'place comment block with TAG (or those preceding keyword lines) in '
          'output file. Separate multiple TAGs with commas(,)'),
@@ -221,6 +249,8 @@ class extract_messages(Command):
         'no-default-keywords', 'no-location', 'omit-header', 'no-wrap',
         'sort-output', 'sort-by-file', 'strip-comments'
     ]
+    as_args = 'input-dirs'
+    multiple_value_options = ('add-comments',)
 
     def initialize_options(self):
         self.charset = 'utf-8'
@@ -238,8 +268,9 @@ def initialize_options(self):
         self.sort_by_file = False
         self.msgid_bugs_address = None
         self.copyright_holder = None
+        self.project = None
+        self.version = None
         self.add_comments = None
-        self._add_comments = []
         self.strip_comments = False
 
     def finalize_options(self):
@@ -266,21 +297,33 @@ def finalize_options(self):
                                        "are mutually exclusive")
 
         if self.input_dirs:
-            self.input_dirs = re.split(',\s*', self.input_dirs)
+            if isinstance(self.input_dirs, string_types):
+                self.input_dirs = re.split(',\s*', self.input_dirs)
         else:
             self.input_dirs = dict.fromkeys([k.split('.',1)[0]
-                for k in self.distribution.packages
+                for k in (self.distribution.packages or ())
             ]).keys()
 
+        if not self.input_dirs:
+            raise DistutilsOptionError("no input directories specified")
+
         if self.add_comments:
-            self._add_comments = self.add_comments.split(',')
+            if isinstance(self.add_comments, string_types):
+                self.add_comments = self.add_comments.split(',')
+        else:
+            self.add_comments = []
+
+        if self.distribution:
+            if not self.project:
+                self.project = self.distribution.get_name()
+            if not self.version:
+                self.version = self.distribution.get_version()
 
     def run(self):
         mappings = self._get_mappings()
-        outfile = open(self.output_file, 'wb')
-        try:
-            catalog = Catalog(project=self.distribution.get_name(),
-                              version=self.distribution.get_version(),
+        with open(self.output_file, 'wb') as outfile:
+            catalog = Catalog(project=self.project,
+                              version=self.version,
                               msgid_bugs_address=self.msgid_bugs_address,
                               copyright_holder=self.copyright_holder,
                               charset=self.charset)
@@ -294,11 +337,11 @@ def callback(filename, method, options):
                     if options:
                         optstr = ' (%s)' % ', '.join(['%s="%s"' % (k, v) for
                                                       k, v in options.items()])
-                    log.info('extracting messages from %s%s', filepath, optstr)
+                    self.log.info('extracting messages from %s%s', filepath, optstr)
 
                 extracted = extract_from_dir(dirname, method_map, options_map,
                                              keywords=self._keywords,
-                                             comment_tags=self._add_comments,
+                                             comment_tags=self.add_comments,
                                              callback=callback,
                                              strip_comment_tags=
                                                 self.strip_comments)
@@ -307,14 +350,12 @@ def callback(filename, method, options):
                     catalog.add(message, None, [(filepath, lineno)],
                                 auto_comments=comments, context=context)
 
-            log.info('writing PO template file to %s' % self.output_file)
+            self.log.info('writing PO template file to %s' % self.output_file)
             write_po(outfile, catalog, width=self.width,
                      no_location=self.no_location,
                      omit_header=self.omit_header,
                      sort_output=self.sort_output,
                      sort_by_file=self.sort_by_file)
-        finally:
-            outfile.close()
 
     def _get_mappings(self):
         mappings = {}
@@ -436,7 +477,7 @@ def finalize_options(self):
             self.width = int(self.width)
 
     def run(self):
-        log.info('creating catalog %r based on %r', self.output_file,
+        self.log.info('creating catalog %r based on %r', self.output_file,
                  self.input_file)
 
         infile = open(self.input_file, 'rb')
@@ -564,8 +605,7 @@ def run(self):
             raise DistutilsOptionError('no message catalogs found')
 
         for locale, filename in po_files:
-            log.info('updating catalog %r based on %r', filename,
-                     self.input_file)
+            self.log.info('updating catalog %r based on %r', filename, self.input_file)
             infile = open(filename, 'rb')
             try:
                 catalog = read_po(infile, locale=locale, domain=domain)
@@ -618,11 +658,22 @@ class CommandLineInterface(object):
         'update':  'update existing message catalogs from a POT file'
     }
 
-    def run(self, argv=sys.argv):
+    command_classes = {
+        'compile': compile_catalog,
+        'extract': extract_messages,
+        'init': init_catalog,
+        'update': update_catalog,
+    }
+
+    def run(self, argv=None):
         """Main entry point of the command-line interface.
 
         :param argv: list of arguments passed on the command-line
         """
+
+        if argv is None:
+            argv = sys.argv
+
         self.parser = OptionParser(usage=self.usage % ('command', '[args]'),
                                    version=self.version)
         self.parser.disable_interspersed_args()
@@ -662,7 +713,7 @@ def run(self, argv=sys.argv):
         if cmdname not in self.commands:
             self.parser.error('unknown command "%s"' % cmdname)
 
-        return getattr(self, cmdname)(args[1:])
+        return self._dispatch(cmdname, args[1:])
 
     def _configure_logging(self, loglevel):
         self.log = logging.getLogger('babel')
@@ -688,463 +739,50 @@ def _help(self):
         for name, description in commands:
             print(format % (name, description))
 
-    def compile(self, argv):
-        """Subcommand for compiling a message catalog to a MO file.
-
-        :param argv: the command arguments
-        :since: version 0.9
-        """
-        parser = OptionParser(usage=self.usage % ('compile', ''),
-                              description=self.commands['compile'])
-        parser.add_option('--domain', '-D', dest='domain',
-                          help="domain of MO and PO files (default '%default')")
-        parser.add_option('--directory', '-d', dest='directory',
-                          metavar='DIR', help='base directory of catalog files')
-        parser.add_option('--locale', '-l', dest='locale', metavar='LOCALE',
-                          help='locale of the catalog')
-        parser.add_option('--input-file', '-i', dest='input_file',
-                          metavar='FILE', help='name of the input file')
-        parser.add_option('--output-file', '-o', dest='output_file',
-                          metavar='FILE',
-                          help="name of the output file (default "
-                               "'<output_dir>/<locale>/LC_MESSAGES/"
-                               "<domain>.mo')")
-        parser.add_option('--use-fuzzy', '-f', dest='use_fuzzy',
-                          action='store_true',
-                          help='also include fuzzy translations (default '
-                               '%default)')
-        parser.add_option('--statistics', dest='statistics',
-                          action='store_true',
-                          help='print statistics about translations')
-
-        parser.set_defaults(domain='messages', use_fuzzy=False,
-                            compile_all=False, statistics=False)
-        options, args = parser.parse_args(argv)
-
-        po_files = []
-        mo_files = []
-        if not options.input_file:
-            if not options.directory:
-                parser.error('you must specify either the input file or the '
-                             'base directory')
-            if options.locale:
-                po_files.append((options.locale,
-                                 os.path.join(options.directory,
-                                              options.locale, 'LC_MESSAGES',
-                                              options.domain + '.po')))
-                mo_files.append(os.path.join(options.directory, options.locale,
-                                             'LC_MESSAGES',
-                                             options.domain + '.mo'))
-            else:
-                for locale in os.listdir(options.directory):
-                    po_file = os.path.join(options.directory, locale,
-                                           'LC_MESSAGES', options.domain + '.po')
-                    if os.path.exists(po_file):
-                        po_files.append((locale, po_file))
-                        mo_files.append(os.path.join(options.directory, locale,
-                                                     'LC_MESSAGES',
-                                                     options.domain + '.mo'))
-        else:
-            po_files.append((options.locale, options.input_file))
-            if options.output_file:
-                mo_files.append(options.output_file)
-            else:
-                if not options.directory:
-                    parser.error('you must specify either the output file or '
-                                 'the base directory')
-                mo_files.append(os.path.join(options.directory, options.locale,
-                                             'LC_MESSAGES',
-                                             options.domain + '.mo'))
-        if not po_files:
-            parser.error('no message catalogs found')
-
-        for idx, (locale, po_file) in enumerate(po_files):
-            mo_file = mo_files[idx]
-            infile = open(po_file, 'rb')
-            try:
-                catalog = read_po(infile, locale)
-            finally:
-                infile.close()
-
-            if options.statistics:
-                translated = 0
-                for message in list(catalog)[1:]:
-                    if message.string:
-                        translated +=1
-                percentage = 0
-                if len(catalog):
-                    percentage = translated * 100 // len(catalog)
-                self.log.info("%d of %d messages (%d%%) translated in %r",
-                              translated, len(catalog), percentage, po_file)
-
-            if catalog.fuzzy and not options.use_fuzzy:
-                self.log.warning('catalog %r is marked as fuzzy, skipping',
-                                 po_file)
-                continue
-
-            for message, errors in catalog.check():
-                for error in errors:
-                    self.log.error('error: %s:%d: %s', po_file, message.lineno,
-                                   error)
-
-            self.log.info('compiling catalog %r to %r', po_file, mo_file)
-
-            outfile = open(mo_file, 'wb')
-            try:
-                write_mo(outfile, catalog, use_fuzzy=options.use_fuzzy)
-            finally:
-                outfile.close()
-
-    def extract(self, argv):
-        """Subcommand for extracting messages from source files and generating
-        a POT file.
-
-        :param argv: the command arguments
-        """
-        parser = OptionParser(usage=self.usage % ('extract', 'dir1 <dir2> ...'),
-                              description=self.commands['extract'])
-        parser.add_option('--charset', dest='charset',
-                          help='charset to use in the output (default '
-                               '"%default")')
-        parser.add_option('-k', '--keyword', dest='keywords', action='append',
-                          help='keywords to look for in addition to the '
-                               'defaults. You can specify multiple -k flags on '
-                               'the command line.')
-        parser.add_option('--no-default-keywords', dest='no_default_keywords',
-                          action='store_true',
-                          help="do not include the default keywords")
-        parser.add_option('--mapping', '-F', dest='mapping_file',
-                          help='path to the extraction mapping file')
-        parser.add_option('--no-location', dest='no_location',
-                          action='store_true',
-                          help='do not include location comments with filename '
-                               'and line number')
-        parser.add_option('--omit-header', dest='omit_header',
-                          action='store_true',
-                          help='do not include msgid "" entry in header')
-        parser.add_option('-o', '--output', dest='output',
-                          help='path to the output POT file')
-        parser.add_option('-w', '--width', dest='width', type='int',
-                          help="set output line width (default 76)")
-        parser.add_option('--no-wrap', dest='no_wrap', action='store_true',
-                          help='do not break long message lines, longer than '
-                               'the output line width, into several lines')
-        parser.add_option('--sort-output', dest='sort_output',
-                          action='store_true',
-                          help='generate sorted output (default False)')
-        parser.add_option('--sort-by-file', dest='sort_by_file',
-                          action='store_true',
-                          help='sort output by file location (default False)')
-        parser.add_option('--msgid-bugs-address', dest='msgid_bugs_address',
-                          metavar='EMAIL@ADDRESS',
-                          help='set report address for msgid')
-        parser.add_option('--copyright-holder', dest='copyright_holder',
-                          help='set copyright holder in output')
-        parser.add_option('--project', dest='project',
-                          help='set project name in output')
-        parser.add_option('--version', dest='version',
-                          help='set project version in output')
-        parser.add_option('--add-comments', '-c', dest='comment_tags',
-                          metavar='TAG', action='append',
-                          help='place comment block with TAG (or those '
-                               'preceding keyword lines) in output file. One '
-                               'TAG per argument call')
-        parser.add_option('--strip-comment-tags', '-s',
-                          dest='strip_comment_tags', action='store_true',
-                          help='Strip the comment tags from the comments.')
-
-        parser.set_defaults(charset='utf-8', keywords=[],
-                            no_default_keywords=False, no_location=False,
-                            omit_header = False, width=None, no_wrap=False,
-                            sort_output=False, sort_by_file=False,
-                            comment_tags=[], strip_comment_tags=False)
-        options, args = parser.parse_args(argv)
-        if not args:
-            parser.error('incorrect number of arguments')
-
-        keywords = DEFAULT_KEYWORDS.copy()
-        if options.no_default_keywords:
-            if not options.keywords:
-                parser.error('you must specify new keywords if you disable the '
-                             'default ones')
-            keywords = {}
-        if options.keywords:
-            keywords.update(parse_keywords(options.keywords))
-
-        if options.mapping_file:
-            fileobj = open(options.mapping_file, 'U')
-            try:
-                method_map, options_map = parse_mapping(fileobj)
-            finally:
-                fileobj.close()
-        else:
-            method_map = DEFAULT_MAPPING
-            options_map = {}
-
-        if options.width and options.no_wrap:
-            parser.error("'--no-wrap' and '--width' are mutually exclusive.")
-        elif not options.width and not options.no_wrap:
-            options.width = 76
-
-        if options.sort_output and options.sort_by_file:
-            parser.error("'--sort-output' and '--sort-by-file' are mutually "
-                         "exclusive")
-
-        catalog = Catalog(project=options.project,
-                          version=options.version,
-                          msgid_bugs_address=options.msgid_bugs_address,
-                          copyright_holder=options.copyright_holder,
-                          charset=options.charset)
-
-        for dirname in args:
-            if not os.path.isdir(dirname):
-                parser.error('%r is not a directory' % dirname)
-
-            def callback(filename, method, options):
-                if method == 'ignore':
-                    return
-                filepath = os.path.normpath(os.path.join(dirname, filename))
-                optstr = ''
-                if options:
-                    optstr = ' (%s)' % ', '.join(['%s="%s"' % (k, v) for
-                                                  k, v in options.items()])
-                self.log.info('extracting messages from %s%s', filepath,
-                              optstr)
-
-            extracted = extract_from_dir(dirname, method_map, options_map,
-                                         keywords, options.comment_tags,
-                                         callback=callback,
-                                         strip_comment_tags=
-                                            options.strip_comment_tags)
-            for filename, lineno, message, comments, context in extracted:
-                filepath = os.path.normpath(os.path.join(dirname, filename))
-                catalog.add(message, None, [(filepath, lineno)],
-                            auto_comments=comments, context=context)
-
-        catalog_charset = catalog.charset
-        if options.output not in (None, '-'):
-            self.log.info('writing PO template file to %s' % options.output)
-            outfile = open(options.output, 'wb')
-            close_output = True
-        else:
-            outfile = sys.stdout
-
-            # This is a bit of a hack on Python 3.  stdout is a text stream so
-            # we need to find the underlying file when we write the PO.  In
-            # later versions of Babel we want the write_po function to accept
-            # text or binary streams and automatically adjust the encoding.
-            if not PY2 and hasattr(outfile, 'buffer'):
-                catalog.charset = outfile.encoding
-                outfile = outfile.buffer.raw
-
-            close_output = False
-
-        try:
-            write_po(outfile, catalog, width=options.width,
-                     no_location=options.no_location,
-                     omit_header=options.omit_header,
-                     sort_output=options.sort_output,
-                     sort_by_file=options.sort_by_file)
-        finally:
-            if close_output:
-                outfile.close()
-            catalog.charset = catalog_charset
-
-    def init(self, argv):
-        """Subcommand for creating new message catalogs from a template.
-
-        :param argv: the command arguments
+    def _dispatch(self, cmdname, argv):
         """
-        parser = OptionParser(usage=self.usage % ('init', ''),
-                              description=self.commands['init'])
-        parser.add_option('--domain', '-D', dest='domain',
-                          help="domain of PO file (default '%default')")
-        parser.add_option('--input-file', '-i', dest='input_file',
-                          metavar='FILE', help='name of the input file')
-        parser.add_option('--output-dir', '-d', dest='output_dir',
-                          metavar='DIR', help='path to output directory')
-        parser.add_option('--output-file', '-o', dest='output_file',
-                          metavar='FILE',
-                          help="name of the output file (default "
-                               "'<output_dir>/<locale>/LC_MESSAGES/"
-                               "<domain>.po')")
-        parser.add_option('--locale', '-l', dest='locale', metavar='LOCALE',
-                          help='locale for the new localized catalog')
-        parser.add_option('-w', '--width', dest='width', type='int',
-                          help="set output line width (default 76)")
-        parser.add_option('--no-wrap', dest='no_wrap', action='store_true',
-                          help='do not break long message lines, longer than '
-                               'the output line width, into several lines')
-
-        parser.set_defaults(domain='messages')
-        options, args = parser.parse_args(argv)
-
-        if not options.locale:
-            parser.error('you must provide a locale for the new catalog')
-        try:
-            locale = Locale.parse(options.locale)
-        except UnknownLocaleError as e:
-            parser.error(e)
-
-        if not options.input_file:
-            parser.error('you must specify the input file')
-
-        if not options.output_file and not options.output_dir:
-            parser.error('you must specify the output file or directory')
-
-        if not options.output_file:
-            options.output_file = os.path.join(options.output_dir,
-                                               options.locale, 'LC_MESSAGES',
-                                               options.domain + '.po')
-        if not os.path.exists(os.path.dirname(options.output_file)):
-            os.makedirs(os.path.dirname(options.output_file))
-        if options.width and options.no_wrap:
-            parser.error("'--no-wrap' and '--width' are mutually exclusive.")
-        elif not options.width and not options.no_wrap:
-            options.width = 76
-
-        infile = open(options.input_file, 'r')
-        try:
-            # Although reading from the catalog template, read_po must be fed
-            # the locale in order to correctly calculate plurals
-            catalog = read_po(infile, locale=options.locale)
-        finally:
-            infile.close()
-
-        catalog.locale = locale
-        catalog.revision_date = datetime.now(LOCALTZ)
-
-        self.log.info('creating catalog %r based on %r', options.output_file,
-                      options.input_file)
-
-        outfile = open(options.output_file, 'wb')
-        try:
-            write_po(outfile, catalog, width=options.width)
-        finally:
-            outfile.close()
-
-    def update(self, argv):
-        """Subcommand for updating existing message catalogs from a template.
-
-        :param argv: the command arguments
-        :since: version 0.9
+        :type cmdname: str
+        :type argv: list[str]
         """
-        parser = OptionParser(usage=self.usage % ('update', ''),
-                              description=self.commands['update'])
-        parser.add_option('--domain', '-D', dest='domain',
-                          help="domain of PO file (default '%default')")
-        parser.add_option('--input-file', '-i', dest='input_file',
-                          metavar='FILE', help='name of the input file')
-        parser.add_option('--output-dir', '-d', dest='output_dir',
-                          metavar='DIR', help='path to output directory')
-        parser.add_option('--output-file', '-o', dest='output_file',
-                          metavar='FILE',
-                          help="name of the output file (default "
-                               "'<output_dir>/<locale>/LC_MESSAGES/"
-                               "<domain>.po')")
-        parser.add_option('--locale', '-l', dest='locale', metavar='LOCALE',
-                          help='locale of the translations catalog')
-        parser.add_option('-w', '--width', dest='width', type='int',
-                          help="set output line width (default 76)")
-        parser.add_option('--no-wrap', dest='no_wrap', action = 'store_true',
-                          help='do not break long message lines, longer than '
-                               'the output line width, into several lines')
-        parser.add_option('--ignore-obsolete', dest='ignore_obsolete',
-                          action='store_true',
-                          help='do not include obsolete messages in the output '
-                               '(default %default)')
-        parser.add_option('--no-fuzzy-matching', '-N', dest='no_fuzzy_matching',
-                          action='store_true',
-                          help='do not use fuzzy matching (default %default)')
-        parser.add_option('--previous', dest='previous', action='store_true',
-                          help='keep previous msgids of translated messages '
-                               '(default %default)')
-
-        parser.set_defaults(domain='messages', ignore_obsolete=False,
-                            no_fuzzy_matching=False, previous=False)
+        cmdclass = self.command_classes[cmdname]
+        cmdinst = cmdclass()
+        cmdinst.log = self.log  # Use our logger, not distutils'.
+        assert isinstance(cmdinst, Command)
+        cmdinst.initialize_options()
+
+        parser = OptionParser(
+            usage=self.usage % (cmdname, ''),
+            description=self.commands[cmdname]
+        )
+        as_args = getattr(cmdclass, "as_args", ())
+        for long, short, help in cmdclass.user_options:
+            name = long.strip("=")
+            default = getattr(cmdinst, name.replace('-', '_'))
+            strs = ["--%s" % name]
+            if short:
+                strs.append("-%s" % short)
+            if name == as_args:
+                parser.usage += "<%s>" % name
+            elif name in cmdclass.boolean_options:
+                parser.add_option(*strs, action="store_true", help=help)
+            elif name in cmdclass.multiple_value_options:
+                parser.add_option(*strs, action="append", help=help)
+            else:
+                parser.add_option(*strs, help=help, default=default)
         options, args = parser.parse_args(argv)
 
-        if not options.input_file:
-            parser.error('you must specify the input file')
-        if not options.output_file and not options.output_dir:
-            parser.error('you must specify the output file or directory')
-        if options.output_file and not options.locale:
-            parser.error('you must specify the locale')
-        if options.no_fuzzy_matching and options.previous:
-            options.previous = False
+        if as_args:
+            setattr(options, as_args.replace('-', '_'), args)
 
-        po_files = []
-        if not options.output_file:
-            if options.locale:
-                po_files.append((options.locale,
-                                 os.path.join(options.output_dir,
-                                              options.locale, 'LC_MESSAGES',
-                                              options.domain + '.po')))
-            else:
-                for locale in os.listdir(options.output_dir):
-                    po_file = os.path.join(options.output_dir, locale,
-                                           'LC_MESSAGES',
-                                           options.domain + '.po')
-                    if os.path.exists(po_file):
-                        po_files.append((locale, po_file))
-        else:
-            po_files.append((options.locale, options.output_file))
-
-        domain = options.domain
-        if not domain:
-            domain = os.path.splitext(os.path.basename(options.input_file))[0]
+        for key, value in vars(options).items():
+            setattr(cmdinst, key, value)
 
-        infile = open(options.input_file, 'U')
         try:
-            template = read_po(infile)
-        finally:
-            infile.close()
-
-        if not po_files:
-            parser.error('no message catalogs found')
-
-        if options.width and options.no_wrap:
-            parser.error("'--no-wrap' and '--width' are mutually exclusive.")
-        elif not options.width and not options.no_wrap:
-            options.width = 76
-        for locale, filename in po_files:
-            self.log.info('updating catalog %r based on %r', filename,
-                          options.input_file)
-            infile = open(filename, 'U')
-            try:
-                catalog = read_po(infile, locale=locale, domain=domain)
-            finally:
-                infile.close()
-
-            catalog.update(template, options.no_fuzzy_matching)
-
-            tmpname = os.path.join(os.path.dirname(filename),
-                                   tempfile.gettempprefix() +
-                                   os.path.basename(filename))
-            tmpfile = open(tmpname, 'wb')
-            try:
-                try:
-                    write_po(tmpfile, catalog,
-                             ignore_obsolete=options.ignore_obsolete,
-                             include_previous=options.previous,
-                             width=options.width)
-                finally:
-                    tmpfile.close()
-            except:
-                os.remove(tmpname)
-                raise
+            cmdinst.ensure_finalized()
+        except DistutilsOptionError as err:
+            parser.error(str(err))
 
-            try:
-                os.rename(tmpname, filename)
-            except OSError:
-                # We're probably on Windows, which doesn't support atomic
-                # renames, at least not through Python
-                # If the error is in fact due to a permissions problem, that
-                # same error is going to be raised from one of the following
-                # operations
-                os.remove(filename)
-                shutil.copy(tmpname, filename)
-                os.remove(tmpname)
+        cmdinst.run()
 
 
 def main():
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 4d26df50e..4676adc14 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -882,7 +882,6 @@ def test_init_with_output_dir(self):
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: TestProject 0.1\n"
@@ -933,7 +932,6 @@ def test_init_singular_plural_forms(self):
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: TestProject 0.1\n"
@@ -980,7 +978,6 @@ def test_init_more_than_2_plural_forms(self):
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: TestProject 0.1\n"

From 9fb69847349a9a74e29dfd61fbc023e826d05060 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 30 Dec 2015 22:30:12 +0200
Subject: [PATCH 167/489] Slightly tidy up frontend.py

---
 babel/messages/frontend.py | 71 +++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 572d71113..5f6b14165 100755
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -9,33 +9,34 @@
     :license: BSD, see LICENSE for more details.
 """
 from __future__ import print_function
-try:
-    from ConfigParser import RawConfigParser
-except ImportError:
-    from configparser import RawConfigParser
-from datetime import datetime
-from distutils import log as distutils_log
-from distutils.cmd import Command as _Command
-from distutils.errors import DistutilsOptionError, DistutilsSetupError
-from locale import getpreferredencoding
+
 import logging
-from optparse import OptionParser
+import optparse
 import os
 import re
 import shutil
 import sys
 import tempfile
+from datetime import datetime
+from locale import getpreferredencoding
 
 from babel import __version__ as VERSION
 from babel import Locale, localedata
+from babel._compat import StringIO, string_types
 from babel.core import UnknownLocaleError
 from babel.messages.catalog import Catalog
-from babel.messages.extract import extract_from_dir, DEFAULT_KEYWORDS, \
-                                   DEFAULT_MAPPING
+from babel.messages.extract import DEFAULT_KEYWORDS, DEFAULT_MAPPING, extract_from_dir
 from babel.messages.mofile import write_mo
 from babel.messages.pofile import read_po, write_po
-from babel.util import odict, LOCALTZ
-from babel._compat import string_types, StringIO
+from babel.util import LOCALTZ, odict
+from distutils import log as distutils_log
+from distutils.cmd import Command as _Command
+from distutils.errors import DistutilsOptionError, DistutilsSetupError
+
+try:
+    from ConfigParser import RawConfigParser
+except ImportError:
+    from configparser import RawConfigParser
 
 
 class Command(_Command):
@@ -162,12 +163,14 @@ def run(self):
                 translated = 0
                 for message in list(catalog)[1:]:
                     if message.string:
-                        translated +=1
+                        translated += 1
                 percentage = 0
                 if len(catalog):
                     percentage = translated * 100 // len(catalog)
-                self.log.info('%d of %d messages (%d%%) translated in %r',
-                         translated, len(catalog), percentage, po_file)
+                self.log.info(
+                    '%d of %d messages (%d%%) translated in %r',
+                    translated, len(catalog), percentage, po_file
+                )
 
             if catalog.fuzzy and not self.use_fuzzy:
                 self.log.info('catalog %r is marked as fuzzy, skipping', po_file)
@@ -175,8 +178,9 @@ def run(self):
 
             for message, errors in catalog.check():
                 for error in errors:
-                    self.log.error('error: %s:%d: %s', po_file, message.lineno,
-                              error)
+                    self.log.error(
+                        'error: %s:%d: %s', po_file, message.lineno, error
+                    )
 
             self.log.info('compiling catalog %r to %r', po_file, mo_file)
 
@@ -300,7 +304,8 @@ def finalize_options(self):
             if isinstance(self.input_dirs, string_types):
                 self.input_dirs = re.split(',\s*', self.input_dirs)
         else:
-            self.input_dirs = dict.fromkeys([k.split('.',1)[0]
+            self.input_dirs = dict.fromkeys([
+                k.split('.', 1)[0]
                 for k in (self.distribution.packages or ())
             ]).keys()
 
@@ -339,12 +344,13 @@ def callback(filename, method, options):
                                                       k, v in options.items()])
                     self.log.info('extracting messages from %s%s', filepath, optstr)
 
-                extracted = extract_from_dir(dirname, method_map, options_map,
-                                             keywords=self._keywords,
-                                             comment_tags=self.add_comments,
-                                             callback=callback,
-                                             strip_comment_tags=
-                                                self.strip_comments)
+                extracted = extract_from_dir(
+                    dirname, method_map, options_map,
+                    keywords=self._keywords,
+                    comment_tags=self.add_comments,
+                    callback=callback,
+                    strip_comment_tags=self.strip_comments
+                )
                 for filename, lineno, message, comments, context in extracted:
                     filepath = os.path.normpath(os.path.join(dirname, filename))
                     catalog.add(message, None, [(filepath, lineno)],
@@ -477,8 +483,9 @@ def finalize_options(self):
             self.width = int(self.width)
 
     def run(self):
-        self.log.info('creating catalog %r based on %r', self.output_file,
-                 self.input_file)
+        self.log.info(
+            'creating catalog %r based on %r', self.output_file, self.input_file
+        )
 
         infile = open(self.input_file, 'rb')
         try:
@@ -674,8 +681,8 @@ def run(self, argv=None):
         if argv is None:
             argv = sys.argv
 
-        self.parser = OptionParser(usage=self.usage % ('command', '[args]'),
-                                   version=self.version)
+        self.parser = optparse.OptionParser(usage=self.usage % ('command', '[args]'),
+                                            version=self.version)
         self.parser.disable_interspersed_args()
         self.parser.print_help = self._help
         self.parser.add_option('--list-locales', dest='list_locales',
@@ -750,7 +757,7 @@ def _dispatch(self, cmdname, argv):
         assert isinstance(cmdinst, Command)
         cmdinst.initialize_options()
 
-        parser = OptionParser(
+        parser = optparse.OptionParser(
             usage=self.usage % (cmdname, ''),
             description=self.commands[cmdname]
         )
@@ -843,7 +850,7 @@ def parse_mapping(fileobj, filename=None):
     options_map = {}
 
     parser = RawConfigParser()
-    parser._sections = odict(parser._sections) # We need ordered sections
+    parser._sections = odict(parser._sections)  # We need ordered sections
     parser.readfp(fileobj, filename)
     for section in parser.sections():
         if section == 'extractors':

From fd22a8e363db44aff153686cd6cc0f64fff1fdf8 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 31 Dec 2015 02:46:08 +0200
Subject: [PATCH 168/489] Add test for frontend update_command

---
 .gitignore                      |  2 +-
 tests/messages/test_frontend.py | 37 +++++++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 67ba223aa..d8f8bc164 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,6 @@ test-env
 babel/global.dat
 babel/global.dat.json
 tests/messages/data/project/i18n/long_messages.pot
-tests/messages/data/project/i18n/temp.pot
+tests/messages/data/project/i18n/temp*
 tests/messages/data/project/i18n/en_US
 /venv*
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 4676adc14..f958b8050 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -24,9 +24,9 @@
 
 from babel import __version__ as VERSION
 from babel.dates import format_datetime
-from babel.messages import frontend
+from babel.messages import frontend, Catalog
 from babel.util import LOCALTZ
-from babel.messages.pofile import read_po
+from babel.messages.pofile import read_po, write_po
 from babel._compat import StringIO
 
 
@@ -1059,6 +1059,39 @@ def test_compile_catalog_with_more_than_2_plural_forms(self):
             if os.path.isfile(mo_file):
                 os.unlink(mo_file)
 
+    def test_update(self):
+        template = Catalog()
+        template.add("1")
+        template.add("2")
+        template.add("3")
+        tmpl_file = os.path.join(self._i18n_dir(), 'temp-template.pot')
+        with open(tmpl_file, "wb") as outfp:
+            write_po(outfp, template)
+        po_file = os.path.join(self._i18n_dir(), 'temp1.po')
+        self.cli.run(sys.argv + ['init',
+            '-l', 'fi',
+            '-o', po_file,
+            '-i', tmpl_file
+        ])
+        with open(po_file, "r") as infp:
+            catalog = read_po(infp)
+            assert len(catalog) == 3
+
+        # Add another entry to the template
+
+        template.add("4")
+
+        with open(tmpl_file, "wb") as outfp:
+            write_po(outfp, template)
+
+        self.cli.run(sys.argv + ['update',
+            '-l', 'fi_FI',
+            '-o', po_file,
+            '-i', tmpl_file])
+
+        with open(po_file, "r") as infp:
+            catalog = read_po(infp)
+            assert len(catalog) == 4  # Catalog was updated
 
 def test_parse_mapping():
     buf = StringIO(

From 4f60b3ebde4a462ab686129982dc13f3d840617a Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 23 Dec 2015 22:55:42 +0200
Subject: [PATCH 169/489] pofile: sort obsolete messages too

---
 babel/messages/pofile.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 226ac1ce9..e4c00afd9 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -474,7 +474,13 @@ def _write_message(message, prefix=''):
         _write('\n')
 
     if not ignore_obsolete:
-        for message in catalog.obsolete.values():
+        obsolete = list(catalog.obsolete.values())
+        if sort_output:
+            obsolete.sort()
+        elif sort_by_file:
+            obsolete.sort(key=lambda m: m.locations)
+
+        for message in obsolete:
             for comment in message.user_comments:
                 _write_comment(comment)
             _write_message(message, prefix='#~ ')

From bc59c9c64ed285888a1bd929d55abbb63212e95b Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 23 Dec 2015 22:57:34 +0200
Subject: [PATCH 170/489] pofile: always sort message locations

Fixes #77
---
 babel/messages/pofile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index e4c00afd9..dfc78fecb 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -453,7 +453,7 @@ def _write_message(message, prefix=''):
 
         if not no_location:
             locs = []
-            for filename, lineno in message.locations:
+            for filename, lineno in sorted(message.locations):
                 if lineno:
                     locs.append(u'%s:%d' % (filename.replace(os.sep, '/'), lineno))
                 else:

From edce8eeaa594e277d3abb29fb419cf6e4fefb52a Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 24 Dec 2015 20:06:28 +0200
Subject: [PATCH 171/489] pofile: Use `.sort(key=...)`, not `cmp`

Fixes #79 (https://github.com/python-babel/babel/issues/79)
---
 babel/messages/pofile.py      | 2 +-
 tests/messages/test_pofile.py | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index dfc78fecb..3c18226da 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -431,7 +431,7 @@ def _write_message(message, prefix=''):
     if sort_output:
         messages.sort()
     elif sort_by_file:
-        messages.sort(lambda x,y: cmp(x.locations, y.locations))
+        messages.sort(key=lambda m: m.locations)
 
     for message in messages:
         if not message.id: # This is the header "message"
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 4e991c63c..f375a1a42 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -513,6 +513,15 @@ def test_sorted_po(self):
 msgstr[1] "Voeh"''' in value
         assert value.find(b'msgid ""') < value.find(b'msgid "bar"') < value.find(b'msgid "foo"')
 
+    def test_file_sorted_po(self):
+        catalog = Catalog()
+        catalog.add(u'bar', locations=[('utils.py', 3)])
+        catalog.add((u'foo', u'foos'), (u'Voh', u'Voeh'), locations=[('main.py', 1)])
+        buf = BytesIO()
+        pofile.write_po(buf, catalog, sort_by_file=True)
+        value = buf.getvalue().strip()
+        assert value.find(b'main.py') < value.find(b'utils.py')
+
     def test_file_with_no_lineno(self):
         catalog = Catalog()
         catalog.add(u'bar', locations=[('utils.py', None)],

From b4b9ab603b4bcf12620b860dcd78dd3857adcd37 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 8 Jan 2016 10:38:48 +0200
Subject: [PATCH 172/489] Fix CHANGES formatting to ReST

---
 CHANGES | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index dc0e82179..551b82a7a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,7 +11,8 @@ Version 2.2
 
 (Feature release, released on January 2nd 2016)
 
-### Bugfixes
+Bugfixes
+~~~~~~~~
 
 * General: Add __hash__ to Locale. (#303) (2aa8074)
 * General: Allow files with BOM if they're UTF-8 (#189) (da87edd)
@@ -23,7 +24,8 @@ Version 2.2
 * Messages: Flatten NullTranslations.files into a list (ad11101)
 * Times: FixedOffsetTimezone: fix display of negative offsets (d816803)
 
-### Features
+Features
+~~~~~~~~
 
 * CLDR: Update to CLDR 28 (#292) (9f7f4d0)
 * General: Add __copy__ and __deepcopy__ to LazyProxy. (a1cc3f1)

From 1e1e9913d35d1bf0e10f9471479d7618d9ff4df4 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 8 Jan 2016 10:39:08 +0200
Subject: [PATCH 173/489] Add docs for `babel.lists`

---
 babel/lists.py     | 4 ++--
 docs/api/index.rst | 1 +
 docs/api/lists.rst | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 docs/api/lists.rst

diff --git a/babel/lists.py b/babel/lists.py
index 6e6fbd192..82e5590c1 100644
--- a/babel/lists.py
+++ b/babel/lists.py
@@ -21,9 +21,9 @@
 
 
 def format_list(lst, locale=DEFAULT_LOCALE):
-    """ Formats `lst` as a list
+    """
+    Format the items in `lst` as a list.
 
-    e.g.
     >>> format_list(['apples', 'oranges', 'pears'], 'en')
     u'apples, oranges, and pears'
     >>> format_list(['apples', 'oranges', 'pears'], 'zh')
diff --git a/docs/api/index.rst b/docs/api/index.rst
index e21fa74ed..b882d300b 100644
--- a/docs/api/index.rst
+++ b/docs/api/index.rst
@@ -9,6 +9,7 @@ public API of Babel.
 
    core
    dates
+   lists
    messages/index
    numbers
    plural
diff --git a/docs/api/lists.rst b/docs/api/lists.rst
new file mode 100644
index 000000000..d526b6a73
--- /dev/null
+++ b/docs/api/lists.rst
@@ -0,0 +1,8 @@
+List Formatting
+===============
+
+.. module:: babel.lists
+
+This module lets you format lists of items in a locale-dependent manner.
+
+.. autofunction:: format_list

From ef9046affe61016866ed49322e1fcaca75ee0382 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 8 Jan 2016 10:39:35 +0200
Subject: [PATCH 174/489] Refer `format_skeleton` in docs

---
 docs/api/dates.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/api/dates.rst b/docs/api/dates.rst
index 7186350f2..1b22cd74b 100644
--- a/docs/api/dates.rst
+++ b/docs/api/dates.rst
@@ -17,6 +17,8 @@ Date and Time Formatting
 
 .. autofunction:: format_timedelta
 
+.. autofunction:: format_skeleton
+
 Timezone Functionality
 ----------------------
 

From 896b803dd64b048ed310c75bef9ba2a9975a5320 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 8 Jan 2016 10:39:43 +0200
Subject: [PATCH 175/489] Update docs metadata

---
 docs/conf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index ed75a531f..3a51901a7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,16 +44,16 @@
 
 # General information about the project.
 project = u'Babel'
-copyright = u'2013, The Babel Team'
+copyright = u'2016, The Babel Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.0'
+release = '2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 56e36d545065602c7ea71dad5f581a2f0091d204 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 8 Jan 2016 10:27:58 +0200
Subject: [PATCH 176/489] doc: Add CLDR data volatility notes

Closes #317
---
 babel/core.py | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/babel/core.py b/babel/core.py
index c08cfa737..495015d67 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -529,6 +529,9 @@ def currency_symbols(self):
     def number_symbols(self):
         """Symbols used in number formatting.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('fr', 'FR').number_symbols['decimal']
         u','
         """
@@ -538,6 +541,9 @@ def number_symbols(self):
     def decimal_formats(self):
         """Locale patterns for decimal number formatting.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en', 'US').decimal_formats[None]
         <NumberPattern u'#,##0.###'>
         """
@@ -547,6 +553,9 @@ def decimal_formats(self):
     def currency_formats(self):
         """Locale patterns for currency number formatting.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en', 'US').currency_formats['standard']
         <NumberPattern u'\\xa4#,##0.00'>
         >>> Locale('en', 'US').currency_formats['accounting']
@@ -558,6 +567,9 @@ def currency_formats(self):
     def percent_formats(self):
         """Locale patterns for percent number formatting.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en', 'US').percent_formats[None]
         <NumberPattern u'#,##0%'>
         """
@@ -567,6 +579,9 @@ def percent_formats(self):
     def scientific_formats(self):
         """Locale patterns for scientific number formatting.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en', 'US').scientific_formats[None]
         <NumberPattern u'#E0'>
         """
@@ -614,6 +629,9 @@ def quarters(self):
     def eras(self):
         """Locale display names for eras.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en', 'US').eras['wide'][1]
         u'Anno Domini'
         >>> Locale('en', 'US').eras['abbreviated'][0]
@@ -625,6 +643,9 @@ def eras(self):
     def time_zones(self):
         """Locale display names for time zones.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en', 'US').time_zones['Europe/London']['long']['daylight']
         u'British Summer Time'
         >>> Locale('en', 'US').time_zones['America/St_Johns']['city']
@@ -639,6 +660,9 @@ def meta_zones(self):
         Meta time zones are basically groups of different Olson time zones that
         have the same GMT offset and daylight savings time.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en', 'US').meta_zones['Europe_Central']['long']['daylight']
         u'Central European Summer Time'
 
@@ -650,6 +674,9 @@ def meta_zones(self):
     def zone_formats(self):
         """Patterns related to the formatting of time zones.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en', 'US').zone_formats['fallback']
         u'%(1)s (%(0)s)'
         >>> Locale('pt', 'BR').zone_formats['region']
@@ -702,6 +729,9 @@ def min_week_days(self):
     def date_formats(self):
         """Locale patterns for date formatting.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en', 'US').date_formats['short']
         <DateTimePattern u'M/d/yy'>
         >>> Locale('fr', 'FR').date_formats['long']
@@ -713,6 +743,9 @@ def date_formats(self):
     def time_formats(self):
         """Locale patterns for time formatting.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en', 'US').time_formats['short']
         <DateTimePattern u'h:mm a'>
         >>> Locale('fr', 'FR').time_formats['long']
@@ -724,6 +757,9 @@ def time_formats(self):
     def datetime_formats(self):
         """Locale patterns for datetime formatting.
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en').datetime_formats['full']
         u"{1} 'at' {0}"
         >>> Locale('th').datetime_formats['medium']
@@ -763,6 +799,9 @@ def plural_form(self):
     def list_patterns(self):
         """Patterns for generating lists
 
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
         >>> Locale('en').list_patterns['start']
         u'{0}, {1}'
         >>> Locale('en').list_patterns['end']

From 28fe6775b93beaa7a16b49af95d1e895864fd7e9 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 8 Jan 2016 10:17:05 +0200
Subject: [PATCH 177/489] Make catalog header updating an option

The change in e0e7ef168856bb had an unexpected and likely undesired effect
when updating catalogs with, e.g. translator names in the header comment.

It's better to make the updating an option and revert back to the pre-2.2
behavior by default.

Fixes https://github.com/python-babel/babel/issues/318
---
 babel/messages/catalog.py      |  9 +++++----
 babel/messages/frontend.py     | 10 ++++++++--
 tests/messages/test_catalog.py |  4 +++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index f72a34fca..ca4a5680c 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -673,7 +673,7 @@ def delete(self, id, context=None):
         if key in self._messages:
             del self._messages[key]
 
-    def update(self, template, no_fuzzy_matching=False):
+    def update(self, template, no_fuzzy_matching=False, update_header_comment=False):
         """Update the catalog based on the given template catalog.
 
         >>> from babel.messages import Catalog
@@ -798,9 +798,10 @@ def _merge(message, oldkey, newkey):
             if no_fuzzy_matching or msgid not in fuzzy_matches:
                 self.obsolete[msgid] = remaining[msgid]
 
-        # Allow the updated catalog's header to be rewritten based on the
-        # template's header
-        self.header_comment = template.header_comment
+        if update_header_comment:
+            # Allow the updated catalog's header to be rewritten based on the
+            # template's header
+            self.header_comment = template.header_comment
 
         # Make updated catalog's POT-Creation-Date equal to the template
         # used to update the catalog
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 5f6b14165..d9919f631 100755
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -545,10 +545,12 @@ class update_catalog(Command):
          'whether to omit obsolete messages from the output'),
         ('no-fuzzy-matching', 'N',
          'do not use fuzzy matching'),
+        ('update-header-comment', None,
+         'update target header comment'),
         ('previous', None,
          'keep previous msgids of translated messages')
     ]
-    boolean_options = ['ignore_obsolete', 'no_fuzzy_matching', 'previous']
+    boolean_options = ['ignore_obsolete', 'no_fuzzy_matching', 'previous', 'update_header_comment']
 
     def initialize_options(self):
         self.domain = 'messages'
@@ -560,6 +562,7 @@ def initialize_options(self):
         self.no_wrap = False
         self.ignore_obsolete = False
         self.no_fuzzy_matching = False
+        self.update_header_comment = False
         self.previous = False
 
     def finalize_options(self):
@@ -619,7 +622,10 @@ def run(self):
             finally:
                 infile.close()
 
-            catalog.update(template, self.no_fuzzy_matching)
+            catalog.update(
+                template, self.no_fuzzy_matching,
+                update_header_comment=self.update_header_comment
+            )
 
             tmpname = os.path.join(os.path.dirname(filename),
                                    tempfile.gettempprefix() +
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index 7d18d80a9..3eeaf64ec 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -440,7 +440,6 @@ def test_catalog_update():
 
     cat.update(template)
     assert len(cat) == 3
-    assert cat.header_comment == template.header_comment  # Header comment also gets updated
 
     msg1 = cat['green']
     msg1.string
@@ -457,6 +456,9 @@ def test_catalog_update():
     assert not 'head' in cat
     assert list(cat.obsolete.values())[0].id == 'head'
 
+    cat.update(template, update_header_comment=True)
+    assert cat.header_comment == template.header_comment  # Header comment also gets updated
+
 
 def test_datetime_parsing():
     val1 = catalog._parse_datetime_header('2006-06-28 23:24+0200')

From 7dcd86b841344fe0e33d8ebba575be6d341d1ab2 Mon Sep 17 00:00:00 2001
From: Erik Romijn <eromijn@solidlinks.nl>
Date: Sat, 22 Nov 2014 16:06:44 +0100
Subject: [PATCH 178/489] scripts: add territory-language import from CLDR

Available in the global data onder the 'territory_language' key.
---
 scripts/import_cldr.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index a5d0ad5dd..8c0e7f7a5 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -183,6 +183,7 @@ def main():
         territory_currencies = global_data.setdefault('territory_currencies', {})
         parent_exceptions = global_data.setdefault('parent_exceptions', {})
         currency_fractions = global_data.setdefault('currency_fractions', {})
+        territory_languages = global_data.setdefault('territory_languages', {})
 
         # create auxiliary zone->territory map from the windows zones (we don't set
         # the 'zones_territories' map directly here, because there are some zones
@@ -276,6 +277,16 @@ def main():
             cur_crounding = int(fraction.attrib.get('cashRounding', cur_rounding))
             currency_fractions[cur_code] = (cur_digits, cur_rounding, cur_cdigits, cur_crounding)
 
+        # Languages in territories
+        for territory in sup.findall('.//territoryInfo/territory'):
+            languages = {}
+            for language in territory.findall('./languagePopulation'):
+                languages[language.attrib['type']] = {
+                    'population_percent': float(language.attrib['populationPercent']),
+                    'official_status': language.attrib.get('officialStatus'),
+                }
+            territory_languages[territory.attrib['type']] = languages
+
         write_datafile(global_path, global_data, dump_json=dump_json)
 
     # build a territory containment mapping for inheritance

From f68373c11ef6b355ee7656002eaf864600ebbc8d Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 3 Jan 2016 22:50:08 +0200
Subject: [PATCH 179/489] Add public API for territory language data

---
 babel/languages.py      | 64 +++++++++++++++++++++++++++++++++++++++++
 tests/test_languages.py | 14 +++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 babel/languages.py
 create mode 100644 tests/test_languages.py

diff --git a/babel/languages.py b/babel/languages.py
new file mode 100644
index 000000000..28718f68d
--- /dev/null
+++ b/babel/languages.py
@@ -0,0 +1,64 @@
+# -- encoding: UTF-8 --
+from babel.core import get_global
+
+
+def get_official_languages(territory, regional=False, de_facto=False):
+    """
+    Get the official language(s) for the given territory.
+
+    The language codes, if any are known, are returned in order of descending popularity.
+
+    If the `regional` flag is set, then languages which are regionally official are also returned.
+
+    If the `de_facto` flag is set, then languages which are "de facto" official are also returned.
+
+    :param territory: Territory code
+    :type territory: str
+    :param regional: Whether to return regionally official languages too
+    :type regional: bool
+    :param de_facto: Whether to return de-facto official languages too
+    :type de_facto: bool
+    :return: Tuple of language codes
+    :rtype: tuple[str]
+    """
+
+    territory = str(territory).upper()
+    allowed_stati = set(("official",))
+    if regional:
+        allowed_stati.add("official_regional")
+    if de_facto:
+        allowed_stati.add("de_facto_official")
+
+    languages = get_global("territory_languages").get(territory, {})
+    pairs = [
+        (info['population_percent'], language)
+        for language, info in languages.items()
+        if info.get('official_status') in allowed_stati
+    ]
+    pairs.sort(reverse=True)
+    return tuple(lang for _, lang in pairs)
+
+
+
+def get_territory_language_info(territory):
+    """
+    Get a dictionary of language information for a territory.
+
+    The dictionary is keyed by language code; the values are dicts with more information.
+
+    The following keys are currently known for the values:
+
+    * `population_percent`: The percentage of the territory's population speaking the
+                            language.
+    * `official_status`: An optional string describing the officiality status of the language.
+                         Known values are "official", "official_regional" and "de_facto_official".
+
+    See http://www.unicode.org/cldr/charts/latest/supplemental/territory_language_information.html
+
+    :param territory: Territory code
+    :type territory: str
+    :return: Language information dictionary
+    :rtype: dict[str, dict]
+    """
+    territory = str(territory).upper()
+    return get_global("territory_languages").get(territory, {}).copy()
diff --git a/tests/test_languages.py b/tests/test_languages.py
new file mode 100644
index 000000000..594149fa7
--- /dev/null
+++ b/tests/test_languages.py
@@ -0,0 +1,14 @@
+# -- encoding: UTF-8 --
+from babel.languages import get_official_languages, get_territory_language_info
+
+
+def test_official_languages():
+    assert get_official_languages("FI") == ("fi", "sv")
+    assert get_official_languages("SE") == ("sv",)
+    assert get_official_languages("CH") == ("de", "fr", "it")
+    assert get_official_languages("CH", de_facto=True) == ("de", "gsw", "fr", "it")
+    assert get_official_languages("CH", regional=True) == ("de", "fr", "it", "rm")
+
+
+def test_get_language_info():
+    assert set(get_territory_language_info("HU").keys()) == set(("hu", "en", "de", "ro", "hr", "sk", "sl"))

From 27ee02b5dab622b5a036d9687af220efc5842b6f Mon Sep 17 00:00:00 2001
From: Erik Romijn <eromijn@solidlinks.nl>
Date: Sun, 23 Nov 2014 17:24:59 +0100
Subject: [PATCH 180/489] core: documented all valid keys for get_global()

---
 babel/core.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/babel/core.py b/babel/core.py
index 495015d67..4088a09f5 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -43,6 +43,11 @@ def get_global(key):
     >>> get_global('zone_territories')['Europe/Berlin']
     u'DE'
 
+    The keys available are ``currency_fractions``, ``language_aliases``, ``likely_subtags``,
+    ``parent_exceptions``, ``script_aliases``, ``territory_aliases``, ``territory_currencies``,
+    ``territory_languages``, ``territory_zones``, ``variant_aliases``, ``win_mapping``,
+    ``zone_aliases`` and ``zone_territories``.
+
     .. versionadded:: 0.9
 
     :param key: the data key

From 07dc2e4bbd57e76e419b1949820f5fbd03e2d2a8 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 3 Jan 2016 22:52:09 +0200
Subject: [PATCH 181/489] get_global: format key documentation, add warning

---
 babel/core.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 4088a09f5..4a284e893 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -43,10 +43,23 @@ def get_global(key):
     >>> get_global('zone_territories')['Europe/Berlin']
     u'DE'
 
-    The keys available are ``currency_fractions``, ``language_aliases``, ``likely_subtags``,
-    ``parent_exceptions``, ``script_aliases``, ``territory_aliases``, ``territory_currencies``,
-    ``territory_languages``, ``territory_zones``, ``variant_aliases``, ``win_mapping``,
-    ``zone_aliases`` and ``zone_territories``.
+    The keys available are:
+
+    - ``currency_fractions``
+    - ``language_aliases``
+    - ``likely_subtags``
+    - ``parent_exceptions``
+    - ``script_aliases``
+    - ``territory_aliases``
+    - ``territory_currencies``
+    - ``territory_languages``
+    - ``territory_zones``
+    - ``variant_aliases``
+    - ``win_mapping``
+    - ``zone_aliases``
+    - ``zone_territories``
+
+    .. note:: The internal structure of the data may change between versions.
 
     .. versionadded:: 0.9
 

From 935a0be2e48bfa5da03ab4a796fd0b8fc3995571 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 8 Jan 2016 10:46:04 +0200
Subject: [PATCH 182/489] Add documentation for `babel.languages`

Fixes #319
---
 babel/languages.py     |  8 ++++++++
 docs/api/index.rst     |  1 +
 docs/api/languages.rst | 14 ++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 docs/api/languages.rst

diff --git a/babel/languages.py b/babel/languages.py
index 28718f68d..a7708712e 100644
--- a/babel/languages.py
+++ b/babel/languages.py
@@ -12,6 +12,9 @@ def get_official_languages(territory, regional=False, de_facto=False):
 
     If the `de_facto` flag is set, then languages which are "de facto" official are also returned.
 
+    .. warning:: Note that the data is as up to date as the current version of the CLDR used
+                 by Babel.  If you need scientifically accurate information, use another source!
+
     :param territory: Territory code
     :type territory: str
     :param regional: Whether to return regionally official languages too
@@ -53,6 +56,11 @@ def get_territory_language_info(territory):
     * `official_status`: An optional string describing the officiality status of the language.
                          Known values are "official", "official_regional" and "de_facto_official".
 
+    .. warning:: Note that the data is as up to date as the current version of the CLDR used
+                 by Babel.  If you need scientifically accurate information, use another source!
+
+    .. note:: Note that the format of the dict returned may change between Babel versions.
+
     See http://www.unicode.org/cldr/charts/latest/supplemental/territory_language_information.html
 
     :param territory: Territory code
diff --git a/docs/api/index.rst b/docs/api/index.rst
index b882d300b..91f0967ca 100644
--- a/docs/api/index.rst
+++ b/docs/api/index.rst
@@ -10,6 +10,7 @@ public API of Babel.
    core
    dates
    lists
+   languages
    messages/index
    numbers
    plural
diff --git a/docs/api/languages.rst b/docs/api/languages.rst
new file mode 100644
index 000000000..287f1e07c
--- /dev/null
+++ b/docs/api/languages.rst
@@ -0,0 +1,14 @@
+Languages
+=========
+
+.. module:: babel.languages
+
+The languages module provides functionality to access data about
+languages that is not bound to a given locale.
+
+Official Languages
+------------------
+
+.. autofunction:: get_official_languages
+
+.. autofunction:: get_territory_language_info

From 19957e21470615d42fb7b6e2c1a580cd679d33c8 Mon Sep 17 00:00:00 2001
From: Eoin Nugent <eoin@yelp.com>
Date: Mon, 11 Jan 2016 14:43:58 -0800
Subject: [PATCH 183/489] extraction: Babel now supports extraction by filename
 as well as by dir

One can now supply a filename or a directory to be extracted. For
large codebases, this allows the consumer to optimize their
string extraction process by, for instance, only supplying the
files that have actually been changed on the given dev's branch
compared to master.

Relates to https://github.com/python-babel/babel/issues/253 . I
don't want to say "fixes", but makes further optimization
unnecessary for most use cases.
---
 babel/messages/extract.py       | 88 ++++++++++++++++++++++++---------
 babel/messages/frontend.py      | 82 +++++++++++++++++++-----------
 tests/messages/test_frontend.py | 63 +++++++++++++++++++++--
 3 files changed, 178 insertions(+), 55 deletions(-)
 mode change 100755 => 100644 babel/messages/frontend.py

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 8fe3f606c..8183d527f 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -142,28 +142,72 @@ def extract_from_dir(dirname=None, method_map=DEFAULT_MAPPING,
         dirnames.sort()
         filenames.sort()
         for filename in filenames:
-            filename = relpath(
-                os.path.join(root, filename).replace(os.sep, '/'),
-                dirname
-            )
-            for pattern, method in method_map:
-                if pathmatch(pattern, filename):
-                    filepath = os.path.join(absname, filename)
-                    options = {}
-                    for opattern, odict in options_map.items():
-                        if pathmatch(opattern, filename):
-                            options = odict
-                    if callback:
-                        callback(filename, method, options)
-                    for lineno, message, comments, context in \
-                          extract_from_file(method, filepath,
-                                            keywords=keywords,
-                                            comment_tags=comment_tags,
-                                            options=options,
-                                            strip_comment_tags=
-                                                strip_comment_tags):
-                        yield filename, lineno, message, comments, context
-                    break
+            filepath = os.path.join(root, filename).replace(os.sep, '/')
+
+            for message_tuple in check_and_call_extract_file(
+                filepath,
+                method_map,
+                options_map,
+                callback,
+                keywords,
+                comment_tags,
+                strip_comment_tags,
+                dirpath=absname,
+            ):
+                yield message_tuple
+
+
+def check_and_call_extract_file(filepath, method_map, options_map,
+                                callback, keywords, comment_tags,
+                                strip_comment_tags, dirpath=None):
+    """Checks if the given file matches an extraction method mapping, and if so, calls extract_from_file.
+
+    Note that the extraction method mappings are based relative to dirpath.
+    So, given an absolute path to a file `filepath`, we want to check using
+    just the relative path from `dirpath` to `filepath`.
+
+    :param filepath: An absolute path to a file that exists.
+    :param method_map: a list of ``(pattern, method)`` tuples that maps of
+                       extraction method names to extended glob patterns
+    :param options_map: a dictionary of additional options (optional)
+    :param callback: a function that is called for every file that message are
+                     extracted from, just before the extraction itself is
+                     performed; the function is passed the filename, the name
+                     of the extraction method and and the options dictionary as
+                     positional arguments, in that order
+    :param keywords: a dictionary mapping keywords (i.e. names of functions
+                     that should be recognized as translation functions) to
+                     tuples that specify which of their arguments contain
+                     localizable strings
+    :param comment_tags: a list of tags of translator comments to search for
+                         and include in the results
+    :param strip_comment_tags: a flag that if set to `True` causes all comment
+                               tags to be removed from the collected comments.
+    :param dirpath: the path to the directory to extract messages from.
+    """
+    # filename is the relative path from dirpath to the actual file
+    filename = relpath(filepath, dirpath)
+
+    for pattern, method in method_map:
+        if not pathmatch(pattern, filename):
+            continue
+
+        options = {}
+        for opattern, odict in options_map.items():
+            if pathmatch(opattern, filename):
+                options = odict
+        if callback:
+            callback(filename, method, options)
+        for message_tuple in extract_from_file(
+            method, filepath,
+            keywords=keywords,
+            comment_tags=comment_tags,
+            options=options,
+            strip_comment_tags=strip_comment_tags
+        ):
+            yield (filename, ) + message_tuple
+
+        break
 
 
 def extract_from_file(method, filename, keywords=DEFAULT_KEYWORDS,
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
old mode 100755
new mode 100644
index d9919f631..8c6fd8252
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -25,7 +25,7 @@
 from babel._compat import StringIO, string_types
 from babel.core import UnknownLocaleError
 from babel.messages.catalog import Catalog
-from babel.messages.extract import DEFAULT_KEYWORDS, DEFAULT_MAPPING, extract_from_dir
+from babel.messages.extract import DEFAULT_KEYWORDS, DEFAULT_MAPPING, check_and_call_extract_file, extract_from_dir
 from babel.messages.mofile import write_mo
 from babel.messages.pofile import read_po, write_po
 from babel.util import LOCALTZ, odict
@@ -245,15 +245,15 @@ class extract_messages(Command):
          'output file. Separate multiple TAGs with commas(,)'),
         ('strip-comments', None,
          'strip the comment TAGs from the comments.'),
-        ('input-dirs=', None,
-         'directories that should be scanned for messages. Separate multiple '
-         'directories with commas(,)'),
+        ('input-paths=', None,
+         'files or directories that should be scanned for messages. Separate multiple '
+         'files or directories with commas(,)'),
     ]
     boolean_options = [
         'no-default-keywords', 'no-location', 'omit-header', 'no-wrap',
         'sort-output', 'sort-by-file', 'strip-comments'
     ]
-    as_args = 'input-dirs'
+    as_args = 'input-paths'
     multiple_value_options = ('add-comments',)
 
     def initialize_options(self):
@@ -265,7 +265,7 @@ def initialize_options(self):
         self.no_location = False
         self.omit_header = False
         self.output_file = None
-        self.input_dirs = None
+        self.input_paths = None
         self.width = None
         self.no_wrap = False
         self.sort_output = False
@@ -300,17 +300,21 @@ def finalize_options(self):
             raise DistutilsOptionError("'--sort-output' and '--sort-by-file' "
                                        "are mutually exclusive")
 
-        if self.input_dirs:
-            if isinstance(self.input_dirs, string_types):
-                self.input_dirs = re.split(',\s*', self.input_dirs)
+        if self.input_paths:
+            if isinstance(self.input_paths, string_types):
+                self.input_paths = re.split(',\s*', self.input_paths)
         else:
-            self.input_dirs = dict.fromkeys([
+            self.input_paths = dict.fromkeys([
                 k.split('.', 1)[0]
                 for k in (self.distribution.packages or ())
             ]).keys()
 
-        if not self.input_dirs:
-            raise DistutilsOptionError("no input directories specified")
+        if not self.input_paths:
+            raise DistutilsOptionError("no input files or directories specified")
+
+        for path in self.input_paths:
+            if not os.path.exists(path):
+                raise DistutilsOptionError("Input path: %s does not exist" % path)
 
         if self.add_comments:
             if isinstance(self.add_comments, string_types):
@@ -333,29 +337,51 @@ def run(self):
                               copyright_holder=self.copyright_holder,
                               charset=self.charset)
 
-            for dirname, (method_map, options_map) in mappings.items():
+            for path, (method_map, options_map) in mappings.items():
                 def callback(filename, method, options):
                     if method == 'ignore':
                         return
-                    filepath = os.path.normpath(os.path.join(dirname, filename))
+
+                    # If we explicitly provide a full filepath, just use that.
+                    # Otherwise, path will be the directory path and filename
+                    # is the relative path from that dir to the file.
+                    # So we can join those to get the full filepath.
+                    if os.path.isfile(path):
+                        filepath = path
+                    else:
+                        filepath = os.path.normpath(os.path.join(path, filename))
+
                     optstr = ''
                     if options:
                         optstr = ' (%s)' % ', '.join(['%s="%s"' % (k, v) for
                                                       k, v in options.items()])
                     self.log.info('extracting messages from %s%s', filepath, optstr)
 
-                extracted = extract_from_dir(
-                    dirname, method_map, options_map,
-                    keywords=self._keywords,
-                    comment_tags=self.add_comments,
-                    callback=callback,
-                    strip_comment_tags=self.strip_comments
-                )
+                if os.path.isfile(path):
+                    current_dir = os.getcwd()
+                    extracted = check_and_call_extract_file(
+                        path, method_map, options_map,
+                        callback, self._keywords, self.add_comments,
+                        self.strip_comments, current_dir
+                    )
+                else:
+                    extracted = extract_from_dir(
+                        path, method_map, options_map,
+                        keywords=self._keywords,
+                        comment_tags=self.add_comments,
+                        callback=callback,
+                        strip_comment_tags=self.strip_comments
+                    )
                 for filename, lineno, message, comments, context in extracted:
-                    filepath = os.path.normpath(os.path.join(dirname, filename))
+                    if os.path.isfile(path):
+                        filepath = filename  # already normalized
+                    else:
+                        filepath = os.path.normpath(os.path.join(path, filename))
+
                     catalog.add(message, None, [(filepath, lineno)],
                                 auto_comments=comments, context=context)
 
+
             self.log.info('writing PO template file to %s' % self.output_file)
             write_po(outfile, catalog, width=self.width,
                      no_location=self.no_location,
@@ -370,14 +396,14 @@ def _get_mappings(self):
             fileobj = open(self.mapping_file, 'U')
             try:
                 method_map, options_map = parse_mapping(fileobj)
-                for dirname in self.input_dirs:
-                    mappings[dirname] = method_map, options_map
+                for path in self.input_paths:
+                    mappings[path] = method_map, options_map
             finally:
                 fileobj.close()
 
         elif getattr(self.distribution, 'message_extractors', None):
             message_extractors = self.distribution.message_extractors
-            for dirname, mapping in message_extractors.items():
+            for path, mapping in message_extractors.items():
                 if isinstance(mapping, string_types):
                     method_map, options_map = parse_mapping(StringIO(mapping))
                 else:
@@ -385,11 +411,11 @@ def _get_mappings(self):
                     for pattern, method, options in mapping:
                         method_map.append((pattern, method))
                         options_map[pattern] = options or {}
-                mappings[dirname] = method_map, options_map
+                mappings[path] = method_map, options_map
 
         else:
-            for dirname in self.input_dirs:
-                mappings[dirname] = DEFAULT_MAPPING, {}
+            for path in self.input_paths:
+                mappings[path] = DEFAULT_MAPPING, {}
 
         return mappings
 
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index f958b8050..975876a5c 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -108,8 +108,13 @@ def test_both_sort_output_and_sort_by_file(self):
         self.cmd.sort_by_file = True
         self.assertRaises(DistutilsOptionError, self.cmd.finalize_options)
 
-    def test_input_dirs_is_treated_as_list(self):
-        self.cmd.input_dirs = self.datadir
+    def test_invalid_file_or_dir_input_path(self):
+        self.cmd.input_paths = 'nonexistent_path'
+        self.cmd.output_file = 'dummy'
+        self.assertRaises(DistutilsOptionError, self.cmd.finalize_options)
+
+    def test_input_paths_is_treated_as_list(self):
+        self.cmd.input_paths = self.datadir
         self.cmd.output_file = self._pot_file()
         self.cmd.finalize_options()
         self.cmd.run()
@@ -120,12 +125,12 @@ def test_input_dirs_is_treated_as_list(self):
         self.assertEqual(1, len(msg.locations))
         self.assertTrue('file1.py' in msg.locations[0][0])
 
-    def test_input_dirs_handle_spaces_after_comma(self):
-        self.cmd.input_dirs = 'foo,  bar'
+    def test_input_paths_handle_spaces_after_comma(self):
+        self.cmd.input_paths = '%s,  %s' % (this_dir, self.datadir)
         self.cmd.output_file = self._pot_file()
         self.cmd.finalize_options()
 
-        self.assertEqual(['foo', 'bar'], self.cmd.input_dirs)
+        self.assertEqual([this_dir, self.datadir], self.cmd.input_paths)
 
     def test_extraction_with_default_mapping(self):
         self.cmd.copyright_holder = 'FooBar, Inc.'
@@ -861,6 +866,54 @@ def test_extract_with_mapping_file(self):
 msgstr[0] ""
 msgstr[1] ""
 
+""" % {'version': VERSION,
+       'year': time.strftime('%Y'),
+       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                               tzinfo=LOCALTZ, locale='en')}
+        with open(pot_file, 'U') as f:
+            actual_content = f.read()
+        self.assertEqual(expected_content, actual_content)
+
+    def test_extract_with_exact_file(self):
+        """Tests that we can call extract with a particular file and only
+        strings from that file get extracted. (Note the absence of strings from file1.py)
+        """
+        pot_file = self._pot_file()
+        file_to_extract = os.path.join(self.datadir, 'project', 'file2.py')
+        self.cli.run(sys.argv + ['extract',
+            '--copyright-holder', 'FooBar, Inc.',
+            '--project', 'TestProject', '--version', '0.1',
+            '--msgid-bugs-address', 'bugs.address@email.tld',
+            '--mapping', os.path.join(self.datadir, 'mapping.cfg'),
+            '-c', 'TRANSLATOR', '-c', 'TRANSLATORS:',
+            '-o', pot_file, file_to_extract])
+        self.assert_pot_file_exists()
+        expected_content = r"""# Translations template for TestProject.
+# Copyright (C) %(year)s FooBar, Inc.
+# This file is distributed under the same license as the TestProject
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, %(year)s.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: TestProject 0.1\n"
+"Report-Msgid-Bugs-To: bugs.address@email.tld\n"
+"POT-Creation-Date: %(date)s\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel %(version)s\n"
+
+#: project/file2.py:9
+msgid "foobar"
+msgid_plural "foobars"
+msgstr[0] ""
+msgstr[1] ""
+
 """ % {'version': VERSION,
        'year': time.strftime('%Y'),
        'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',

From bc8f19ea1de43850c1824e405007d7be5159548e Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 22 Jan 2016 20:42:03 +0200
Subject: [PATCH 184/489] plural: don't ignore possible rules in `other`
 category

---
 babel/plural.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index b5ce9ba65..63e395ba7 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -86,14 +86,14 @@ def __init__(self, rules):
         found = set()
         self.abstract = []
         for key, expr in sorted(list(rules)):
-            if key == 'other':
-                continue
             if key not in _plural_tags:
                 raise ValueError('unknown tag %r' % key)
             elif key in found:
                 raise ValueError('tag %r defined twice' % key)
             found.add(key)
-            self.abstract.append((key, _Parser(expr).ast))
+            ast = _Parser(expr).ast
+            if ast:
+                self.abstract.append((key, ast))
 
     def __repr__(self):
         rules = self.rules
@@ -388,6 +388,11 @@ class _Parser(object):
 
     def __init__(self, string):
         self.tokens = tokenize_rule(string)
+        if not self.tokens:
+            # If the pattern is only samples, it's entirely possible
+            # no stream of tokens whatsoever is generated.
+            self.ast = None
+            return
         self.ast = self.condition()
         if self.tokens:
             raise RuleError('Expected end of rule, got %r' %

From 0e48c5e19757883adb981107c00e59d687d808a9 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 22 Jan 2016 20:42:24 +0200
Subject: [PATCH 185/489] plural: support Unicode ellipsis sign

---
 babel/plural.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/plural.py b/babel/plural.py
index 63e395ba7..5cc7289b5 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -303,7 +303,7 @@ class RuleError(Exception):
                         .format(_VARS))),
     ('value', re.compile(r'\d+')),
     ('symbol', re.compile(r'%|,|!=|=')),
-    ('ellipsis', re.compile(r'\.\.'))
+    ('ellipsis', re.compile(r'\.{2,3}|\u2026', re.UNICODE))  # U+2026: ELLIPSIS
 ]
 
 

From a4ed4e04d02bdeeec3d97118215876dcce52852a Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 22 Jan 2016 20:42:59 +0200
Subject: [PATCH 186/489] plural: DRY out `compile_zero`

---
 babel/plural.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index 5cc7289b5..f2e9f4808 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -485,6 +485,9 @@ def _unary_compiler(tmpl):
     return lambda self, x: tmpl % self.compile(x)
 
 
+compile_zero = lambda x: '0'
+
+
 class _Compiler(object):
     """The compilers are able to transform the expressions into multiple
     output formats.
@@ -557,10 +560,10 @@ class _JavaScriptCompiler(_GettextCompiler):
     # XXX: presently javascript does not support any of the
     # fraction support and basically only deals with integers.
     compile_i = lambda x: 'parseInt(n, 10)'
-    compile_v = lambda x: '0'
-    compile_w = lambda x: '0'
-    compile_f = lambda x: '0'
-    compile_t = lambda x: '0'
+    compile_v = compile_zero
+    compile_w = compile_zero
+    compile_f = compile_zero
+    compile_t = compile_zero
 
     def compile_relation(self, method, expr, range_list):
         code = _GettextCompiler.compile_relation(

From e31156fa2012b637923b2f047b8f24fd3c0e8423 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 20 Dec 2015 23:28:00 +0200
Subject: [PATCH 187/489] Compile noninteger TR35 operands to zeroes when
 emitting Gettext

See http://www.unicode.org/reports/tr35/tr35-numbers.html#Operands
See https://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html

Fixes #287
---
 babel/plural.py      |  6 ++++++
 tests/test_plural.py | 16 +++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/babel/plural.py b/babel/plural.py
index f2e9f4808..9cb1d5cc6 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -534,6 +534,12 @@ def compile_relation(self, method, expr, range_list):
 class _GettextCompiler(_Compiler):
     """Compile into a gettext plural expression."""
 
+    compile_i = _Compiler.compile_n
+    compile_v = compile_zero
+    compile_w = compile_zero
+    compile_f = compile_zero
+    compile_t = compile_zero
+
     def compile_relation(self, method, expr, range_list):
         rv = []
         expr = self.compile(expr)
diff --git a/tests/test_plural.py b/tests/test_plural.py
index fce1b8e0e..d51efef1e 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -13,7 +13,7 @@
 import unittest
 import pytest
 
-from babel import plural
+from babel import plural, localedata
 from babel._compat import Decimal
 
 
@@ -254,3 +254,17 @@ def test_extract_operands(source, n, i, v, w, f, t):
     source = Decimal(source) if isinstance(source, str) else source
     assert (plural.extract_operands(source) ==
             Decimal(n), i, v, w, f, t)
+
+
+@pytest.mark.parametrize('locale', ('ru', 'pl'))
+def test_gettext_compilation(locale):
+    # Test that new plural form elements introduced in recent CLDR versions
+    # are compiled "down" to `n` when emitting Gettext rules.
+    ru_rules = localedata.load(locale)['plural_form'].rules
+    chars = 'ivwft'
+    # Test that these rules are valid for this test; i.e. that they contain at least one
+    # of the gettext-unsupported characters.
+    assert any((" " + ch + " ") in rule for ch in chars for rule in ru_rules.values())
+    # Then test that the generated value indeed does not contain these.
+    ru_rules_gettext = plural.to_gettext(ru_rules)
+    assert not any(ch in ru_rules_gettext for ch in chars)

From 2744fd7cc819db1e158510287971526cf843143b Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 4 Jan 2016 00:25:48 +0200
Subject: [PATCH 188/489] CLDR: Import interval format data

Refs #276
---
 babel/core.py          | 22 ++++++++++++++++++++++
 scripts/import_cldr.py | 25 +++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 4a284e893..8764360ab 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -798,6 +798,28 @@ def datetime_skeletons(self):
         """
         return self._data['datetime_skeletons']
 
+    @property
+    def interval_formats(self):
+        """Locale patterns for interval formatting.
+
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
+        How to format date intervals in Finnish when the day is the
+        smallest changing component:
+
+        >>> Locale('fi_FI').interval_formats['MEd']['d']
+        [u'E d. \u2013 ', u'E d.M.']
+
+        .. seealso::
+
+           The primary API to use this data is :py:func:`babel.dates.format_interval`.
+
+
+        :rtype: dict[str, dict[str, list[str]]]
+        """
+        return self._data['interval_formats']
+
     @property
     def plural_form(self):
         """Plural rules for the locale.
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 8c0e7f7a5..8e151f7d3 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -16,6 +16,7 @@
 import os
 import re
 import sys
+
 try:
     from xml.etree import cElementTree as ElementTree
 except ImportError:
@@ -25,9 +26,10 @@
 sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), '..'))
 
 from babel import dates, numbers
-from babel.plural import PluralRule
-from babel.localedata import Alias
 from babel._compat import pickle, text_type
+from babel.dates import split_interval_pattern
+from babel.localedata import Alias
+from babel.plural import PluralRule
 
 parse = ElementTree.parse
 weekdays = {'mon': 0, 'tue': 1, 'wed': 2, 'thu': 3, 'fri': 4, 'sat': 5,
@@ -608,6 +610,8 @@ def main():
                             datetime_skeletons[datetime_skeleton.attrib['id']] = \
                                 dates.parse_pattern(text_type(datetime_skeleton.text))
 
+            parse_interval_formats(data, calendar)
+
         # <numbers>
 
         number_symbols = data.setdefault('number_symbols', {})
@@ -693,6 +697,23 @@ def main():
         write_datafile(data_filename, data, dump_json=dump_json)
 
 
+def parse_interval_formats(data, tree):
+    # http://www.unicode.org/reports/tr35/tr35-dates.html#intervalFormats
+    interval_formats = data.setdefault("interval_formats", {})
+    for elem in tree.findall("dateTimeFormats/intervalFormats/*"):
+        if 'draft' in elem.attrib:
+            continue
+        if elem.tag == "intervalFormatFallback":
+            interval_formats[None] = elem.text
+        elif elem.tag == "intervalFormatItem":
+            skel_data = interval_formats.setdefault(elem.attrib["id"], {})
+            for item_sub in elem.getchildren():
+                if item_sub.tag == "greatestDifference":
+                    skel_data[item_sub.attrib["id"]] = split_interval_pattern(item_sub.text)
+                else:
+                    raise NotImplementedError("Not implemented: %s(%r)" % (item_sub.tag, item_sub.attrib))
+
+
 def parse_currency_formats(data, tree):
     currency_formats = data.setdefault('currency_formats', {})
     for length_elem in tree.findall('.//currencyFormats/currencyFormatLength'):

From 7800e547ed1710b24ee5679994cee6055c9c5698 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 4 Jan 2016 20:36:39 +0200
Subject: [PATCH 189/489] dates: DRY out the internal datetime conversion code

---
 babel/dates.py      | 163 ++++++++++++++++++++++++++++----------------
 tests/test_dates.py |  26 ++++++-
 2 files changed, 129 insertions(+), 60 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 4f66adbe5..b4de62712 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -38,6 +38,106 @@
 time_ = time
 
 
+def _get_dt_and_tzinfo(dt_or_tzinfo):
+    """
+    Parse a `dt_or_tzinfo` value into a datetime and a tzinfo.
+
+    See the docs for this function's callers for semantics.
+
+    :rtype: tuple[datetime, tzinfo]
+    """
+    if dt_or_tzinfo is None:
+        dt = datetime.now()
+        tzinfo = LOCALTZ
+    elif isinstance(dt_or_tzinfo, string_types):
+        dt = None
+        tzinfo = get_timezone(dt_or_tzinfo)
+    elif isinstance(dt_or_tzinfo, integer_types):
+        dt = None
+        tzinfo = UTC
+    elif isinstance(dt_or_tzinfo, (datetime, time)):
+        dt = _get_datetime(dt_or_tzinfo)
+        if dt.tzinfo is not None:
+            tzinfo = dt.tzinfo
+        else:
+            tzinfo = UTC
+    else:
+        dt = None
+        tzinfo = dt_or_tzinfo
+    return dt, tzinfo
+
+
+def _get_datetime(instant):
+    """
+    Get a datetime out of an "instant" (date, time, datetime, number).
+
+    .. warning:: The return values of this function may depend on the system clock.
+
+    If the instant is None, the current moment is used.
+    If the instant is a time, it's augmented with today's date.
+
+    Dates are converted to naive datetimes with midnight as the time component.
+
+    >>> _get_datetime(date(2015, 1, 1))
+    datetime.datetime(2015, 1, 1, 0, 0)
+
+    UNIX timestamps are converted to datetimes.
+
+    >>> _get_datetime(1400000000)
+    datetime.datetime(2014, 5, 13, 16, 53, 20)
+
+    Other values are passed through as-is.
+
+    >>> x = datetime(2015, 1, 1)
+    >>> _get_datetime(x) is x
+    True
+
+    :param instant: date, time, datetime, integer, float or None
+    :type instant: date|time|datetime|int|float|None
+    :return: a datetime
+    :rtype: datetime
+    """
+    if instant is None:
+        return datetime_.utcnow()
+    elif isinstance(instant, integer_types) or isinstance(instant, float):
+        return datetime_.utcfromtimestamp(instant)
+    elif isinstance(instant, time):
+        return datetime_.combine(date.today(), instant)
+    elif isinstance(instant, date) and not isinstance(instant, datetime):
+        return datetime_.combine(instant, time())
+    # TODO (3.x): Add an assertion/type check for this fallthrough branch:
+    return instant
+
+
+def _ensure_datetime_tzinfo(datetime, tzinfo=None):
+    """
+    Ensure the datetime passed has an attached tzinfo.
+
+    If the datetime is tz-naive to begin with, UTC is attached.
+
+    If a tzinfo is passed in, the datetime is normalized to that timezone.
+
+    >>> _ensure_datetime_tzinfo(datetime(2015, 1, 1)).tzinfo.zone
+    'UTC'
+
+    >>> tz = get_timezone("Europe/Stockholm")
+    >>> _ensure_datetime_tzinfo(datetime(2015, 1, 1, 13, 15, tzinfo=UTC), tzinfo=tz).hour
+    14
+
+    :param datetime: Datetime to augment.
+    :param tzinfo: Optional tznfo.
+    :return: datetime with tzinfo
+    :rtype: datetime
+    """
+    if datetime.tzinfo is None:
+        datetime = datetime.replace(tzinfo=UTC)
+    if tzinfo is not None:
+        datetime = datetime.astimezone(get_timezone(tzinfo))
+        if hasattr(tzinfo, 'normalize'):  # pytz
+            datetime = tzinfo.normalize(datetime)
+    return datetime
+
+
 def get_timezone(zone=None):
     """Looks up a timezone by name and returns it.  The timezone object
     returned comes from ``pytz`` and corresponds to the `tzinfo` interface and
@@ -78,10 +178,7 @@ def get_next_timezone_transition(zone=None, dt=None):
                If not given the current time is assumed.
     """
     zone = get_timezone(zone)
-    if dt is None:
-        dt = datetime.utcnow()
-    else:
-        dt = dt.replace(tzinfo=None)
+    dt = _get_datetime(dt).replace(tzinfo=None)
 
     if not hasattr(zone, '_utc_transition_times'):
         raise TypeError('Given timezone does not have UTC transition '
@@ -301,12 +398,7 @@ def get_timezone_gmt(datetime=None, width='long', locale=LC_TIME):
     :param width: either "long" or "short"
     :param locale: the `Locale` object, or a locale string
     """
-    if datetime is None:
-        datetime = datetime_.utcnow()
-    elif isinstance(datetime, integer_types):
-        datetime = datetime_.utcfromtimestamp(datetime).time()
-    if datetime.tzinfo is None:
-        datetime = datetime.replace(tzinfo=UTC)
+    datetime = _ensure_datetime_tzinfo(_get_datetime(datetime))
     locale = Locale.parse(locale)
 
     offset = datetime.tzinfo.utcoffset(datetime)
@@ -347,24 +439,7 @@ def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME):
     :param locale: the `Locale` object, or a locale string
     :return: the localized timezone name using location format
     """
-    if dt_or_tzinfo is None:
-        dt = datetime.now()
-        tzinfo = LOCALTZ
-    elif isinstance(dt_or_tzinfo, string_types):
-        dt = None
-        tzinfo = get_timezone(dt_or_tzinfo)
-    elif isinstance(dt_or_tzinfo, integer_types):
-        dt = None
-        tzinfo = UTC
-    elif isinstance(dt_or_tzinfo, (datetime, time)):
-        dt = dt_or_tzinfo
-        if dt.tzinfo is not None:
-            tzinfo = dt.tzinfo
-        else:
-            tzinfo = UTC
-    else:
-        dt = None
-        tzinfo = dt_or_tzinfo
+    dt, tzinfo = _get_dt_and_tzinfo(dt_or_tzinfo)
     locale = Locale.parse(locale)
 
     if hasattr(tzinfo, 'zone'):
@@ -474,24 +549,7 @@ def get_timezone_name(dt_or_tzinfo=None, width='long', uncommon=False,
                            ``'standard'``.
     :param locale: the `Locale` object, or a locale string
     """
-    if dt_or_tzinfo is None:
-        dt = datetime.now()
-        tzinfo = LOCALTZ
-    elif isinstance(dt_or_tzinfo, string_types):
-        dt = None
-        tzinfo = get_timezone(dt_or_tzinfo)
-    elif isinstance(dt_or_tzinfo, integer_types):
-        dt = None
-        tzinfo = UTC
-    elif isinstance(dt_or_tzinfo, (datetime, time)):
-        dt = dt_or_tzinfo
-        if dt.tzinfo is not None:
-            tzinfo = dt.tzinfo
-        else:
-            tzinfo = UTC
-    else:
-        dt = None
-        tzinfo = dt_or_tzinfo
+    dt, tzinfo = _get_dt_and_tzinfo(dt_or_tzinfo)
     locale = Locale.parse(locale)
 
     if hasattr(tzinfo, 'zone'):
@@ -594,18 +652,7 @@ def format_datetime(datetime=None, format='medium', tzinfo=None,
     :param tzinfo: the timezone to apply to the time for display
     :param locale: a `Locale` object or a locale identifier
     """
-    if datetime is None:
-        datetime = datetime_.utcnow()
-    elif isinstance(datetime, number_types):
-        datetime = datetime_.utcfromtimestamp(datetime)
-    elif isinstance(datetime, time):
-        datetime = datetime_.combine(date.today(), datetime)
-    if datetime.tzinfo is None:
-        datetime = datetime.replace(tzinfo=UTC)
-    if tzinfo is not None:
-        datetime = datetime.astimezone(get_timezone(tzinfo))
-        if hasattr(tzinfo, 'normalize'): # pytz
-            datetime = tzinfo.normalize(datetime)
+    datetime = _ensure_datetime_tzinfo(_get_datetime(datetime), tzinfo)
 
     locale = Locale.parse(locale)
     if format in ('full', 'long', 'medium', 'short'):
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 30a0ea3d5..e93fa401b 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -411,8 +411,8 @@ def test_get_timezone_location():
             u'Mexiko (Mexiko-Stadt) Zeit')
 
     tz = timezone('Europe/Berlin')
-    assert (dates.get_timezone_name(tz, locale='de_DE') ==
-            u'Mitteleurop\xe4ische Zeit')
+    assert (dates.get_timezone_location(tz, locale='de_DE') ==
+            u'Deutschland (Berlin) Zeit')
 
 
 def test_get_timezone_name():
@@ -448,6 +448,14 @@ def test_get_timezone_name():
     assert dates.get_timezone_name(tz, locale='en', width='long',
                                    zone_variant='daylight') == u'Pacific Daylight Time'
 
+    assert (dates.get_timezone_name(None, locale='en_US') ==
+            dates.get_timezone_name(datetime.now().replace(tzinfo=dates.LOCALTZ), locale='en_US'))
+
+    assert (dates.get_timezone_name('Europe/Berlin', locale='en_US') == "Central European Time")
+
+    assert (dates.get_timezone_name(1400000000, locale='en_US', width='short') == "Unknown Region (GMT) Time")
+    assert (dates.get_timezone_name(time(16, 20), locale='en_US', width='short') == "+0000")
+
 
 def test_format_date():
     d = date(2007, 4, 1)
@@ -556,3 +564,17 @@ def test_lithuanian_long_format():
         dates.format_date(date(2015, 12, 10), locale='lt_LT', format='long') ==
         u'2015 m. gruodžio 10 d.'
     )
+
+
+def test_format_current_moment(monkeypatch):
+    import datetime as datetime_module
+    frozen_instant = datetime.utcnow()
+
+    class frozen_datetime(datetime):
+        @classmethod
+        def utcnow(cls):
+            return frozen_instant
+
+    # Freeze time! Well, some of it anyway.
+    monkeypatch.setattr(datetime_module, "datetime", frozen_datetime)
+    assert dates.format_datetime(locale="en_US") == dates.format_datetime(frozen_instant, locale="en_US")

From 9aafc7158e8aba99f9a08ae25f2dc6e8834e6fe8 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 4 Jan 2016 18:47:36 +0200
Subject: [PATCH 190/489] dates: split tokenize_pattern out of parse_pattern

---
 babel/dates.py | 50 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index b4de62712..8f444f0e2 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1215,27 +1215,57 @@ def parse_pattern(pattern):
         return pattern
 
     result = []
+
+    for tok_type, tok_value in tokenize_pattern(pattern):
+        if tok_type == "chars":
+            result.append(tok_value.replace('%', '%%'))
+        elif tok_type == "field":
+            fieldchar, fieldnum = tok_value
+            limit = PATTERN_CHARS[fieldchar]
+            if limit and fieldnum not in limit:
+                raise ValueError('Invalid length for field: %r'
+                                 % (fieldchar * fieldnum))
+            result.append('%%(%s)s' % (fieldchar * fieldnum))
+        else:
+            raise NotImplementedError("Unknown token type: %s" % tok_type)
+
+    return DateTimePattern(pattern, u''.join(result))
+
+
+def tokenize_pattern(pattern):
+    """
+    Tokenize date format patterns.
+
+    Returns a list of (token_type, token_value) tuples.
+
+    ``token_type`` may be either "chars" or "field".
+
+    For "chars" tokens, the value is the literal value.
+
+    For "field" tokens, the value is a tuple of (field character, repetition count).
+
+    :param pattern: Pattern string
+    :type pattern: str
+    :rtype: list[tuple]
+    """
+    result = []
     quotebuf = None
     charbuf = []
     fieldchar = ['']
     fieldnum = [0]
 
     def append_chars():
-        result.append(''.join(charbuf).replace('%', '%%'))
+        result.append(('chars', ''.join(charbuf).replace('\0', "'")))
         del charbuf[:]
 
     def append_field():
-        limit = PATTERN_CHARS[fieldchar[0]]
-        if limit and fieldnum[0] not in limit:
-            raise ValueError('Invalid length for field: %r'
-                             % (fieldchar[0] * fieldnum[0]))
-        result.append('%%(%s)s' % (fieldchar[0] * fieldnum[0]))
+        result.append(('field', (fieldchar[0], fieldnum[0])))
         fieldchar[0] = ''
         fieldnum[0] = 0
 
     for idx, char in enumerate(pattern.replace("''", '\0')):
         if quotebuf is None:
-            if char == "'": # quote started
+            if char == "'":  # quote started
                 if fieldchar[0]:
                     append_field()
                 elif charbuf:
@@ -1257,10 +1287,10 @@ def append_field():
                 charbuf.append(char)
 
         elif quotebuf is not None:
-            if char == "'": # end of quote
+            if char == "'":  # end of quote
                 charbuf.extend(quotebuf)
                 quotebuf = None
-            else: # inside quote
+            else:  # inside quote
                 quotebuf.append(char)
 
     if fieldchar[0]:
@@ -1268,4 +1298,4 @@ def append_field():
     elif charbuf:
         append_chars()
 
-    return DateTimePattern(pattern, u''.join(result).replace('\0', "'"))
+    return result

From 516113b33e027a1a11b0740ddf26eccaedec90f6 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 4 Jan 2016 19:01:52 +0200
Subject: [PATCH 191/489] dates: add split_interval_pattern and
 untokenize_pattern

---
 babel/dates.py | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/babel/dates.py b/babel/dates.py
index 8f444f0e2..b5c670b41 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1299,3 +1299,62 @@ def append_field():
         append_chars()
 
     return result
+
+
+def untokenize_pattern(tokens):
+    """
+    Turn a date format pattern token stream back into a string.
+
+    This is the reverse operation of ``tokenize_pattern``.
+
+    :type tokens: Iterable[tuple]
+    :rtype: str
+    """
+    output = []
+    for tok_type, tok_value in tokens:
+        if tok_type == "field":
+            output.append(tok_value[0] * tok_value[1])
+        elif tok_type == "chars":
+            if not any(ch in PATTERN_CHARS for ch in tok_value):  # No need to quote
+                output.append(tok_value)
+            else:
+                output.append("'%s'" % tok_value.replace("'", "''"))
+    return "".join(output)
+
+
+def split_interval_pattern(pattern):
+    """
+    Split an interval-describing datetime pattern into multiple pieces.
+
+    > The pattern is then designed to be broken up into two pieces by determining the first repeating field.
+    - http://www.unicode.org/reports/tr35/tr35-dates.html#intervalFormats
+
+    >>> split_interval_pattern(u'E d.M. \u2013 E d.M.')
+    [u'E d.M. \u2013 ', 'E d.M.']
+    >>> split_interval_pattern("Y 'text' Y 'more text'")
+    ["Y 'text '", "Y 'more text'"]
+    >>> split_interval_pattern(u"E, MMM d \u2013 E")
+    [u'E, MMM d \u2013 ', u'E']
+    >>> split_interval_pattern("MMM d")
+    ['MMM d']
+    >>> split_interval_pattern("y G")
+    ['y G']
+    >>> split_interval_pattern(u"MMM d \u2013 d")
+    [u'MMM d \u2013 ', u'd']
+
+    :param pattern: Interval pattern string
+    :return: list of "subpatterns"
+    """
+
+    seen_fields = set()
+    parts = [[]]
+
+    for tok_type, tok_value in tokenize_pattern(pattern):
+        if tok_type == "field":
+            if tok_value[0] in seen_fields:  # Repeated field
+                parts.append([])
+                seen_fields.clear()
+            seen_fields.add(tok_value[0])
+        parts[-1].append((tok_type, tok_value))
+
+    return [untokenize_pattern(tokens) for tokens in parts]

From 9b96b1fbc49a7a0d47ec58c25cf0644282fe6201 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 4 Jan 2016 20:52:36 +0200
Subject: [PATCH 192/489] dates: Memoize parsed DateTimePatterns

---
 babel/dates.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/babel/dates.py b/babel/dates.py
index b5c670b41..20d1ab814 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1189,6 +1189,7 @@ def get_week_number(self, day_of_period, day_of_week=None):
     'z': [1, 2, 3, 4], 'Z': [1, 2, 3, 4], 'v': [1, 4], 'V': [1, 4]  # zone
 }
 
+_pattern_cache = {}
 
 def parse_pattern(pattern):
     """Parse date, time, and datetime format patterns.
@@ -1214,6 +1215,9 @@ def parse_pattern(pattern):
     if type(pattern) is DateTimePattern:
         return pattern
 
+    if pattern in _pattern_cache:
+        return _pattern_cache[pattern]
+
     result = []
 
     for tok_type, tok_value in tokenize_pattern(pattern):
@@ -1229,7 +1233,8 @@ def parse_pattern(pattern):
         else:
             raise NotImplementedError("Unknown token type: %s" % tok_type)
 
-    return DateTimePattern(pattern, u''.join(result))
+    _pattern_cache[pattern] = pat = DateTimePattern(pattern, u''.join(result))
+    return pat
 
 
 def tokenize_pattern(pattern):

From b652f655deab93dddf35dd0fb4799f978778e275 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 4 Jan 2016 19:34:24 +0200
Subject: [PATCH 193/489] dates: Add DateTimeFormat.extract() support function

---
 babel/dates.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/babel/dates.py b/babel/dates.py
index 20d1ab814..b0ba9c082 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1041,6 +1041,25 @@ def __getitem__(self, name):
         else:
             raise KeyError('Unsupported date/time field %r' % char)
 
+    def extract(self, char):
+        char = str(char)[0]
+        if char == 'y':
+            return self.value.year
+        elif char == 'M':
+            return self.value.month
+        elif char == 'd':
+            return self.value.day
+        elif char == 'H':
+            return self.value.hour
+        elif char == 'h':
+            return (self.value.hour % 12 or 12)
+        elif char == 'm':
+            return self.value.minute
+        elif char == 'a':
+            return int(self.value.hour >= 12)  # 0 for am, 1 for pm
+        else:
+            raise NotImplementedError("Not implemented: extracting %r from %r" % (char, self.value))
+
     def format_era(self, char, num):
         width = {3: 'abbreviated', 4: 'wide', 5: 'narrow'}[max(3, num)]
         era = int(self.value.year >= 0)

From 796c3d20bfb430f9ae1cf845b2cde35ab0573c2b Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 4 Jan 2016 19:35:56 +0200
Subject: [PATCH 194/489] dates: Add basic format_interval implementation

Refs #276
---
 babel/dates.py               | 107 +++++++++++++++++++++++++++++++++++
 docs/api/dates.rst           |   2 +
 tests/test_date_intervals.py |  47 +++++++++++++++
 3 files changed, 156 insertions(+)
 create mode 100644 tests/test_date_intervals.py

diff --git a/babel/dates.py b/babel/dates.py
index b0ba9c082..3605a4519 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -882,6 +882,107 @@ def _iter_patterns(a_unit):
     return u''
 
 
+def _format_fallback_interval(start, end, skeleton, tzinfo, locale):
+    if skeleton in locale.datetime_skeletons:  # Use the given skeleton
+        format = lambda dt: format_skeleton(skeleton, dt, tzinfo, locale=locale)
+    elif all((isinstance(d, date) and not isinstance(d, datetime)) for d in (start, end)):  # Both are just dates
+        format = lambda dt: format_date(dt, locale=locale)
+    elif all((isinstance(d, time) and not isinstance(d, date)) for d in (start, end)):  # Both are times
+        format = lambda dt: format_time(dt, tzinfo=tzinfo, locale=locale)
+    else:
+        format = lambda dt: format_datetime(dt, tzinfo=tzinfo, locale=locale)
+
+    formatted_start = format(start)
+    formatted_end = format(end)
+
+    if formatted_start == formatted_end:
+        return format(start)
+
+    return (
+        locale.interval_formats.get(None, "{0}-{1}").
+        replace("{0}", formatted_start).
+        replace("{1}", formatted_end)
+    )
+
+
+def format_interval(start, end, skeleton, tzinfo=None, locale=LC_TIME):
+    """
+    Format an interval between two instants according to the locale's rules.
+
+    >>> format_interval(date(2016, 1, 15), date(2016, 1, 17), "yMd", locale="fi")
+    u'15.\u201317.1.2016'
+
+    >>> format_interval(time(12, 12), time(16, 16), "Hm", locale="en_GB")
+    '12:12 \u2013 16:16'
+
+    >>> format_interval(time(5, 12), time(16, 16), "hm", locale="en_US")
+    '5:12 AM \u2013 4:16 PM'
+
+    >>> format_interval(time(16, 18), time(16, 24), "Hm", locale="it")
+    '16:18\u201316:24'
+
+    If the start instant equals the end instant, the interval is formatted like the instant.
+
+    >>> format_interval(time(16, 18), time(16, 18), "Hm", locale="it")
+    '16:18'
+
+    :param start: First instant (datetime/date/time)
+    :param end: Second instant (datetime/date/time)
+    :param skeleton: The "skeleton format" to use for formatting.
+    :param tzinfo: tzinfo to use (if none is already attached)
+    :param locale: A locale object or identifier.
+    :return: Formatted interval
+    """
+    locale = Locale.parse(locale)
+
+    # NB: The quote comments below are from the algorithm description in
+    #     http://www.unicode.org/reports/tr35/tr35-dates.html#intervalFormats
+
+    # > Look for the intervalFormatItem element that matches the "skeleton",
+    # > starting in the current locale and then following the locale fallback
+    # > chain up to, but not including root.
+
+    if skeleton not in locale.interval_formats:
+        # > If no match was found from the previous step, check what the closest
+        # > match is in the fallback locale chain, as in availableFormats. That
+        # > is, this allows for adjusting the string value field's width,
+        # > including adjusting between "MMM" and "MMMM", and using different
+        # > variants of the same field, such as 'v' and 'z'.
+        # TODO: Implement closest-match instead of immediately falling back
+        return _format_fallback_interval(start, end, skeleton, tzinfo, locale)
+
+    skel_formats = locale.interval_formats[skeleton]
+
+    if start == end:
+        return format_skeleton(skeleton, start, tzinfo, locale)
+
+    start = _ensure_datetime_tzinfo(_get_datetime(start), tzinfo=tzinfo)
+    end = _ensure_datetime_tzinfo(_get_datetime(end), tzinfo=tzinfo)
+
+    start_fmt = DateTimeFormat(start, locale=locale)
+    end_fmt = DateTimeFormat(end, locale=locale)
+
+    # > If a match is found from previous steps, compute the calendar field
+    # > with the greatest difference between start and end datetime. If there
+    # > is no difference among any of the fields in the pattern, format as a
+    # > single date using availableFormats, and return.
+
+    for field in PATTERN_CHAR_ORDER:  # These are in largest-to-smallest order
+        if field in skel_formats:
+            if start_fmt.extract(field) != end_fmt.extract(field):
+                # > If there is a match, use the pieces of the corresponding pattern to
+                # > format the start and end datetime, as above.
+                return "".join(
+                    parse_pattern(pattern).apply(instant, locale)
+                    for pattern, instant
+                    in zip(skel_formats[field], (start, end))
+                )
+
+    # > Otherwise, format the start and end datetime using the fallback pattern.
+
+    return _format_fallback_interval(start, end, skeleton, tzinfo, locale)
+
+
 def parse_date(string, locale=LC_TIME):
     """Parse a date from a string.
 
@@ -1208,8 +1309,14 @@ def get_week_number(self, day_of_period, day_of_week=None):
     'z': [1, 2, 3, 4], 'Z': [1, 2, 3, 4], 'v': [1, 4], 'V': [1, 4]  # zone
 }
 
+#: The pattern characters declared in the Date Field Symbol Table
+#: (http://www.unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table)
+#: in order of decreasing magnitude.
+PATTERN_CHAR_ORDER = "GyYuUQqMLlwWdDFgEecabBChHKkjJmsSAzZvV"
+
 _pattern_cache = {}
 
+
 def parse_pattern(pattern):
     """Parse date, time, and datetime format patterns.
 
diff --git a/docs/api/dates.rst b/docs/api/dates.rst
index 1b22cd74b..67ada4159 100644
--- a/docs/api/dates.rst
+++ b/docs/api/dates.rst
@@ -19,6 +19,8 @@ Date and Time Formatting
 
 .. autofunction:: format_skeleton
 
+.. autofunction:: format_interval
+
 Timezone Functionality
 ----------------------
 
diff --git a/tests/test_date_intervals.py b/tests/test_date_intervals.py
new file mode 100644
index 000000000..73fae462c
--- /dev/null
+++ b/tests/test_date_intervals.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import datetime
+
+from babel import dates
+from babel.dates import get_timezone
+from babel.util import UTC
+
+TEST_DT = datetime.datetime(2016, 1, 8, 11, 46, 15)
+TEST_TIME = TEST_DT.time()
+TEST_DATE = TEST_DT.date()
+
+
+def test_format_interval_same_instant_1():
+    assert dates.format_interval(TEST_DT, TEST_DT, "yMMMd", locale="fi") == "8. tammikuuta 2016"
+
+
+def test_format_interval_same_instant_2():
+    assert dates.format_interval(TEST_DT, TEST_DT, "xxx", locale="fi") == "8.1.2016 klo 11.46.15"
+
+
+def test_format_interval_same_instant_3():
+    assert dates.format_interval(TEST_TIME, TEST_TIME, "xxx", locale="fi") == "11.46.15"
+
+
+def test_format_interval_same_instant_4():
+    assert dates.format_interval(TEST_DATE, TEST_DATE, "xxx", locale="fi") == "8.1.2016"
+
+
+def test_format_interval_no_difference():
+    t1 = TEST_DT
+    t2 = t1 + datetime.timedelta(minutes=8)
+    assert dates.format_interval(t1, t2, "yMd", locale="fi") == "8.1.2016"
+
+
+def test_format_interval_in_tz():
+    t1 = TEST_DT.replace(tzinfo=UTC)
+    t2 = t1 + datetime.timedelta(minutes=18)
+    hki_tz = get_timezone("Europe/Helsinki")
+    assert dates.format_interval(t1, t2, "Hmv", tzinfo=hki_tz, locale="fi") == "13.46\u201314.04 aikavyöhyke: Suomi"
+
+
+def test_format_interval_12_hour():
+    t2 = TEST_DT
+    t1 = t2 - datetime.timedelta(hours=1)
+    assert dates.format_interval(t1, t2, "hm", locale="en") == "10:46 \u2013 11:46 AM"

From cd70395b0f138b7f60b0866f5b2b164f1a025786 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 4 Jan 2016 21:51:36 +0200
Subject: [PATCH 195/489] dates: Add and use fuzzy skeleton matching

Based on:

* http://www.unicode.org/reports/tr35/tr35-dates.html#availableFormats_appendItems
* http://source.icu-project.org/repos/icu/icu4j/trunk/main/classes/core/src/com/ibm/icu/text/DateIntervalInfo.java
  (method `getBestSkeleton`)
---
 babel/dates.py               | 114 ++++++++++++++++++++++++++++++++---
 tests/test_date_intervals.py |  17 ++++--
 2 files changed, 119 insertions(+), 12 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 3605a4519..b41945bc7 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -741,7 +741,7 @@ def format_time(time=None, format='medium', tzinfo=None, locale=LC_TIME):
     return parse_pattern(format).apply(time, locale)
 
 
-def format_skeleton(skeleton, datetime=None, tzinfo=None, locale=LC_TIME):
+def format_skeleton(skeleton, datetime=None, tzinfo=None, fuzzy=True, locale=LC_TIME):
     r"""Return a time and/or date formatted according to the given pattern.
 
     The skeletons are defined in the CLDR data and provide more flexibility
@@ -754,6 +754,12 @@ def format_skeleton(skeleton, datetime=None, tzinfo=None, locale=LC_TIME):
     u'dim. 1 avr.'
     >>> format_skeleton('MMMEd', t, locale='en')
     u'Sun, Apr 1'
+    >>> format_skeleton('yMMd', t, locale='fi')  # yMMd is not in the Finnish locale; yMd gets used
+    u'1.4.2007'
+    >>> format_skeleton('yMMd', t, fuzzy=False, locale='fi')  # yMMd is not in the Finnish locale, an error is thrown
+    Traceback (most recent call last):
+        ...
+    KeyError: yMMd
 
     After the skeleton is resolved to a pattern `format_datetime` is called so
     all timezone processing etc is the same as for that.
@@ -762,9 +768,13 @@ def format_skeleton(skeleton, datetime=None, tzinfo=None, locale=LC_TIME):
     :param datetime: the ``time`` or ``datetime`` object; if `None`, the current
                  time in UTC is used
     :param tzinfo: the time-zone to apply to the time for display
+    :param fuzzy: If the skeleton is not found, allow choosing a skeleton that's
+                  close enough to it.
     :param locale: a `Locale` object or a locale identifier
     """
     locale = Locale.parse(locale)
+    if fuzzy and skeleton not in locale.datetime_skeletons:
+        skeleton = match_skeleton(skeleton, locale.datetime_skeletons)
     format = locale.datetime_skeletons[skeleton]
     return format_datetime(datetime, format, tzinfo, locale)
 
@@ -905,7 +915,7 @@ def _format_fallback_interval(start, end, skeleton, tzinfo, locale):
     )
 
 
-def format_interval(start, end, skeleton, tzinfo=None, locale=LC_TIME):
+def format_interval(start, end, skeleton=None, tzinfo=None, fuzzy=True, locale=LC_TIME):
     """
     Format an interval between two instants according to the locale's rules.
 
@@ -926,10 +936,23 @@ def format_interval(start, end, skeleton, tzinfo=None, locale=LC_TIME):
     >>> format_interval(time(16, 18), time(16, 18), "Hm", locale="it")
     '16:18'
 
+    Unknown skeletons fall back to "default" formatting.
+
+    >>> format_interval(date(2015, 1, 1), date(2017, 1, 1), "wzq", locale="ja")
+    '2015/01/01\uff5e2017/01/01'
+
+    >>> format_interval(time(16, 18), time(16, 24), "xxx", locale="ja")
+    '16:18:00\uff5e16:24:00'
+
+    >>> format_interval(date(2016, 1, 15), date(2016, 1, 17), "xxx", locale="de")
+    '15.01.2016 \u2013 17.01.2016'
+
     :param start: First instant (datetime/date/time)
     :param end: Second instant (datetime/date/time)
     :param skeleton: The "skeleton format" to use for formatting.
     :param tzinfo: tzinfo to use (if none is already attached)
+    :param fuzzy: If the skeleton is not found, allow choosing a skeleton that's
+                  close enough to it.
     :param locale: A locale object or identifier.
     :return: Formatted interval
     """
@@ -942,19 +965,26 @@ def format_interval(start, end, skeleton, tzinfo=None, locale=LC_TIME):
     # > starting in the current locale and then following the locale fallback
     # > chain up to, but not including root.
 
-    if skeleton not in locale.interval_formats:
+    interval_formats = locale.interval_formats
+
+    if skeleton not in interval_formats or not skeleton:
         # > If no match was found from the previous step, check what the closest
         # > match is in the fallback locale chain, as in availableFormats. That
         # > is, this allows for adjusting the string value field's width,
         # > including adjusting between "MMM" and "MMMM", and using different
         # > variants of the same field, such as 'v' and 'z'.
-        # TODO: Implement closest-match instead of immediately falling back
-        return _format_fallback_interval(start, end, skeleton, tzinfo, locale)
+        if skeleton and fuzzy:
+            skeleton = match_skeleton(skeleton, interval_formats)
+        else:
+            skeleton = None
+        if not skeleton:  # Still no match whatsoever?
+            # > Otherwise, format the start and end datetime using the fallback pattern.
+            return _format_fallback_interval(start, end, skeleton, tzinfo, locale)
 
-    skel_formats = locale.interval_formats[skeleton]
+    skel_formats = interval_formats[skeleton]
 
     if start == end:
-        return format_skeleton(skeleton, start, tzinfo, locale)
+        return format_skeleton(skeleton, start, tzinfo, fuzzy=fuzzy, locale=locale)
 
     start = _ensure_datetime_tzinfo(_get_datetime(start), tzinfo=tzinfo)
     end = _ensure_datetime_tzinfo(_get_datetime(end), tzinfo=tzinfo)
@@ -1489,3 +1519,73 @@ def split_interval_pattern(pattern):
         parts[-1].append((tok_type, tok_value))
 
     return [untokenize_pattern(tokens) for tokens in parts]
+
+
+def match_skeleton(skeleton, options, allow_different_fields=False):
+    """
+    Find the closest match for the given datetime skeleton among the options given.
+
+    This uses the rules outlined in the TR35 document.
+
+    >>> match_skeleton('yMMd', ('yMd', 'yMMMd'))
+    'yMd'
+
+    >>> match_skeleton('yMMd', ('jyMMd',), allow_different_fields=True)
+    'jyMMd'
+
+    >>> match_skeleton('yMMd', ('qyMMd',), allow_different_fields=False)
+
+    >>> match_skeleton('hmz', ('hmv',))
+    'hmv'
+
+    :param skeleton: The skeleton to match
+    :type skeleton: str
+    :param options: An iterable of other skeletons to match against
+    :type options: Iterable[str]
+    :return: The closest skeleton match, or if no match was found, None.
+    :rtype: str|None
+    """
+
+    # TODO: maybe implement pattern expansion?
+
+    # Based on the implementation in
+    # http://source.icu-project.org/repos/icu/icu4j/trunk/main/classes/core/src/com/ibm/icu/text/DateIntervalInfo.java
+
+    # Filter out falsy values and sort for stability; when `interval_formats` is passed in, there may be a None key.
+    options = sorted(option for option in options if option)
+
+    if 'z' in skeleton and not any('z' in option for option in options):
+        skeleton = skeleton.replace('z', 'v')
+
+    get_input_field_width = dict(t[1] for t in tokenize_pattern(skeleton) if t[0] == "field").get
+    best_skeleton = None
+    best_distance = None
+    for option in options:
+        get_opt_field_width = dict(t[1] for t in tokenize_pattern(option) if t[0] == "field").get
+        distance = 0
+        for field in PATTERN_CHARS:
+            input_width = get_input_field_width(field, 0)
+            opt_width = get_opt_field_width(field, 0)
+            if input_width == opt_width:
+                continue
+            if opt_width == 0 or input_width == 0:
+                if not allow_different_fields:  # This one is not okay
+                    option = None
+                    break
+                distance += 0x1000  # Magic weight constant for "entirely different fields"
+            elif field == 'M' and ((input_width > 2 and opt_width <= 2) or (input_width <= 2 and opt_width > 2)):
+                distance += 0x100  # Magic weight for "text turns into a number"
+            else:
+                distance += abs(input_width - opt_width)
+
+        if not option:  # We lost the option along the way (probably due to "allow_different_fields")
+            continue
+
+        if not best_skeleton or distance < best_distance:
+            best_skeleton = option
+            best_distance = distance
+
+        if distance == 0:  # Found a perfect match!
+            break
+
+    return best_skeleton
diff --git a/tests/test_date_intervals.py b/tests/test_date_intervals.py
index 73fae462c..e5a797a94 100644
--- a/tests/test_date_intervals.py
+++ b/tests/test_date_intervals.py
@@ -13,25 +13,25 @@
 
 
 def test_format_interval_same_instant_1():
-    assert dates.format_interval(TEST_DT, TEST_DT, "yMMMd", locale="fi") == "8. tammikuuta 2016"
+    assert dates.format_interval(TEST_DT, TEST_DT, "yMMMd", fuzzy=False, locale="fi") == "8. tammikuuta 2016"
 
 
 def test_format_interval_same_instant_2():
-    assert dates.format_interval(TEST_DT, TEST_DT, "xxx", locale="fi") == "8.1.2016 klo 11.46.15"
+    assert dates.format_interval(TEST_DT, TEST_DT, "xxx", fuzzy=False, locale="fi") == "8.1.2016 klo 11.46.15"
 
 
 def test_format_interval_same_instant_3():
-    assert dates.format_interval(TEST_TIME, TEST_TIME, "xxx", locale="fi") == "11.46.15"
+    assert dates.format_interval(TEST_TIME, TEST_TIME, "xxx", fuzzy=False, locale="fi") == "11.46.15"
 
 
 def test_format_interval_same_instant_4():
-    assert dates.format_interval(TEST_DATE, TEST_DATE, "xxx", locale="fi") == "8.1.2016"
+    assert dates.format_interval(TEST_DATE, TEST_DATE, "xxx", fuzzy=False, locale="fi") == "8.1.2016"
 
 
 def test_format_interval_no_difference():
     t1 = TEST_DT
     t2 = t1 + datetime.timedelta(minutes=8)
-    assert dates.format_interval(t1, t2, "yMd", locale="fi") == "8.1.2016"
+    assert dates.format_interval(t1, t2, "yMd", fuzzy=False, locale="fi") == "8.1.2016"
 
 
 def test_format_interval_in_tz():
@@ -45,3 +45,10 @@ def test_format_interval_12_hour():
     t2 = TEST_DT
     t1 = t2 - datetime.timedelta(hours=1)
     assert dates.format_interval(t1, t2, "hm", locale="en") == "10:46 \u2013 11:46 AM"
+
+
+def test_format_interval_invalid_skeleton():
+    t1 = TEST_DATE
+    t2 = TEST_DATE + datetime.timedelta(days=1)
+    assert dates.format_interval(t1, t2, "mumumu", fuzzy=False, locale="fi") == u"8.1.2016\u20139.1.2016"
+    assert dates.format_interval(t1, t2, fuzzy=False, locale="fi") == u"8.1.2016\u20139.1.2016"

From 3e8d7cff5b145b2ed4a8fc0ca51a342b9fbca20b Mon Sep 17 00:00:00 2001
From: sudheesh001 <sudheesh1995@outlook.com>
Date: Thu, 28 Jan 2016 09:01:23 +0530
Subject: [PATCH 196/489] Fix #266 Points newcomers to easy bugs in the
 documentation

---
 CONTRIBUTING.md | 3 +++
 README.md       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2fa0a6584..dfad49f60 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,6 +39,9 @@ For a PR to be merged, the following statements must hold true:
   not the author of the PR. Commits shall comply to the "Good Commits" standards
   outlined below.
 
+To begin contributing have a look at the open [easy issues](https://github.com/python-babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow) 
+which could be fixed.
+
 ## Correcting PRs
 
 Rebasing PRs is preferred over merging master into the source branches again
diff --git a/README.md b/README.md
index 4fa81e609..98ea01467 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Contributing to Babel
 =====================
 
 If you want to contribute code to Babel, please take a look at our
-CONTRIBUTING.md.
+[CONTRIBUTING.md](https://github.com/python-babel/babel/blob/master/CONTRIBUTING.md).
 
 If you know your way around Babels codebase a bit and like to help further, we
 would appreciate any help in reviewing pull requests. Please contact us at

From 5a2674f2740ffbc13825f1ddb6da7ab51c92c3bc Mon Sep 17 00:00:00 2001
From: Sven Anderson <sven@redhat.com>
Date: Wed, 27 Jan 2016 15:35:20 +0100
Subject: [PATCH 197/489] Frontend: Add multi-domain support to compile_catalog
 command

Some projects have their translations split up into several text
domains within one package.  This change adds the possibility to
specify a space seperated list of domains in the configuration, like
'setup.py compile_catalog --domain="foo bar"', for instance.
---
 babel/messages/frontend.py                    | 18 +++++++----
 .../project/i18n/de_DE/LC_MESSAGES/bar.po     | 32 +++++++++++++++++++
 .../project/i18n/de_DE/LC_MESSAGES/foo.po     | 32 +++++++++++++++++++
 tests/messages/test_frontend.py               | 23 +++++++++++++
 4 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 tests/messages/data/project/i18n/de_DE/LC_MESSAGES/bar.po
 create mode 100644 tests/messages/data/project/i18n/de_DE/LC_MESSAGES/foo.po

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 8c6fd8252..73abf4f19 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -83,7 +83,7 @@ class compile_catalog(Command):
     description = 'compile message catalogs to binary MO files'
     user_options = [
         ('domain=', 'D',
-         "domain of PO file (default 'messages')"),
+         "domains of PO files (space separated list, default 'messages')"),
         ('directory=', 'd',
          'path to base directory containing the catalogs'),
         ('input-file=', 'i',
@@ -118,6 +118,12 @@ def finalize_options(self):
                                        'or the base directory')
 
     def run(self):
+        domains = self.domain.split()
+
+        for domain in domains:
+            self._run_domain(domain)
+
+    def _run_domain(self, domain):
         po_files = []
         mo_files = []
 
@@ -126,19 +132,19 @@ def run(self):
                 po_files.append((self.locale,
                                  os.path.join(self.directory, self.locale,
                                               'LC_MESSAGES',
-                                              self.domain + '.po')))
+                                              domain + '.po')))
                 mo_files.append(os.path.join(self.directory, self.locale,
                                              'LC_MESSAGES',
-                                             self.domain + '.mo'))
+                                             domain + '.mo'))
             else:
                 for locale in os.listdir(self.directory):
                     po_file = os.path.join(self.directory, locale,
-                                           'LC_MESSAGES', self.domain + '.po')
+                                           'LC_MESSAGES', domain + '.po')
                     if os.path.exists(po_file):
                         po_files.append((locale, po_file))
                         mo_files.append(os.path.join(self.directory, locale,
                                                      'LC_MESSAGES',
-                                                     self.domain + '.mo'))
+                                                     domain + '.mo'))
         else:
             po_files.append((self.locale, self.input_file))
             if self.output_file:
@@ -146,7 +152,7 @@ def run(self):
             else:
                 mo_files.append(os.path.join(self.directory, self.locale,
                                              'LC_MESSAGES',
-                                             self.domain + '.mo'))
+                                             domain + '.mo'))
 
         if not po_files:
             raise DistutilsOptionError('no message catalogs found')
diff --git a/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/bar.po b/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/bar.po
new file mode 100644
index 000000000..c5c974892
--- /dev/null
+++ b/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/bar.po
@@ -0,0 +1,32 @@
+# German (Germany) translations for TestProject.
+# Copyright (C) 2007 FooBar, Inc.
+# This file is distributed under the same license as the TestProject
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: TestProject 0.1\n"
+"Report-Msgid-Bugs-To: bugs.address@email.tld\n"
+"POT-Creation-Date: 2007-04-01 15:30+0200\n"
+"PO-Revision-Date: 2007-07-30 22:18+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: de_DE <LL@li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9dev-r245\n"
+
+#. This will be a translator coment,
+#. that will include several lines
+#: project/file1.py:8
+msgid "bar"
+msgstr "Stange"
+
+#: project/file2.py:9
+msgid "foobar"
+msgid_plural "foobars"
+msgstr[0] "Fuhstange"
+msgstr[1] "Fuhstangen"
+
diff --git a/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/foo.po b/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/foo.po
new file mode 100644
index 000000000..c5c974892
--- /dev/null
+++ b/tests/messages/data/project/i18n/de_DE/LC_MESSAGES/foo.po
@@ -0,0 +1,32 @@
+# German (Germany) translations for TestProject.
+# Copyright (C) 2007 FooBar, Inc.
+# This file is distributed under the same license as the TestProject
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: TestProject 0.1\n"
+"Report-Msgid-Bugs-To: bugs.address@email.tld\n"
+"POT-Creation-Date: 2007-04-01 15:30+0200\n"
+"PO-Revision-Date: 2007-07-30 22:18+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: de_DE <LL@li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9dev-r245\n"
+
+#. This will be a translator coment,
+#. that will include several lines
+#: project/file1.py:8
+msgid "bar"
+msgstr "Stange"
+
+#: project/file2.py:9
+msgid "foobar"
+msgid_plural "foobars"
+msgstr[0] "Fuhstange"
+msgstr[1] "Fuhstangen"
+
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 975876a5c..fc1efad31 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1112,6 +1112,29 @@ def test_compile_catalog_with_more_than_2_plural_forms(self):
             if os.path.isfile(mo_file):
                 os.unlink(mo_file)
 
+    def test_compile_catalog_multidomain(self):
+        po_foo = os.path.join(self._i18n_dir(), 'de_DE', 'LC_MESSAGES',
+                              'foo.po')
+        po_bar = os.path.join(self._i18n_dir(), 'de_DE', 'LC_MESSAGES',
+                              'bar.po')
+        mo_foo = po_foo.replace('.po', '.mo')
+        mo_bar = po_bar.replace('.po', '.mo')
+        try:
+            self.cli.run(sys.argv + ['compile',
+                '--locale', 'de_DE', '--domain', 'foo bar', '--use-fuzzy',
+                '-d', self._i18n_dir()])
+            for mo_file in [mo_foo, mo_bar]:
+                assert os.path.isfile(mo_file)
+            self.assertEqual("""\
+compiling catalog %r to %r
+compiling catalog %r to %r
+""" % (po_foo, mo_foo, po_bar, mo_bar), sys.stderr.getvalue())
+
+        finally:
+            for mo_file in [mo_foo, mo_bar]:
+                if os.path.isfile(mo_file):
+                    os.unlink(mo_file)
+
     def test_update(self):
         template = Catalog()
         template.add("1")

From 65ce160b6915011e8c99e6175607e5fb329ce7fb Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 29 Jan 2016 14:47:30 +0200
Subject: [PATCH 198/489] pofile: refactor message sorting into helper fn

---
 babel/messages/pofile.py | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 3c18226da..1fb2c1c3d 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -427,13 +427,13 @@ def _write_message(message, prefix=''):
                 prefix, _normalize(message.string or '', prefix)
             ))
 
-    messages = list(catalog)
+    sort_by = None
     if sort_output:
-        messages.sort()
+        sort_by = "message"
     elif sort_by_file:
-        messages.sort(key=lambda m: m.locations)
+        sort_by = "location"
 
-    for message in messages:
+    for message in _sort_messages(catalog, sort_by=sort_by):
         if not message.id: # This is the header "message"
             if omit_header:
                 continue
@@ -474,14 +474,29 @@ def _write_message(message, prefix=''):
         _write('\n')
 
     if not ignore_obsolete:
-        obsolete = list(catalog.obsolete.values())
-        if sort_output:
-            obsolete.sort()
-        elif sort_by_file:
-            obsolete.sort(key=lambda m: m.locations)
-
-        for message in obsolete:
+        for message in _sort_messages(
+            catalog.obsolete.values(),
+            sort_by=sort_by
+        ):
             for comment in message.user_comments:
                 _write_comment(comment)
             _write_message(message, prefix='#~ ')
             _write('\n')
+
+
+def _sort_messages(messages, sort_by):
+    """
+    Sort the given message iterable by the given criteria.
+
+    Always returns a list.
+
+    :param messages: An iterable of Messages.
+    :param sort_by: Sort by which criteria? Options are `message` and `location`.
+    :return: list[Message]
+    """
+    messages = list(messages)
+    if sort_by == "message":
+        messages.sort()
+    elif sort_by == "location":
+        messages.sort(key=lambda m: m.locations)
+    return messages

From b8d7d48b0e7eb02fdc7086c2ed5b43cf2b8755bd Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 3 Feb 2016 00:54:42 +0200
Subject: [PATCH 199/489] Extract CLI: Add `input-dirs` alias for
 `input-paths`.

Just in case some script expects to be able to pass `--input-dirs`.

Fixes #330
Augments 19957e21470615d42fb7b6e2c1a580cd679d33c8
---
 babel/messages/frontend.py      | 11 +++++++++++
 tests/messages/test_frontend.py | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 73abf4f19..9bb46bbce 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -254,6 +254,8 @@ class extract_messages(Command):
         ('input-paths=', None,
          'files or directories that should be scanned for messages. Separate multiple '
          'files or directories with commas(,)'),
+        ('input-dirs=', None,  # TODO (3.x): Remove me.
+         'alias for input-paths (does allow files as well as directories).'),
     ]
     boolean_options = [
         'no-default-keywords', 'no-location', 'omit-header', 'no-wrap',
@@ -271,6 +273,7 @@ def initialize_options(self):
         self.no_location = False
         self.omit_header = False
         self.output_file = None
+        self.input_dirs = None
         self.input_paths = None
         self.width = None
         self.no_wrap = False
@@ -284,6 +287,14 @@ def initialize_options(self):
         self.strip_comments = False
 
     def finalize_options(self):
+        if self.input_dirs:
+            if not self.input_paths:
+                self.input_paths = self.input_dirs
+            else:
+                raise DistutilsOptionError(
+                    'input-dirs and input-paths are mutually exclusive'
+                )
+
         if self.no_default_keywords and not self.keywords:
             raise DistutilsOptionError('you must specify new keywords if you '
                                        'disable the default ones')
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index fc1efad31..42e3e3836 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -132,6 +132,19 @@ def test_input_paths_handle_spaces_after_comma(self):
 
         self.assertEqual([this_dir, self.datadir], self.cmd.input_paths)
 
+    def test_input_dirs_is_alias_for_input_paths(self):
+        self.cmd.input_dirs = this_dir
+        self.cmd.output_file = self._pot_file()
+        self.cmd.finalize_options()
+        # Gets listified in `finalize_options`:
+        assert self.cmd.input_paths == [self.cmd.input_dirs]
+
+    def test_input_dirs_is_mutually_exclusive_with_input_paths(self):
+        self.cmd.input_dirs = this_dir
+        self.cmd.input_paths = this_dir
+        self.cmd.output_file = self._pot_file()
+        self.assertRaises(DistutilsOptionError, self.cmd.finalize_options)
+
     def test_extraction_with_default_mapping(self):
         self.cmd.copyright_holder = 'FooBar, Inc.'
         self.cmd.msgid_bugs_address = 'bugs.address@email.tld'

From 400d5ad343ccf6c179ca1b5abce2b11037e544a7 Mon Sep 17 00:00:00 2001
From: sudheesh001 <sudheesh1995@outlook.com>
Date: Thu, 28 Jan 2016 09:26:33 +0530
Subject: [PATCH 200/489] Added npgettext to default keywords in extraction

---
 babel/messages/extract.py      |  3 ++-
 tests/messages/test_extract.py | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 8183d527f..cadcb629b 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -38,7 +38,8 @@
     'dgettext': (2,),
     'dngettext': (2, 3),
     'N_': None,
-    'pgettext': ((1, 'c'), 2)
+    'pgettext': ((1, 'c'), 2),
+    'npgettext': ((1, 'c', 2, 3))
 }
 
 DEFAULT_MAPPING = [('**.py', 'python')]
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index fa03207c4..a9408f6af 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -60,6 +60,15 @@ def test_nested_comments(self):
                                                ['TRANSLATORS:'], {}))
         self.assertEqual([(1, 'ngettext', (u'pylon', u'pylons', None), [])],
                          messages)
+        buf = BytesIO(b"""\
+msg = npgettext('Strings', 'pylon',  # TRANSLATORS: shouldn't be
+                'pylons', # TRANSLATORS: seeing this
+                count)
+""")
+        messages = list(extract.extract_python(buf, ('npgettext',),
+                                               ['TRANSLATORS:'], {}))
+        self.assertEqual([(1, 'npgettext', (u'Strings', u'pylon', u'pylons', None), [])],
+                         messages)
 
     def test_comments_with_calls_that_spawn_multiple_lines(self):
         buf = BytesIO(b"""\
@@ -131,6 +140,17 @@ def test_multiline(self):
         self.assertEqual([(1, 'ngettext', (u'pylon', u'pylons', None), []),
                           (3, 'ngettext', (u'elvis', u'elvises', None), [])],
                          messages)
+        buf = BytesIO(b"""\
+msg1 = npgettext('Strings','pylon',
+                'pylons', count)
+msg2 = npgettext('Strings','elvis',
+                'elvises',
+                 count)
+""")
+        messages = list(extract.extract_python(buf, ('npgettext',), [], {}))
+        self.assertEqual([(1, 'npgettext', (u'Strings', u'pylon', u'pylons', None), []),
+                          (3, 'npgettext', (u'Strings', u'elvis', u'elvises', None), [])],
+                          messages)
 
     def test_triple_quoted_strings(self):
         buf = BytesIO(b"""\

From 7a672aeb8bdea2c2c775df37b82397850a42641a Mon Sep 17 00:00:00 2001
From: sudheesh001 <sudheesh1995@outlook.com>
Date: Thu, 28 Jan 2016 09:26:33 +0530
Subject: [PATCH 201/489] Extract: Add npgettext to default keywords map

Add the npgettext as a default keyword in the keywords map.
Create test_npgettext in test_extract showing the passing tests.

Fixes https://github.com/python-babel/babel/issues/281
Fixes https://github.com/python-babel/babel/issues/328
---
 babel/messages/extract.py      |  2 +-
 tests/messages/test_extract.py | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index cadcb629b..c2dcd5b99 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -39,7 +39,7 @@
     'dngettext': (2, 3),
     'N_': None,
     'pgettext': ((1, 'c'), 2),
-    'npgettext': ((1, 'c', 2, 3))
+    'npgettext': ((1, 'c'), 2, 3)
 }
 
 DEFAULT_MAPPING = [('**.py', 'python')]
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index a9408f6af..66c8cd908 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -60,15 +60,6 @@ def test_nested_comments(self):
                                                ['TRANSLATORS:'], {}))
         self.assertEqual([(1, 'ngettext', (u'pylon', u'pylons', None), [])],
                          messages)
-        buf = BytesIO(b"""\
-msg = npgettext('Strings', 'pylon',  # TRANSLATORS: shouldn't be
-                'pylons', # TRANSLATORS: seeing this
-                count)
-""")
-        messages = list(extract.extract_python(buf, ('npgettext',),
-                                               ['TRANSLATORS:'], {}))
-        self.assertEqual([(1, 'npgettext', (u'Strings', u'pylon', u'pylons', None), [])],
-                         messages)
 
     def test_comments_with_calls_that_spawn_multiple_lines(self):
         buf = BytesIO(b"""\
@@ -140,6 +131,8 @@ def test_multiline(self):
         self.assertEqual([(1, 'ngettext', (u'pylon', u'pylons', None), []),
                           (3, 'ngettext', (u'elvis', u'elvises', None), [])],
                          messages)
+
+    def test_npgettext(self):
         buf = BytesIO(b"""\
 msg1 = npgettext('Strings','pylon',
                 'pylons', count)
@@ -151,6 +144,15 @@ def test_multiline(self):
         self.assertEqual([(1, 'npgettext', (u'Strings', u'pylon', u'pylons', None), []),
                           (3, 'npgettext', (u'Strings', u'elvis', u'elvises', None), [])],
                           messages)
+        buf = BytesIO(b"""\
+msg = npgettext('Strings', 'pylon',  # TRANSLATORS: shouldn't be
+                'pylons', # TRANSLATORS: seeing this
+                count)
+""")
+        messages = list(extract.extract_python(buf, ('npgettext',),
+                                               ['TRANSLATORS:'], {}))
+        self.assertEqual([(1, 'npgettext', (u'Strings', u'pylon', u'pylons', None), [])],
+                         messages)
 
     def test_triple_quoted_strings(self):
         buf = BytesIO(b"""\

From 949e4cb402b6290245b88051c00577b96ae4787f Mon Sep 17 00:00:00 2001
From: Sachin Paliwal <sachin.pali146@gmail.com>
Date: Fri, 5 Feb 2016 21:09:34 +0530
Subject: [PATCH 202/489] dates: Add Features in get timezone functions

Added argument 'return_z'  and two values 'iso8601' and 'iso8601_short'
in argument width in get_timezone_gmt(), 'return_city' argument is add
in get_timezone_location() and 'return_zone' in get_timezone_name() so
we can implement iso8601 timezone patterns.
---
 babel/dates.py      | 43 +++++++++++++++++++++++++++++++++++--------
 tests/test_dates.py | 12 ++++++++++--
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index b41945bc7..6d6c36aa8 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -370,20 +370,25 @@ def get_time_format(format='medium', locale=LC_TIME):
     return Locale.parse(locale).time_formats[format]
 
 
-def get_timezone_gmt(datetime=None, width='long', locale=LC_TIME):
+def get_timezone_gmt(datetime=None, width='long', locale=LC_TIME, return_z=False):
     """Return the timezone associated with the given `datetime` object formatted
     as string indicating the offset from GMT.
 
     >>> dt = datetime(2007, 4, 1, 15, 30)
     >>> get_timezone_gmt(dt, locale='en')
     u'GMT+00:00'
-
+    >>> get_timezone_gmt(dt, locale='en', return_z=True)
+    'Z'
+    >>> get_timezone_gmt(dt, locale='en', width='iso8601_short')
+    u'+00'
     >>> tz = get_timezone('America/Los_Angeles')
     >>> dt = tz.localize(datetime(2007, 4, 1, 15, 30))
     >>> get_timezone_gmt(dt, locale='en')
     u'GMT-07:00'
     >>> get_timezone_gmt(dt, 'short', locale='en')
     u'-0700'
+    >>> get_timezone_gmt(dt, locale='en', width='iso8601_short')
+    u'-07'
 
     The long format depends on the locale, for example in France the acronym
     UTC string is used instead of GMT:
@@ -395,8 +400,10 @@ def get_timezone_gmt(datetime=None, width='long', locale=LC_TIME):
 
     :param datetime: the ``datetime`` object; if `None`, the current date and
                      time in UTC is used
-    :param width: either "long" or "short"
+    :param width: either "long" or "short" or "iso8601" or "iso8601_short"
     :param locale: the `Locale` object, or a locale string
+    :param return_z: True or False; Function returns indicator "Z"
+                     when local time offset is 0
     """
     datetime = _ensure_datetime_tzinfo(_get_datetime(datetime))
     locale = Locale.parse(locale)
@@ -404,14 +411,20 @@ def get_timezone_gmt(datetime=None, width='long', locale=LC_TIME):
     offset = datetime.tzinfo.utcoffset(datetime)
     seconds = offset.days * 24 * 60 * 60 + offset.seconds
     hours, seconds = divmod(seconds, 3600)
-    if width == 'short':
+    if return_z and hours == 0 and seconds == 0:
+        return 'Z'
+    elif seconds == 0 and width == 'iso8601_short':
+        return u'%+03d' % hours
+    elif width == 'short' or width == 'iso8601_short':
         pattern = u'%+03d%02d'
+    elif width == 'iso8601':
+        pattern = u'%+03d:%02d'
     else:
         pattern = locale.zone_formats['gmt'] % '%+03d:%02d'
     return pattern % (hours, seconds // 60)
 
 
-def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME):
+def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME, return_city=False):
     u"""Return a representation of the given timezone using "location format".
 
     The result depends on both the local display name of the country and the
@@ -420,6 +433,10 @@ def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME):
     >>> tz = get_timezone('America/St_Johns')
     >>> print(get_timezone_location(tz, locale='de_DE'))
     Kanada (St. John’s) Zeit
+    >>> print(get_timezone_location(tz, locale='en'))
+    Canada (St. John’s) Time
+    >>> print(get_timezone_location(tz, locale='en', return_city=True))
+    St. John’s
     >>> tz = get_timezone('America/Mexico_City')
     >>> get_timezone_location(tz, locale='de_DE')
     u'Mexiko (Mexiko-Stadt) Zeit'
@@ -437,7 +454,10 @@ def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME):
                          the timezone; if `None`, the current date and time in
                          UTC is assumed
     :param locale: the `Locale` object, or a locale string
+    :param return_city: True or False, if True then return exemplar city (location)
+                        for the time zone
     :return: the localized timezone name using location format
+
     """
     dt, tzinfo = _get_dt_and_tzinfo(dt_or_tzinfo)
     locale = Locale.parse(locale)
@@ -459,7 +479,7 @@ def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME):
     if territory not in locale.territories:
         territory = 'ZZ' # invalid/unknown
     territory_name = locale.territories[territory]
-    if territory and len(get_global('territory_zones').get(territory, [])) == 1:
+    if not return_city and territory and len(get_global('territory_zones').get(territory, [])) == 1:
         return region_format % (territory_name)
 
     # Otherwise, include the city in the output
@@ -476,6 +496,8 @@ def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME):
         else:
             city_name = zone.replace('_', ' ')
 
+    if return_city:
+        return city_name
     return region_format % (fallback_format % {
         '0': city_name,
         '1': territory_name
@@ -483,13 +505,15 @@ def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME):
 
 
 def get_timezone_name(dt_or_tzinfo=None, width='long', uncommon=False,
-                      locale=LC_TIME, zone_variant=None):
+                      locale=LC_TIME, zone_variant=None, return_zone=False):
     r"""Return the localized display name for the given timezone. The timezone
     may be specified using a ``datetime`` or `tzinfo` object.
 
     >>> dt = time(15, 30, tzinfo=get_timezone('America/Los_Angeles'))
     >>> get_timezone_name(dt, locale='en_US')
     u'Pacific Standard Time'
+    >>> get_timezone_name(dt, locale='en_US', return_zone=True)
+    'America/Los_Angeles'
     >>> get_timezone_name(dt, width='short', locale='en_US')
     u'PST'
 
@@ -548,6 +572,8 @@ def get_timezone_name(dt_or_tzinfo=None, width='long', uncommon=False,
                            values are valid: ``'generic'``, ``'daylight'`` and
                            ``'standard'``.
     :param locale: the `Locale` object, or a locale string
+    :param return_zone: True or False. If true then function
+                        returns long time zone ID
     """
     dt, tzinfo = _get_dt_and_tzinfo(dt_or_tzinfo)
     locale = Locale.parse(locale)
@@ -572,7 +598,8 @@ def get_timezone_name(dt_or_tzinfo=None, width='long', uncommon=False,
 
     # Get the canonical time-zone code
     zone = get_global('zone_aliases').get(zone, zone)
-
+    if return_zone:
+        return zone
     info = locale.time_zones.get(zone, {})
     # Try explicitly translated zone names first
     if width in info:
diff --git a/tests/test_dates.py b/tests/test_dates.py
index e93fa401b..0d3fe546e 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -393,12 +393,13 @@ def test_get_time_format():
 def test_get_timezone_gmt():
     dt = datetime(2007, 4, 1, 15, 30)
     assert dates.get_timezone_gmt(dt, locale='en') == u'GMT+00:00'
-
+    assert dates.get_timezone_gmt(dt, locale='en', return_z=True) == 'Z'
+    assert dates.get_timezone_gmt(dt, locale='en', width='iso8601_short') == u'+00'
     tz = timezone('America/Los_Angeles')
     dt = tz.localize(datetime(2007, 4, 1, 15, 30))
     assert dates.get_timezone_gmt(dt, locale='en') == u'GMT-07:00'
     assert dates.get_timezone_gmt(dt, 'short', locale='en') == u'-0700'
-
+    assert dates.get_timezone_gmt(dt, locale='en', width='iso8601_short') == u'-07'
     assert dates.get_timezone_gmt(dt, 'long', locale='fr_FR') == u'UTC-07:00'
 
 
@@ -406,6 +407,11 @@ def test_get_timezone_location():
     tz = timezone('America/St_Johns')
     assert (dates.get_timezone_location(tz, locale='de_DE') ==
             u"Kanada (St. John\u2019s) Zeit")
+    assert (dates.get_timezone_location(tz, locale='en') ==
+            u'Canada (St. John’s) Time')
+    assert (dates.get_timezone_location(tz, locale='en', return_city=True) ==
+            u'St. John’s')
+
     tz = timezone('America/Mexico_City')
     assert (dates.get_timezone_location(tz, locale='de_DE') ==
             u'Mexiko (Mexiko-Stadt) Zeit')
@@ -419,6 +425,8 @@ def test_get_timezone_name():
     dt = time(15, 30, tzinfo=timezone('America/Los_Angeles'))
     assert (dates.get_timezone_name(dt, locale='en_US') ==
             u'Pacific Standard Time')
+    assert (dates.get_timezone_name(dt, locale='en_US', return_zone=True) ==
+            u'America/Los_Angeles')
     assert dates.get_timezone_name(dt, width='short', locale='en_US') == u'PST'
 
     tz = timezone('America/Los_Angeles')

From b7593085f38ccee7211972931c9e53d6eee1ceb3 Mon Sep 17 00:00:00 2001
From: Sachin Paliwal <sachin.pali146@gmail.com>
Date: Fri, 5 Feb 2016 21:17:55 +0530
Subject: [PATCH 203/489] dates: Add iso8601 pattern timezone Format

https://github.com/python-babel/babel/issues/325
---
 babel/dates.py      |  59 +++++++++++++++------
 tests/test_dates.py | 123 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+), 15 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 6d6c36aa8..1af9955a5 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1194,7 +1194,7 @@ def __getitem__(self, name):
             return self.format_frac_seconds(num)
         elif char == 'A':
             return self.format_milliseconds_in_day(num)
-        elif char in ('z', 'Z', 'v', 'V'):
+        elif char in ('z', 'Z', 'v', 'V', 'x', 'X', 'O'):
             return self.format_timezone(char, num)
         else:
             raise KeyError('Unsupported date/time field %r' % char)
@@ -1296,11 +1296,17 @@ def format_milliseconds_in_day(self, num):
         return self.format(msecs, num)
 
     def format_timezone(self, char, num):
-        width = {3: 'short', 4: 'long'}[max(3, num)]
+        width = {3: 'short', 4: 'long', 5: 'iso8601'}[max(3, num)]
         if char == 'z':
             return get_timezone_name(self.value, width, locale=self.locale)
         elif char == 'Z':
+            if num == 5:
+                return get_timezone_gmt(self.value, width, locale=self.locale, return_z=True)
             return get_timezone_gmt(self.value, width, locale=self.locale)
+        elif char == 'O':
+            if num == 4:
+                return get_timezone_gmt(self.value, width, locale=self.locale)
+        # TODO: To add support for O:1
         elif char == 'v':
             return get_timezone_name(self.value.tzinfo, width,
                                      locale=self.locale)
@@ -1308,7 +1314,29 @@ def format_timezone(self, char, num):
             if num == 1:
                 return get_timezone_name(self.value.tzinfo, width,
                                          uncommon=True, locale=self.locale)
+            elif num == 2:
+                return get_timezone_name(self.value.tzinfo, locale=self.locale, return_zone=True)
+            elif num == 3:
+                return get_timezone_location(self.value.tzinfo, locale=self.locale, return_city=True)
             return get_timezone_location(self.value.tzinfo, locale=self.locale)
+        # Included additional elif condition to add support for 'Xx' in timezone format
+        elif char == 'X':
+            if num == 1:
+                return get_timezone_gmt(self.value, width='iso8601_short', locale=self.locale,
+                                        return_z=True)
+            elif num in (2, 4):
+                return get_timezone_gmt(self.value, width='short', locale=self.locale,
+                                        return_z=True)
+            elif num in (3, 5):
+                return get_timezone_gmt(self.value, width='iso8601', locale=self.locale,
+                                        return_z=True)
+        elif char == 'x':
+            if num == 1:
+                return get_timezone_gmt(self.value, width='iso8601_short', locale=self.locale)
+            elif num in (2, 4):
+                return get_timezone_gmt(self.value, width='short', locale=self.locale)
+            elif num in (3, 5):
+                return get_timezone_gmt(self.value, width='iso8601', locale=self.locale)
 
     def format(self, value, length):
         return ('%%0%dd' % length) % value
@@ -1352,24 +1380,25 @@ def get_week_number(self, day_of_period, day_of_week=None):
 
 
 PATTERN_CHARS = {
-    'G': [1, 2, 3, 4, 5],                                           # era
-    'y': None, 'Y': None, 'u': None,                                # year
-    'Q': [1, 2, 3, 4], 'q': [1, 2, 3, 4],                           # quarter
-    'M': [1, 2, 3, 4, 5], 'L': [1, 2, 3, 4, 5],                     # month
-    'w': [1, 2], 'W': [1],                                          # week
-    'd': [1, 2], 'D': [1, 2, 3], 'F': [1], 'g': None,               # day
-    'E': [1, 2, 3, 4, 5], 'e': [1, 2, 3, 4, 5], 'c': [1, 3, 4, 5],  # week day
-    'a': [1],                                                       # period
-    'h': [1, 2], 'H': [1, 2], 'K': [1, 2], 'k': [1, 2],             # hour
-    'm': [1, 2],                                                    # minute
-    's': [1, 2], 'S': None, 'A': None,                              # second
-    'z': [1, 2, 3, 4], 'Z': [1, 2, 3, 4], 'v': [1, 4], 'V': [1, 4]  # zone
+    'G': [1, 2, 3, 4, 5],                                               # era
+    'y': None, 'Y': None, 'u': None,                                    # year
+    'Q': [1, 2, 3, 4], 'q': [1, 2, 3, 4],                               # quarter
+    'M': [1, 2, 3, 4, 5], 'L': [1, 2, 3, 4, 5],                         # month
+    'w': [1, 2], 'W': [1],                                              # week
+    'd': [1, 2], 'D': [1, 2, 3], 'F': [1], 'g': None,                   # day
+    'E': [1, 2, 3, 4, 5], 'e': [1, 2, 3, 4, 5], 'c': [1, 3, 4, 5],      # week day
+    'a': [1],                                                           # period
+    'h': [1, 2], 'H': [1, 2], 'K': [1, 2], 'k': [1, 2],                 # hour
+    'm': [1, 2],                                                        # minute
+    's': [1, 2], 'S': None, 'A': None,                                  # second
+    'z': [1, 2, 3, 4], 'Z': [1, 2, 3, 4, 5], 'O': [1, 4], 'v': [1, 4],  # zone
+    'V': [1, 2, 3, 4], 'x': [1, 2, 3, 4, 5], 'X': [1, 2, 3, 4, 5]       # zone
 }
 
 #: The pattern characters declared in the Date Field Symbol Table
 #: (http://www.unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table)
 #: in order of decreasing magnitude.
-PATTERN_CHAR_ORDER = "GyYuUQqMLlwWdDFgEecabBChHKkjJmsSAzZvV"
+PATTERN_CHAR_ORDER = "GyYuUQqMLlwWdDFgEecabBChHKkjJmsSAzZOvVXx"
 
 _pattern_cache = {}
 
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 0d3fe546e..5155c0cca 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -250,6 +250,129 @@ def test_with_float(self):
         formatted_string = dates.format_datetime(epoch, format='long', locale='en_US')
         self.assertEqual(u'April 1, 2012 at 3:30:29 PM +0000', formatted_string)
 
+    def test_timezone_formats(self):
+        dt = datetime(2016, 1, 13, 7, 8, 35)
+        tz = dates.get_timezone('America/Los_Angeles')
+        dt = tz.localize(dt)
+        formatted_string = dates.format_datetime(dt, 'z', locale='en')
+        self.assertEqual(u'PST', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'zz', locale='en')
+        self.assertEqual(u'PST', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'zzz', locale='en')
+        self.assertEqual(u'PST', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'zzzz', locale='en')
+        self.assertEqual(u'Pacific Standard Time', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'Z', locale='en')
+        self.assertEqual(u'-0800', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'ZZ', locale='en')
+        self.assertEqual(u'-0800', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'ZZZ', locale='en')
+        self.assertEqual(u'-0800', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'ZZZZ', locale='en')
+        self.assertEqual(u'GMT-08:00', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'ZZZZZ', locale='en')
+        self.assertEqual(u'-08:00', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'OOOO', locale='en')
+        self.assertEqual(u'GMT-08:00', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'VV', locale='en')
+        self.assertEqual(u'America/Los_Angeles', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'VVV', locale='en')
+        self.assertEqual(u'Los Angeles', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'X', locale='en')
+        self.assertEqual(u'-08', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XX', locale='en')
+        self.assertEqual(u'-0800', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XXX', locale='en')
+        self.assertEqual(u'-08:00', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XXXX', locale='en')
+        self.assertEqual(u'-0800', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XXXXX', locale='en')
+        self.assertEqual(u'-08:00', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'x', locale='en')
+        self.assertEqual(u'-08', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xx', locale='en')
+        self.assertEqual(u'-0800', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xxx', locale='en')
+        self.assertEqual(u'-08:00', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xxxx', locale='en')
+        self.assertEqual(u'-0800', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xxxxx', locale='en')
+        self.assertEqual(u'-08:00', formatted_string)
+        dt = datetime(2016, 1, 13, 7, 8, 35)
+        tz = dates.get_timezone('UTC')
+        dt = tz.localize(dt)
+        formatted_string = dates.format_datetime(dt, 'Z', locale='en')
+        self.assertEqual(u'+0000', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'ZZ', locale='en')
+        self.assertEqual(u'+0000', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'ZZZ', locale='en')
+        self.assertEqual(u'+0000', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'ZZZZ', locale='en')
+        self.assertEqual(u'GMT+00:00', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'ZZZZZ', locale='en')
+        self.assertEqual(u'Z', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'OOOO', locale='en')
+        self.assertEqual(u'GMT+00:00', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'VV', locale='en')
+        self.assertEqual(u'Etc/GMT', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'VVV', locale='en')
+        self.assertEqual(u'GMT', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'X', locale='en')
+        self.assertEqual(u'Z', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XX', locale='en')
+        self.assertEqual(u'Z', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XXX', locale='en')
+        self.assertEqual(u'Z', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XXXX', locale='en')
+        self.assertEqual(u'Z', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XXXXX', locale='en')
+        self.assertEqual(u'Z', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'x', locale='en')
+        self.assertEqual(u'+00', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xx', locale='en')
+        self.assertEqual(u'+0000', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xxx', locale='en')
+        self.assertEqual(u'+00:00', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xxxx', locale='en')
+        self.assertEqual(u'+0000', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xxxxx', locale='en')
+        self.assertEqual(u'+00:00', formatted_string)
+        dt = datetime(2016, 1, 13, 7, 8, 35)
+        tz = dates.get_timezone('Asia/Kolkata')
+        dt = tz.localize(dt)
+        formatted_string = dates.format_datetime(dt, 'zzzz', locale='en')
+        self.assertEqual(u'India Standard Time', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'ZZZZ', locale='en')
+        self.assertEqual(u'GMT+05:30', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'ZZZZZ', locale='en')
+        self.assertEqual(u'+05:30', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'OOOO', locale='en')
+        self.assertEqual(u'GMT+05:30', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'VV', locale='en')
+        self.assertEqual(u'Asia/Calcutta', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'VVV', locale='en')
+        self.assertEqual(u'Kolkata', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'X', locale='en')
+        self.assertEqual(u'+0530', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XX', locale='en')
+        self.assertEqual(u'+0530', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XXX', locale='en')
+        self.assertEqual(u'+05:30', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XXXX', locale='en')
+        self.assertEqual(u'+0530', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'XXXXX', locale='en')
+        self.assertEqual(u'+05:30', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'x', locale='en')
+        self.assertEqual(u'+0530', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xx', locale='en')
+        self.assertEqual(u'+0530', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xxx', locale='en')
+        self.assertEqual(u'+05:30', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xxxx', locale='en')
+        self.assertEqual(u'+0530', formatted_string)
+        formatted_string = dates.format_datetime(dt, 'xxxxx', locale='en')
+        self.assertEqual(u'+05:30', formatted_string)
+
 
 class FormatTimeTestCase(unittest.TestCase):
 

From bda29a7089c3a21e9e49887f54cd73e38f6445d5 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 18 Jan 2016 16:54:23 +0200
Subject: [PATCH 204/489] JavaScript: modernize lexer slightly

---
 babel/messages/jslexer.py | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index 22c6e1f9c..282d294f3 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -9,27 +9,34 @@
     :copyright: (c) 2013 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
-
-from operator import itemgetter
+from collections import namedtuple
 import re
 from babel._compat import unichr
 
-operators = [
+operators = sorted([
     '+', '-', '*', '%', '!=', '==', '<', '>', '<=', '>=', '=',
     '+=', '-=', '*=', '%=', '<<', '>>', '>>>', '<<=', '>>=',
     '>>>=', '&', '&=', '|', '|=', '&&', '||', '^', '^=', '(', ')',
     '[', ']', '{', '}', '!', '--', '++', '~', ',', ';', '.', ':'
-]
-operators.sort(key=lambda a: -len(a))
+], key=len, reverse=True)
 
 escapes = {'b': '\b', 'f': '\f', 'n': '\n', 'r': '\r', 't': '\t'}
 
+division_re = re.compile(r'/=?')
+regex_re = re.compile(r'/(?:[^/\\]*(?:\\.[^/\\]*)*)/[a-zA-Z]*(?s)')
+line_re = re.compile(r'(\r\n|\n|\r)')
+line_join_re = re.compile(r'\\' + line_re.pattern)
+uni_escape_re = re.compile(r'[a-fA-F0-9]{1,4}')
+name_re = re.compile(r'(\$+\w*|[^\W\d]\w*)(?u)')
+
+Token = namedtuple('Token', 'type value lineno')
+
 rules = [
     (None, re.compile(r'\s+(?u)')),
     (None, re.compile(r'<!--.*')),
     ('linecomment', re.compile(r'//.*')),
     ('multilinecomment', re.compile(r'/\*.*?\*/(?us)')),
-    ('name', re.compile(r'(\$+\w*|[^\W\d]\w*)(?u)')),
+    ('name', name_re),
     ('number', re.compile(r'''(?x)(
         (?:0|[1-9]\d*)
         (\.\d+)?
@@ -43,24 +50,6 @@
     )'''))
 ]
 
-division_re = re.compile(r'/=?')
-regex_re = re.compile(r'/(?:[^/\\]*(?:\\.[^/\\]*)*)/[a-zA-Z]*(?s)')
-line_re = re.compile(r'(\r\n|\n|\r)')
-line_join_re = re.compile(r'\\' + line_re.pattern)
-uni_escape_re = re.compile(r'[a-fA-F0-9]{1,4}')
-
-
-class Token(tuple):
-    """Represents a token as returned by `tokenize`."""
-    __slots__ = ()
-
-    def __new__(cls, type, value, lineno):
-        return tuple.__new__(cls, (type, value, lineno))
-
-    type = property(itemgetter(0))
-    value = property(itemgetter(1))
-    lineno = property(itemgetter(2))
-
 
 def indicates_division(token):
     """A helper function that helps the tokenizer to decide if the current

From d4cafa495097d86ae9ff46c8be9273274a7b5987 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 30 Dec 2015 19:29:48 +0200
Subject: [PATCH 205/489] JavaScript: Move extraction test cases into separate
 file

And remove unittest boilerplate while at it
---
 tests/messages/test_extract.py    | 91 ----------------------------
 tests/messages/test_js_extract.py | 99 +++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 91 deletions(-)
 create mode 100644 tests/messages/test_js_extract.py

diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 66c8cd908..2eee88ed9 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -410,97 +410,6 @@ def test_extract_strip_comment_tags(self):
                           u'a prefix too'], messages[1][2])
 
 
-class ExtractJavaScriptTestCase(unittest.TestCase):
-
-    def test_simple_extract(self):
-        buf = BytesIO(b"""\
-msg1 = _('simple')
-msg2 = gettext('simple')
-msg3 = ngettext('s', 'p', 42)
-        """)
-        messages = \
-            list(extract.extract('javascript', buf, extract.DEFAULT_KEYWORDS,
-                                 [], {}))
-
-        self.assertEqual([(1, 'simple', [], None),
-                          (2, 'simple', [], None),
-                          (3, ('s', 'p'), [], None)], messages)
-
-    def test_various_calls(self):
-        buf = BytesIO(b"""\
-msg1 = _(i18n_arg.replace(/"/, '"'))
-msg2 = ungettext(i18n_arg.replace(/"/, '"'), multi_arg.replace(/"/, '"'), 2)
-msg3 = ungettext("Babel", multi_arg.replace(/"/, '"'), 2)
-msg4 = ungettext(i18n_arg.replace(/"/, '"'), "Babels", 2)
-msg5 = ungettext('bunny', 'bunnies', parseInt(Math.random() * 2 + 1))
-msg6 = ungettext(arg0, 'bunnies', rparseInt(Math.random() * 2 + 1))
-msg7 = _(hello.there)
-msg8 = gettext('Rabbit')
-msg9 = dgettext('wiki', model.addPage())
-msg10 = dngettext(domain, 'Page', 'Pages', 3)
-""")
-        messages = \
-            list(extract.extract('javascript', buf, extract.DEFAULT_KEYWORDS, [],
-                                 {}))
-        self.assertEqual([(5, (u'bunny', u'bunnies'), [], None),
-                          (8, u'Rabbit', [], None),
-                          (10, (u'Page', u'Pages'), [], None)], messages)
-
-    def test_message_with_line_comment(self):
-        buf = BytesIO(u"""\
-// NOTE: hello
-msg = _('Bonjour à tous')
-""".encode('utf-8'))
-        messages = list(extract.extract_javascript(buf, ('_',), ['NOTE:'], {}))
-        self.assertEqual(u'Bonjour à tous', messages[0][2])
-        self.assertEqual([u'NOTE: hello'], messages[0][3])
-
-    def test_message_with_multiline_comment(self):
-        buf = BytesIO(u"""\
-/* NOTE: hello
-   and bonjour
-     and servus */
-msg = _('Bonjour à tous')
-""".encode('utf-8'))
-        messages = list(extract.extract_javascript(buf, ('_',), ['NOTE:'], {}))
-        self.assertEqual(u'Bonjour à tous', messages[0][2])
-        self.assertEqual([u'NOTE: hello', 'and bonjour', '  and servus'], messages[0][3])
-
-    def test_ignore_function_definitions(self):
-        buf = BytesIO(b"""\
-function gettext(value) {
-    return translations[language][value] || value;
-}""")
-
-        messages = list(extract.extract_javascript(buf, ('gettext',), [], {}))
-        self.assertEqual(messages, [])
-
-    def test_misplaced_comments(self):
-        buf = BytesIO(b"""\
-/* NOTE: this won't show up */
-foo()
-
-/* NOTE: this will */
-msg = _('Something')
-
-// NOTE: this will show up
-// too.
-msg = _('Something else')
-
-// NOTE: but this won't
-bar()
-
-_('no comment here')
-""")
-        messages = list(extract.extract_javascript(buf, ('_',), ['NOTE:'], {}))
-        self.assertEqual(u'Something', messages[0][2])
-        self.assertEqual([u'NOTE: this will'], messages[0][3])
-        self.assertEqual(u'Something else', messages[1][2])
-        self.assertEqual([u'NOTE: this will show up', 'too.'], messages[1][3])
-        self.assertEqual(u'no comment here', messages[2][2])
-        self.assertEqual([], messages[2][3])
-
-
 class ExtractTestCase(unittest.TestCase):
 
     def test_invalid_filter(self):
diff --git a/tests/messages/test_js_extract.py b/tests/messages/test_js_extract.py
new file mode 100644
index 000000000..299240e21
--- /dev/null
+++ b/tests/messages/test_js_extract.py
@@ -0,0 +1,99 @@
+# -- encoding: UTF-8 --
+from babel._compat import BytesIO
+from babel.messages import extract
+
+
+def test_simple_extract():
+    buf = BytesIO(b"""\
+msg1 = _('simple')
+msg2 = gettext('simple')
+msg3 = ngettext('s', 'p', 42)
+    """)
+    messages = \
+        list(extract.extract('javascript', buf, extract.DEFAULT_KEYWORDS,
+                             [], {}))
+
+    assert messages == [(1, 'simple', [], None),
+                        (2, 'simple', [], None),
+                        (3, ('s', 'p'), [], None)]
+
+
+def test_various_calls():
+    buf = BytesIO(b"""\
+msg1 = _(i18n_arg.replace(/"/, '"'))
+msg2 = ungettext(i18n_arg.replace(/"/, '"'), multi_arg.replace(/"/, '"'), 2)
+msg3 = ungettext("Babel", multi_arg.replace(/"/, '"'), 2)
+msg4 = ungettext(i18n_arg.replace(/"/, '"'), "Babels", 2)
+msg5 = ungettext('bunny', 'bunnies', parseInt(Math.random() * 2 + 1))
+msg6 = ungettext(arg0, 'bunnies', rparseInt(Math.random() * 2 + 1))
+msg7 = _(hello.there)
+msg8 = gettext('Rabbit')
+msg9 = dgettext('wiki', model.addPage())
+msg10 = dngettext(domain, 'Page', 'Pages', 3)
+""")
+    messages = \
+        list(extract.extract('javascript', buf, extract.DEFAULT_KEYWORDS, [],
+                             {}))
+    assert messages == [
+        (5, (u'bunny', u'bunnies'), [], None),
+        (8, u'Rabbit', [], None),
+        (10, (u'Page', u'Pages'), [], None)
+    ]
+
+
+def test_message_with_line_comment():
+    buf = BytesIO(u"""\
+// NOTE: hello
+msg = _('Bonjour à tous')
+""".encode('utf-8'))
+    messages = list(extract.extract_javascript(buf, ('_',), ['NOTE:'], {}))
+    assert messages[0][2] == u'Bonjour à tous'
+    assert messages[0][3] == [u'NOTE: hello']
+
+
+def test_message_with_multiline_comment():
+    buf = BytesIO(u"""\
+/* NOTE: hello
+and bonjour
+  and servus */
+msg = _('Bonjour à tous')
+""".encode('utf-8'))
+    messages = list(extract.extract_javascript(buf, ('_',), ['NOTE:'], {}))
+    assert messages[0][2] == u'Bonjour à tous'
+    assert messages[0][3] == [u'NOTE: hello', 'and bonjour', '  and servus']
+
+
+def test_ignore_function_definitions():
+    buf = BytesIO(b"""\
+function gettext(value) {
+return translations[language][value] || value;
+}""")
+
+    messages = list(extract.extract_javascript(buf, ('gettext',), [], {}))
+    assert not messages
+
+
+def test_misplaced_comments():
+    buf = BytesIO(b"""\
+/* NOTE: this won't show up */
+foo()
+
+/* NOTE: this will */
+msg = _('Something')
+
+// NOTE: this will show up
+// too.
+msg = _('Something else')
+
+// NOTE: but this won't
+bar()
+
+_('no comment here')
+""")
+    messages = list(extract.extract_javascript(buf, ('_',), ['NOTE:'], {}))
+    assert messages[0][2] == u'Something'
+    assert messages[0][3] == [u'NOTE: this will']
+    assert messages[1][2] == u'Something else'
+    assert messages[1][3] == [u'NOTE: this will show up', 'too.']
+    assert messages[2][2] == u'no comment here'
+    assert messages[2][3] == []

From 8fee76cf39ee4192da534fbafde6ef2e90420429 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 18 Jan 2016 17:09:08 +0200
Subject: [PATCH 206/489] JavaScript: Add JSX/E4X tag lexing

Fixes #280
---
 babel/messages/extract.py         |  4 +++-
 babel/messages/jslexer.py         | 25 ++++++++++++++++++++++---
 tests/messages/test_js_extract.py | 25 +++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index c2dcd5b99..153fe5116 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -506,6 +506,8 @@ def extract_javascript(fileobj, keywords, comment_tags, options):
     :param comment_tags: a list of translator tags to search for and include
                          in the results
     :param options: a dictionary of additional options (optional)
+                    Supported options are:
+                    * `jsx` -- set to false to disable JSX/E4X support.
     """
     from babel.messages.jslexer import tokenize, unquote_string
     funcname = message_lineno = None
@@ -517,7 +519,7 @@ def extract_javascript(fileobj, keywords, comment_tags, options):
     last_token = None
     call_stack = -1
 
-    for token in tokenize(fileobj.read().decode(encoding)):
+    for token in tokenize(fileobj.read().decode(encoding), jsx=options.get("jsx", True)):
         if token.type == 'operator' and token.value == '(':
             if funcname:
                 message_lineno = token.lineno
diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index 282d294f3..32500676a 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -31,7 +31,7 @@
 
 Token = namedtuple('Token', 'type value lineno')
 
-rules = [
+_rules = [
     (None, re.compile(r'\s+(?u)')),
     (None, re.compile(r'<!--.*')),
     ('linecomment', re.compile(r'//.*')),
@@ -43,6 +43,7 @@
         ([eE][-+]?\d+)? |
         (0x[a-fA-F0-9]+)
     )''')),
+    ('jsx_tag', re.compile(r'<(?:/?)\w+.+?>', re.I)),  # May be mangled in `get_rules`
     ('operator', re.compile(r'(%s)' % '|'.join(map(re.escape, operators)))),
     ('string', re.compile(r'''(?xs)(
         '(?:[^'\\]*(?:\\.[^'\\]*)*)'  |
@@ -51,6 +52,20 @@
 ]
 
 
+def get_rules(jsx):
+    """
+    Get a tokenization rule list given the passed syntax options.
+
+    Internal to this module.
+    """
+    rules = []
+    for token_type, rule in _rules:
+        if not jsx and token_type and 'jsx' in token_type:
+            continue
+        rules.append((token_type, rule))
+    return rules
+
+
 def indicates_division(token):
     """A helper function that helps the tokenizer to decide if the current
     token may be followed by a division operator.
@@ -116,13 +131,17 @@ def unquote_string(string):
     return u''.join(result)
 
 
-def tokenize(source):
-    """Tokenize a JavaScript source.  Returns a generator of tokens.
+def tokenize(source, jsx=True):
+    """
+    Tokenize JavaScript/JSX source.  Returns a generator of tokens.
+
+    :param jsx: Enable (limited) JSX parsing.
     """
     may_divide = False
     pos = 0
     lineno = 1
     end = len(source)
+    rules = get_rules(jsx=jsx)
 
     while pos < end:
         # handle regular rules first
diff --git a/tests/messages/test_js_extract.py b/tests/messages/test_js_extract.py
index 299240e21..ae6d277b3 100644
--- a/tests/messages/test_js_extract.py
+++ b/tests/messages/test_js_extract.py
@@ -1,4 +1,5 @@
 # -- encoding: UTF-8 --
+import pytest
 from babel._compat import BytesIO
 from babel.messages import extract
 
@@ -97,3 +98,27 @@ def test_misplaced_comments():
     assert messages[1][3] == [u'NOTE: this will show up', 'too.']
     assert messages[2][2] == u'no comment here'
     assert messages[2][3] == []
+
+
+JSX_SOURCE = b"""
+class Foo {
+    render() {
+        const value = gettext("hello");
+        return (
+            <option value="val1">{ i18n._('String1') }</option>
+            <option value="val2">{ i18n._('String 2') }</option>
+            <option value="val3">{ i18n._('String 3') }</option>
+        );
+    }
+"""
+EXPECTED_JSX_MESSAGES = ["hello", "String1", "String 2", "String 3"]
+
+
+@pytest.mark.parametrize("jsx_enabled", (False, True))
+def test_jsx_extraction(jsx_enabled):
+    buf = BytesIO(JSX_SOURCE)
+    messages = [m[2] for m in extract.extract_javascript(buf, ('_', 'gettext'), [], {"jsx": jsx_enabled})]
+    if jsx_enabled:
+        assert messages == EXPECTED_JSX_MESSAGES
+    else:
+        assert messages != EXPECTED_JSX_MESSAGES

From d0c3853728cf242cfd1b637d17a685a4f1864d73 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 18 Jan 2016 17:09:57 +0200
Subject: [PATCH 207/489] JavaScript: Support dotted names as keywords

Fixes #148
---
 babel/messages/extract.py         |  7 ++++++-
 babel/messages/jslexer.py         | 15 +++++++++++----
 tests/messages/test_js_extract.py |  9 +++++++++
 tests/messages/test_jslexer.py    | 19 +++++++++++++++++++
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 153fe5116..ee90afb76 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -518,8 +518,13 @@ def extract_javascript(fileobj, keywords, comment_tags, options):
     encoding = options.get('encoding', 'utf-8')
     last_token = None
     call_stack = -1
+    dotted = any('.' in kw for kw in keywords)
 
-    for token in tokenize(fileobj.read().decode(encoding), jsx=options.get("jsx", True)):
+    for token in tokenize(
+        fileobj.read().decode(encoding),
+        jsx=options.get("jsx", True),
+        dotted=dotted
+    ):
         if token.type == 'operator' and token.value == '(':
             if funcname:
                 message_lineno = token.lineno
diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index 32500676a..e6310cf3f 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -22,12 +22,13 @@
 
 escapes = {'b': '\b', 'f': '\f', 'n': '\n', 'r': '\r', 't': '\t'}
 
+name_re = re.compile(r'[\w$_][\w\d$_]*', re.UNICODE)
+dotted_name_re = re.compile(r'[\w$_][\w\d$_.]*[\w\d$_.]', re.UNICODE)
 division_re = re.compile(r'/=?')
 regex_re = re.compile(r'/(?:[^/\\]*(?:\\.[^/\\]*)*)/[a-zA-Z]*(?s)')
 line_re = re.compile(r'(\r\n|\n|\r)')
 line_join_re = re.compile(r'\\' + line_re.pattern)
 uni_escape_re = re.compile(r'[a-fA-F0-9]{1,4}')
-name_re = re.compile(r'(\$+\w*|[^\W\d]\w*)(?u)')
 
 Token = namedtuple('Token', 'type value lineno')
 
@@ -36,6 +37,7 @@
     (None, re.compile(r'<!--.*')),
     ('linecomment', re.compile(r'//.*')),
     ('multilinecomment', re.compile(r'/\*.*?\*/(?us)')),
+    ('dotted_name', dotted_name_re),
     ('name', name_re),
     ('number', re.compile(r'''(?x)(
         (?:0|[1-9]\d*)
@@ -52,7 +54,7 @@
 ]
 
 
-def get_rules(jsx):
+def get_rules(jsx, dotted):
     """
     Get a tokenization rule list given the passed syntax options.
 
@@ -62,6 +64,10 @@ def get_rules(jsx):
     for token_type, rule in _rules:
         if not jsx and token_type and 'jsx' in token_type:
             continue
+        if token_type == 'dotted_name':
+            if not dotted:
+                continue
+            token_type = 'name'
         rules.append((token_type, rule))
     return rules
 
@@ -131,17 +137,18 @@ def unquote_string(string):
     return u''.join(result)
 
 
-def tokenize(source, jsx=True):
+def tokenize(source, jsx=True, dotted=True):
     """
     Tokenize JavaScript/JSX source.  Returns a generator of tokens.
 
     :param jsx: Enable (limited) JSX parsing.
+    :param dotted: Read dotted names as single name token.
     """
     may_divide = False
     pos = 0
     lineno = 1
     end = len(source)
-    rules = get_rules(jsx=jsx)
+    rules = get_rules(jsx=jsx, dotted=dotted)
 
     while pos < end:
         # handle regular rules first
diff --git a/tests/messages/test_js_extract.py b/tests/messages/test_js_extract.py
index ae6d277b3..203bf4cba 100644
--- a/tests/messages/test_js_extract.py
+++ b/tests/messages/test_js_extract.py
@@ -122,3 +122,12 @@ def test_jsx_extraction(jsx_enabled):
         assert messages == EXPECTED_JSX_MESSAGES
     else:
         assert messages != EXPECTED_JSX_MESSAGES
+
+
+def test_dotted_keyword_extract():
+    buf = BytesIO(b"msg1 = com.corporate.i18n.formatMessage('Insert coin to continue')")
+    messages = list(
+        extract.extract('javascript', buf, {"com.corporate.i18n.formatMessage": None}, [], {})
+    )
+
+    assert messages == [(1, 'Insert coin to continue', [], None)]
diff --git a/tests/messages/test_jslexer.py b/tests/messages/test_jslexer.py
index 4ffb4a9e4..7277104f2 100644
--- a/tests/messages/test_jslexer.py
+++ b/tests/messages/test_jslexer.py
@@ -6,3 +6,22 @@
 def test_unquote():
     assert jslexer.unquote_string('""') == ''
     assert jslexer.unquote_string(r'"h\u00ebllo"') == u"hëllo"
+
+
+def test_dollar_in_identifier():
+    assert list(jslexer.tokenize('dollar$dollar')) == [('name', 'dollar$dollar', 1)]
+
+
+def test_dotted_name():
+    assert list(jslexer.tokenize("foo.bar(quux)", dotted=True)) == [
+        ('name', 'foo.bar', 1),
+        ('operator', '(', 1),
+        ('name', 'quux', 1),
+        ('operator', ')', 1)
+    ]
+
+
+def test_dotted_name_end():
+    assert list(jslexer.tokenize("foo.bar", dotted=True)) == [
+        ('name', 'foo.bar', 1),
+    ]

From f061cc16415dc0399f7fcea62012617885ab495b Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 18 Jan 2016 17:35:05 +0200
Subject: [PATCH 208/489] JavaScript: add basic support for template strings

Refs #329
---
 babel/messages/extract.py         |  5 ++++-
 babel/messages/jslexer.py         | 14 +++++++++-----
 tests/messages/test_js_extract.py |  9 +++++++++
 tests/messages/test_jslexer.py    |  7 +++++++
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index ee90afb76..2e5053759 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -508,6 +508,8 @@ def extract_javascript(fileobj, keywords, comment_tags, options):
     :param options: a dictionary of additional options (optional)
                     Supported options are:
                     * `jsx` -- set to false to disable JSX/E4X support.
+                    * `template_string` -- set to false to disable ES6
+                                           template string support.
     """
     from babel.messages.jslexer import tokenize, unquote_string
     funcname = message_lineno = None
@@ -523,6 +525,7 @@ def extract_javascript(fileobj, keywords, comment_tags, options):
     for token in tokenize(
         fileobj.read().decode(encoding),
         jsx=options.get("jsx", True),
+        template_string=options.get("template_string", True),
         dotted=dotted
     ):
         if token.type == 'operator' and token.value == '(':
@@ -584,7 +587,7 @@ def extract_javascript(fileobj, keywords, comment_tags, options):
                 messages = []
                 call_stack = -1
 
-            elif token.type == 'string':
+            elif token.type in ('string', 'template_string'):
                 new_value = unquote_string(token.value)
                 if concatenate_next:
                     last_argument = (last_argument or '') + new_value
diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index e6310cf3f..aed39f334 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -47,6 +47,7 @@
     )''')),
     ('jsx_tag', re.compile(r'<(?:/?)\w+.+?>', re.I)),  # May be mangled in `get_rules`
     ('operator', re.compile(r'(%s)' % '|'.join(map(re.escape, operators)))),
+    ('template_string', re.compile(r'''`(?:[^`\\]*(?:\\.[^`\\]*)*)`''', re.UNICODE)),
     ('string', re.compile(r'''(?xs)(
         '(?:[^'\\]*(?:\\.[^'\\]*)*)'  |
         "(?:[^"\\]*(?:\\.[^"\\]*)*)"
@@ -54,7 +55,7 @@
 ]
 
 
-def get_rules(jsx, dotted):
+def get_rules(jsx, dotted, template_string):
     """
     Get a tokenization rule list given the passed syntax options.
 
@@ -64,6 +65,8 @@ def get_rules(jsx, dotted):
     for token_type, rule in _rules:
         if not jsx and token_type and 'jsx' in token_type:
             continue
+        if not template_string and token_type == 'template_string':
+            continue
         if token_type == 'dotted_name':
             if not dotted:
                 continue
@@ -83,9 +86,9 @@ def indicates_division(token):
 
 def unquote_string(string):
     """Unquote a string with JavaScript rules.  The string has to start with
-    string delimiters (``'`` or ``"``.)
+    string delimiters (``'``, ``"`` or the back-tick/grave accent (for template strings).)
     """
-    assert string and string[0] == string[-1] and string[0] in '"\'', \
+    assert string and string[0] == string[-1] and string[0] in '"\'`', \
         'string provided is not properly delimited'
     string = line_join_re.sub('\\1', string[1:-1])
     result = []
@@ -137,18 +140,19 @@ def unquote_string(string):
     return u''.join(result)
 
 
-def tokenize(source, jsx=True, dotted=True):
+def tokenize(source, jsx=True, dotted=True, template_string=True):
     """
     Tokenize JavaScript/JSX source.  Returns a generator of tokens.
 
     :param jsx: Enable (limited) JSX parsing.
     :param dotted: Read dotted names as single name token.
+    :param template_string: Support ES6 template strings
     """
     may_divide = False
     pos = 0
     lineno = 1
     end = len(source)
-    rules = get_rules(jsx=jsx, dotted=dotted)
+    rules = get_rules(jsx=jsx, dotted=dotted, template_string=template_string)
 
     while pos < end:
         # handle regular rules first
diff --git a/tests/messages/test_js_extract.py b/tests/messages/test_js_extract.py
index 203bf4cba..f81931900 100644
--- a/tests/messages/test_js_extract.py
+++ b/tests/messages/test_js_extract.py
@@ -131,3 +131,12 @@ def test_dotted_keyword_extract():
     )
 
     assert messages == [(1, 'Insert coin to continue', [], None)]
+
+
+def test_template_string_standard_usage():
+    buf = BytesIO(b"msg1 = gettext(`Very template, wow`)")
+    messages = list(
+        extract.extract('javascript', buf, {"gettext": None}, [], {})
+    )
+
+    assert messages == [(1, 'Very template, wow', [], None)]
diff --git a/tests/messages/test_jslexer.py b/tests/messages/test_jslexer.py
index 7277104f2..84221a1d2 100644
--- a/tests/messages/test_jslexer.py
+++ b/tests/messages/test_jslexer.py
@@ -25,3 +25,10 @@ def test_dotted_name_end():
     assert list(jslexer.tokenize("foo.bar", dotted=True)) == [
         ('name', 'foo.bar', 1),
     ]
+
+
+def test_template_string():
+    assert list(jslexer.tokenize("gettext `foo\"bar\"p`", template_string=True)) == [
+        ('name', 'gettext', 1),
+        ('template_string', '`foo"bar"p`', 1)
+    ]

From 5b09b64982452bea56da65674700d0928ddfecc6 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 18 Jan 2016 19:07:17 +0200
Subject: [PATCH 209/489] JavaScript: support tags as keywords for template
 strings

Refs #329
---
 babel/messages/extract.py         | 12 +++++++++++-
 tests/messages/test_js_extract.py |  9 +++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 2e5053759..3706df84d 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -511,7 +511,7 @@ def extract_javascript(fileobj, keywords, comment_tags, options):
                     * `template_string` -- set to false to disable ES6
                                            template string support.
     """
-    from babel.messages.jslexer import tokenize, unquote_string
+    from babel.messages.jslexer import Token, tokenize, unquote_string
     funcname = message_lineno = None
     messages = []
     last_argument = None
@@ -528,6 +528,16 @@ def extract_javascript(fileobj, keywords, comment_tags, options):
         template_string=options.get("template_string", True),
         dotted=dotted
     ):
+        if (  # Turn keyword`foo` expressions into keyword("foo") calls:
+            funcname and  # have a keyword...
+            (last_token and last_token.type == 'name') and  # we've seen nothing after the keyword...
+            token.type == 'template_string'  # this is a template string
+        ):
+            message_lineno = token.lineno
+            messages = [unquote_string(token.value)]
+            call_stack = 0
+            token = Token('operator', ')', token.lineno)
+
         if token.type == 'operator' and token.value == '(':
             if funcname:
                 message_lineno = token.lineno
diff --git a/tests/messages/test_js_extract.py b/tests/messages/test_js_extract.py
index f81931900..35322ea16 100644
--- a/tests/messages/test_js_extract.py
+++ b/tests/messages/test_js_extract.py
@@ -140,3 +140,12 @@ def test_template_string_standard_usage():
     )
 
     assert messages == [(1, 'Very template, wow', [], None)]
+
+
+def test_template_string_tag_usage():
+    buf = BytesIO(b"function() { if(foo) msg1 = i18n`Tag template, wow`; }")
+    messages = list(
+        extract.extract('javascript', buf, {"i18n": None}, [], {})
+    )
+
+    assert messages == [(1, 'Tag template, wow', [], None)]

From 7792cb120ec14be388944f37e00f2e8be045a327 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 7 Feb 2016 15:11:43 +0200
Subject: [PATCH 210/489] Travis: Add pypy3/linux configuration

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 29eedd43a..0a5f75c1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,8 @@ matrix:
       - CDECIMAL=m3-cdecimal
     - os: linux
       python: pypy
+    - os: linux
+      python: pypy3
     - os: linux
       python: 3.3
     - os: linux

From e3d3413baa76e3fe30e555b239e107e7bcf4f2de Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 7 Feb 2016 15:12:33 +0200
Subject: [PATCH 211/489] setup: Don't explicitly check for supported versions

With pypy3 advertising itself as py3.2, but still behaving like py3.3,
the check started to become awkward.  Plus, it seems to be nicer to
ask for forgiveness rather than permission.
---
 setup.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index 7e70a0320..7f99c2821 100755
--- a/setup.py
+++ b/setup.py
@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
 
-import sys
-if sys.version_info < (2, 6) or (3,) <= sys.version_info < (3, 3):
-    print("Babel requires Python 2.6, 2.7 or 3.3+")
-    sys.exit(1)
-
-
 import os
 import subprocess
+import sys
+
 from setuptools import setup
 
-from babel import __version__
+try:
+    from babel import __version__
+except SyntaxError as exc:
+    sys.stderr.write("Unable to import Babel (%s). Are you running a supported version of Python?\n" % exc)
+    sys.exit(1)
+
 
 sys.path.append(os.path.join('doc', 'common'))
 try:

From b02eab148a243f82d71daaffd4e0a4dbae88b608 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 7 Feb 2016 15:13:21 +0200
Subject: [PATCH 212/489] setup: Remove long-obsolete build_doc/test_doc
 commands

---
 setup.py | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/setup.py b/setup.py
index 7f99c2821..222c97ebe 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import os
 import subprocess
 import sys
+from distutils.cmd import Command
 
 from setuptools import setup
 
@@ -13,16 +13,6 @@
     sys.exit(1)
 
 
-sys.path.append(os.path.join('doc', 'common'))
-try:
-    from doctools import build_doc, test_doc
-except ImportError:
-    build_doc = test_doc = None
-
-
-from distutils.cmd import Command
-
-
 class import_cldr(Command):
     description = 'imports and converts the CLDR data'
     user_options = []
@@ -73,8 +63,7 @@ def run(self):
         'pytz>=0a',
     ],
 
-    cmdclass={'build_doc': build_doc, 'test_doc': test_doc,
-              'import_cldr': import_cldr},
+    cmdclass={'import_cldr': import_cldr},
 
     zip_safe=False,
 

From 6a386accc5595500820a99e083f827bfd7bfb106 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 7 Feb 2016 15:14:57 +0200
Subject: [PATCH 213/489] setup: Use `subprocess.check_call()`

It's available since Python 2.5, so it's safe for our use.
---
 setup.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 222c97ebe..73cc0c49b 100755
--- a/setup.py
+++ b/setup.py
@@ -24,8 +24,7 @@ def finalize_options(self):
         pass
 
     def run(self):
-        c = subprocess.Popen([sys.executable, 'scripts/download_import_cldr.py'])
-        c.wait()
+        subprocess.check_call([sys.executable, 'scripts/download_import_cldr.py'])
 
 
 setup(

From e03cd7d0ea8874105c13c86ce22c3123bb7ea375 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 7 Feb 2016 19:02:04 +0200
Subject: [PATCH 214/489] setup/PyPI: Add PyPy classifier

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 73cc0c49b..85c8b6d19 100755
--- a/setup.py
+++ b/setup.py
@@ -51,6 +51,7 @@ def run(self):
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     packages=['babel', 'babel.messages', 'babel.localtime'],

From 19379e37d2dc81ad998ff298a3403e4f744195c9 Mon Sep 17 00:00:00 2001
From: srisankethu <sanketh.uppalapati@research.iiit.ac.in>
Date: Sat, 13 Feb 2016 16:34:42 +0530
Subject: [PATCH 215/489] Contributing:Change incorrect link

Fixes https://github.com/python-babel/babel/issues/345
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dfad49f60..e492cee95 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -51,5 +51,5 @@ shall be amended so the history is not cluttered by "fixup commits".
 ## Writing Good Commits
 
 Please see
-http://coala.readthedocs.org/en/latest/Getting_Involved/Writing_Good_Commits/
+http://coala.readthedocs.org/en/latest/Getting_Involved/Writing_Good_Commits.html
 for guidelines on how to write good commits and proper commit messages.

From 9b5c7f3678167f03ec39fd1c25f98d0e0d41621f Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 14 Feb 2016 19:19:28 +0200
Subject: [PATCH 216/489] import_cldr: if lxml is installed, use it

---
 scripts/import_cldr.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 8e151f7d3..a38da81ed 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -18,9 +18,12 @@
 import sys
 
 try:
-    from xml.etree import cElementTree as ElementTree
+    import lxml.etree as ElementTree
 except ImportError:
-    from xml.etree import ElementTree
+    try:
+        from xml.etree import cElementTree as ElementTree
+    except ImportError:
+        from xml.etree import ElementTree
 
 # Make sure we're using Babel source, and not some previously installed version
 sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), '..'))

From 69d1b1265e68eacaff3e587e7a5fc398837a0fea Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 14 Feb 2016 21:45:07 +0200
Subject: [PATCH 217/489] import_cldr: Refactor global data parsing into
 separate function

Care was taken to make the `-w` diff as minimal as possible.
---
 scripts/import_cldr.py | 259 +++++++++++++++++++++--------------------
 1 file changed, 133 insertions(+), 126 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index a38da81ed..1b2db2c8a 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -159,141 +159,148 @@ def main():
     force = bool(options.force)
     dump_json = bool(options.dump_json)
     srcdir = args[0]
-    destdir = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),
-                           '..', 'babel')
+    destdir = os.path.join(
+        os.path.dirname(os.path.abspath(sys.argv[0])),
+        '..', 'babel'
+    )
+
 
     sup_filename = os.path.join(srcdir, 'supplemental', 'supplementalData.xml')
-    bcp47_timezone = parse(os.path.join(srcdir, 'bcp47', 'timezone.xml'))
-    sup_windows_zones = parse(os.path.join(srcdir, 'supplemental',
-                                           'windowsZones.xml'))
-    sup_metadata = parse(os.path.join(srcdir, 'supplemental',
-                                      'supplementalMetadata.xml'))
-    sup_likely = parse(os.path.join(srcdir, 'supplemental',
-                                    'likelySubtags.xml'))
     sup = parse(sup_filename)
 
     # Import global data from the supplemental files
     global_path = os.path.join(destdir, 'global.dat')
     global_data = {}
     if force or need_conversion(global_path, global_data, sup_filename):
-        territory_zones = global_data.setdefault('territory_zones', {})
-        zone_aliases = global_data.setdefault('zone_aliases', {})
-        zone_territories = global_data.setdefault('zone_territories', {})
-        win_mapping = global_data.setdefault('windows_zone_mapping', {})
-        language_aliases = global_data.setdefault('language_aliases', {})
-        territory_aliases = global_data.setdefault('territory_aliases', {})
-        script_aliases = global_data.setdefault('script_aliases', {})
-        variant_aliases = global_data.setdefault('variant_aliases', {})
-        likely_subtags = global_data.setdefault('likely_subtags', {})
-        territory_currencies = global_data.setdefault('territory_currencies', {})
-        parent_exceptions = global_data.setdefault('parent_exceptions', {})
-        currency_fractions = global_data.setdefault('currency_fractions', {})
-        territory_languages = global_data.setdefault('territory_languages', {})
-
-        # create auxiliary zone->territory map from the windows zones (we don't set
-        # the 'zones_territories' map directly here, because there are some zones
-        # aliases listed and we defer the decision of which ones to choose to the
-        # 'bcp47' data
-        _zone_territory_map = {}
-        for map_zone in sup_windows_zones.findall(
-                './/windowsZones/mapTimezones/mapZone'):
-            if map_zone.attrib.get('territory') == '001':
-                win_mapping[map_zone.attrib['other']] = \
-                    map_zone.attrib['type'].split()[0]
-            for tzid in text_type(map_zone.attrib['type']).split():
-                _zone_territory_map[tzid] = \
-                    text_type(map_zone.attrib['territory'])
-
-        for key_elem in bcp47_timezone.findall('.//keyword/key'):
-            if key_elem.attrib['name'] == 'tz':
-                for elem in key_elem.findall('type'):
-                    if 'deprecated' not in elem.attrib:
-                        aliases = text_type(elem.attrib['alias']).split()
-                        tzid = aliases.pop(0)
-                        territory = _zone_territory_map.get(tzid, '001')
-                        territory_zones.setdefault(territory, []).append(tzid)
-                        zone_territories[tzid] = territory
-                        for alias in aliases:
-                            zone_aliases[alias] = tzid
-                break
-
-        # Import Metazone mapping
-        meta_zones = global_data.setdefault('meta_zones', {})
-        tzsup = parse(os.path.join(srcdir, 'supplemental', 'metaZones.xml'))
-        for elem in tzsup.findall('.//timezone'):
-            for child in elem.findall('usesMetazone'):
-                if 'to' not in child.attrib: # FIXME: support old mappings
-                    meta_zones[elem.attrib['type']] = child.attrib['mzone']
-
-        # Language aliases
-        for alias in sup_metadata.findall('.//alias/languageAlias'):
-            # We don't have a use for those at the moment.  They don't
-            # pass our parser anyways.
-            if '_' in alias.attrib['type']:
-                continue
-            language_aliases[alias.attrib['type']] = alias.attrib['replacement']
-
-        # Territory aliases
-        for alias in sup_metadata.findall('.//alias/territoryAlias'):
-            territory_aliases[alias.attrib['type']] = \
-                alias.attrib['replacement'].split()
-
-        # Script aliases
-        for alias in sup_metadata.findall('.//alias/scriptAlias'):
-            script_aliases[alias.attrib['type']] = alias.attrib['replacement']
-
-        # Variant aliases
-        for alias in sup_metadata.findall('.//alias/variantAlias'):
-            repl = alias.attrib.get('replacement')
-            if repl:
-                variant_aliases[alias.attrib['type']] = repl
-
-        # Likely subtags
-        for likely_subtag in sup_likely.findall('.//likelySubtags/likelySubtag'):
-            likely_subtags[likely_subtag.attrib['from']] = \
-                likely_subtag.attrib['to']
-
-        # Currencies in territories
-        for region in sup.findall('.//currencyData/region'):
-            region_code = region.attrib['iso3166']
-            region_currencies = []
-            for currency in region.findall('./currency'):
-                cur_start = _parse_currency_date(currency.attrib.get('from'))
-                cur_end = _parse_currency_date(currency.attrib.get('to'))
-                region_currencies.append((currency.attrib['iso4217'],
-                                          cur_start, cur_end,
-                                          currency.attrib.get(
-                                              'tender', 'true') == 'true'))
-            region_currencies.sort(key=_currency_sort_key)
-            territory_currencies[region_code] = region_currencies
-
-        # Explicit parent locales
-        for paternity in sup.findall('.//parentLocales/parentLocale'):
-            parent = paternity.attrib['parent']
-            for child in paternity.attrib['locales'].split():
-                parent_exceptions[child] = parent
-
-        # Currency decimal and rounding digits
-        for fraction in sup.findall('.//currencyData/fractions/info'):
-            cur_code = fraction.attrib['iso4217']
-            cur_digits = int(fraction.attrib['digits'])
-            cur_rounding = int(fraction.attrib['rounding'])
-            cur_cdigits = int(fraction.attrib.get('cashDigits', cur_digits))
-            cur_crounding = int(fraction.attrib.get('cashRounding', cur_rounding))
-            currency_fractions[cur_code] = (cur_digits, cur_rounding, cur_cdigits, cur_crounding)
-
-        # Languages in territories
-        for territory in sup.findall('.//territoryInfo/territory'):
-            languages = {}
-            for language in territory.findall('./languagePopulation'):
-                languages[language.attrib['type']] = {
-                    'population_percent': float(language.attrib['populationPercent']),
-                    'official_status': language.attrib.get('officialStatus'),
-                }
-            territory_languages[territory.attrib['type']] = languages
-
+        global_data.update(parse_global(srcdir, sup))
         write_datafile(global_path, global_data, dump_json=dump_json)
+    _process_local_datas(sup, srcdir, destdir, force=force, dump_json=dump_json)
+
 
+def parse_global(srcdir, sup):
+    global_data = {}
+    sup_dir = os.path.join(srcdir, 'supplemental')
+    territory_zones = global_data.setdefault('territory_zones', {})
+    zone_aliases = global_data.setdefault('zone_aliases', {})
+    zone_territories = global_data.setdefault('zone_territories', {})
+    win_mapping = global_data.setdefault('windows_zone_mapping', {})
+    language_aliases = global_data.setdefault('language_aliases', {})
+    territory_aliases = global_data.setdefault('territory_aliases', {})
+    script_aliases = global_data.setdefault('script_aliases', {})
+    variant_aliases = global_data.setdefault('variant_aliases', {})
+    likely_subtags = global_data.setdefault('likely_subtags', {})
+    territory_currencies = global_data.setdefault('territory_currencies', {})
+    parent_exceptions = global_data.setdefault('parent_exceptions', {})
+    currency_fractions = global_data.setdefault('currency_fractions', {})
+    territory_languages = global_data.setdefault('territory_languages', {})
+    bcp47_timezone = parse(os.path.join(srcdir, 'bcp47', 'timezone.xml'))
+    sup_windows_zones = parse(os.path.join(sup_dir, 'windowsZones.xml'))
+    sup_metadata = parse(os.path.join(sup_dir, 'supplementalMetadata.xml'))
+    sup_likely = parse(os.path.join(sup_dir, 'likelySubtags.xml'))
+    # create auxiliary zone->territory map from the windows zones (we don't set
+    # the 'zones_territories' map directly here, because there are some zones
+    # aliases listed and we defer the decision of which ones to choose to the
+    # 'bcp47' data
+    _zone_territory_map = {}
+    for map_zone in sup_windows_zones.findall(
+        './/windowsZones/mapTimezones/mapZone'):
+        if map_zone.attrib.get('territory') == '001':
+            win_mapping[map_zone.attrib['other']] = \
+                map_zone.attrib['type'].split()[0]
+        for tzid in text_type(map_zone.attrib['type']).split():
+            _zone_territory_map[tzid] = \
+                text_type(map_zone.attrib['territory'])
+    for key_elem in bcp47_timezone.findall('.//keyword/key'):
+        if key_elem.attrib['name'] == 'tz':
+            for elem in key_elem.findall('type'):
+                if 'deprecated' not in elem.attrib:
+                    aliases = text_type(elem.attrib['alias']).split()
+                    tzid = aliases.pop(0)
+                    territory = _zone_territory_map.get(tzid, '001')
+                    territory_zones.setdefault(territory, []).append(tzid)
+                    zone_territories[tzid] = territory
+                    for alias in aliases:
+                        zone_aliases[alias] = tzid
+            break
+
+    # Import Metazone mapping
+    meta_zones = global_data.setdefault('meta_zones', {})
+    tzsup = parse(os.path.join(srcdir, 'supplemental', 'metaZones.xml'))
+    for elem in tzsup.findall('.//timezone'):
+        for child in elem.findall('usesMetazone'):
+            if 'to' not in child.attrib:  # FIXME: support old mappings
+                meta_zones[elem.attrib['type']] = child.attrib['mzone']
+
+    # Language aliases
+    for alias in sup_metadata.findall('.//alias/languageAlias'):
+        # We don't have a use for those at the moment.  They don't
+        # pass our parser anyways.
+        if '_' in alias.attrib['type']:
+            continue
+        language_aliases[alias.attrib['type']] = alias.attrib['replacement']
+
+    # Territory aliases
+    for alias in sup_metadata.findall('.//alias/territoryAlias'):
+        territory_aliases[alias.attrib['type']] = \
+            alias.attrib['replacement'].split()
+
+    # Script aliases
+    for alias in sup_metadata.findall('.//alias/scriptAlias'):
+        script_aliases[alias.attrib['type']] = alias.attrib['replacement']
+
+    # Variant aliases
+    for alias in sup_metadata.findall('.//alias/variantAlias'):
+        repl = alias.attrib.get('replacement')
+        if repl:
+            variant_aliases[alias.attrib['type']] = repl
+
+    # Likely subtags
+    for likely_subtag in sup_likely.findall('.//likelySubtags/likelySubtag'):
+        likely_subtags[likely_subtag.attrib['from']] = \
+            likely_subtag.attrib['to']
+
+    # Currencies in territories
+    for region in sup.findall('.//currencyData/region'):
+        region_code = region.attrib['iso3166']
+        region_currencies = []
+        for currency in region.findall('./currency'):
+            cur_start = _parse_currency_date(currency.attrib.get('from'))
+            cur_end = _parse_currency_date(currency.attrib.get('to'))
+            region_currencies.append((currency.attrib['iso4217'],
+                                      cur_start, cur_end,
+                                      currency.attrib.get(
+                                          'tender', 'true') == 'true'))
+        region_currencies.sort(key=_currency_sort_key)
+        territory_currencies[region_code] = region_currencies
+
+    # Explicit parent locales
+    for paternity in sup.findall('.//parentLocales/parentLocale'):
+        parent = paternity.attrib['parent']
+        for child in paternity.attrib['locales'].split():
+            parent_exceptions[child] = parent
+
+    # Currency decimal and rounding digits
+    for fraction in sup.findall('.//currencyData/fractions/info'):
+        cur_code = fraction.attrib['iso4217']
+        cur_digits = int(fraction.attrib['digits'])
+        cur_rounding = int(fraction.attrib['rounding'])
+        cur_cdigits = int(fraction.attrib.get('cashDigits', cur_digits))
+        cur_crounding = int(fraction.attrib.get('cashRounding', cur_rounding))
+        currency_fractions[cur_code] = (cur_digits, cur_rounding, cur_cdigits, cur_crounding)
+
+    # Languages in territories
+    for territory in sup.findall('.//territoryInfo/territory'):
+        languages = {}
+        for language in territory.findall('./languagePopulation'):
+            languages[language.attrib['type']] = {
+                'population_percent': float(language.attrib['populationPercent']),
+                'official_status': language.attrib.get('officialStatus'),
+            }
+        territory_languages[territory.attrib['type']] = languages
+    return global_data
+
+
+def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
     # build a territory containment mapping for inheritance
     regions = {}
     for elem in sup.findall('.//territoryContainment/group'):
@@ -342,7 +349,7 @@ def main():
         if elem is not None:
             territory = elem.attrib['type']
         else:
-            territory = '001' # world
+            territory = '001'  # world
         regions = territory_containment.get(territory, [])
 
         log('Processing %s (Language = %s; Territory = %s)',

From e59cfde41a970bd71c9dabc8cc72c6f845e7f009 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 14 Feb 2016 21:45:19 +0200
Subject: [PATCH 218/489] import_cldr: refactor locale data parsing into
 multiple functions

Special care was taken to order the new functions in the same order as the
original source was; the resulting whitespace-ignoring diff is very
minimal.
---
 scripts/import_cldr.py | 687 ++++++++++++++++++++++-------------------
 1 file changed, 361 insertions(+), 326 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 1b2db2c8a..0deca822a 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -365,346 +365,381 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
         if locale_id in ordinal_rules:
             data['ordinal_form'] = ordinal_rules[locale_id]
 
-        # <localeDisplayNames>
+        parse_locale_display_names(data, tree)
 
-        territories = data.setdefault('territories', {})
-        for elem in tree.findall('.//territories/territory'):
-            if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                    and elem.attrib['type'] in territories:
-                continue
-            territories[elem.attrib['type']] = _text(elem)
+        parse_dates(data, tree, sup, regions, territory)
 
-        languages = data.setdefault('languages', {})
-        for elem in tree.findall('.//languages/language'):
-            if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                    and elem.attrib['type'] in languages:
+        for calendar in tree.findall('.//calendars/calendar'):
+            if calendar.attrib['type'] != 'gregorian':
+                # TODO: support other calendar types
                 continue
-            languages[elem.attrib['type']] = _text(elem)
 
-        variants = data.setdefault('variants', {})
-        for elem in tree.findall('.//variants/variant'):
-            if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                    and elem.attrib['type'] in variants:
-                continue
-            variants[elem.attrib['type']] = _text(elem)
+            parse_calendar_months(data, calendar)
+            parse_calendar_days(data, calendar)
+            parse_calendar_quarters(data, calendar)
+            parse_calendar_eras(data, calendar)
+            parse_calendar_periods(data, calendar)
+            parse_calendar_date_formats(data, calendar)
+            parse_calendar_time_formats(data, calendar)
+            parse_calendar_datetime_skeletons(data, calendar)
+            parse_interval_formats(data, calendar)
 
-        scripts = data.setdefault('scripts', {})
-        for elem in tree.findall('.//scripts/script'):
-            if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                    and elem.attrib['type'] in scripts:
-                continue
-            scripts[elem.attrib['type']] = _text(elem)
+        parse_number_symbols(data, tree)
+        parse_decimal_formats(data, tree)
+        parse_scientific_formats(data, tree)
+        parse_percent_formats(data, tree)
 
-        list_patterns = data.setdefault('list_patterns', {})
-        for listType in tree.findall('.//listPatterns/listPattern'):
-            if 'type' in listType.attrib:
-                continue
-            for listPattern in listType.findall('listPatternPart'):
-                list_patterns[listPattern.attrib['type']] = _text(listPattern)
-
-        # <dates>
-
-        week_data = data.setdefault('week_data', {})
-        supelem = sup.find('.//weekData')
-
-        for elem in supelem.findall('minDays'):
-            territories = elem.attrib['territories'].split()
-            if territory in territories or any([r in territories for r in regions]):
-                week_data['min_days'] = int(elem.attrib['count'])
-
-        for elem in supelem.findall('firstDay'):
-            territories = elem.attrib['territories'].split()
-            if territory in territories or any([r in territories for r in regions]):
-                week_data['first_day'] = weekdays[elem.attrib['day']]
-
-        for elem in supelem.findall('weekendStart'):
-            territories = elem.attrib['territories'].split()
-            if territory in territories or any([r in territories for r in regions]):
-                week_data['weekend_start'] = weekdays[elem.attrib['day']]
-
-        for elem in supelem.findall('weekendEnd'):
-            territories = elem.attrib['territories'].split()
-            if territory in territories or any([r in territories for r in regions]):
-                week_data['weekend_end'] = weekdays[elem.attrib['day']]
-
-        zone_formats = data.setdefault('zone_formats', {})
-        for elem in tree.findall('.//timeZoneNames/gmtFormat'):
-            if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
-                zone_formats['gmt'] = text_type(elem.text).replace('{0}', '%s')
-                break
-        for elem in tree.findall('.//timeZoneNames/regionFormat'):
-            if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
-                zone_formats['region'] = text_type(elem.text).replace('{0}', '%s')
-                break
-        for elem in tree.findall('.//timeZoneNames/fallbackFormat'):
-            if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
-                zone_formats['fallback'] = text_type(elem.text) \
-                    .replace('{0}', '%(0)s').replace('{1}', '%(1)s')
-                break
-        for elem in tree.findall('.//timeZoneNames/fallbackRegionFormat'):
-            if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
-                zone_formats['fallback_region'] = text_type(elem.text) \
-                    .replace('{0}', '%(0)s').replace('{1}', '%(1)s')
-                break
-
-        time_zones = data.setdefault('time_zones', {})
-        for elem in tree.findall('.//timeZoneNames/zone'):
-            info = {}
-            city = elem.findtext('exemplarCity')
-            if city:
-                info['city'] = text_type(city)
-            for child in elem.findall('long/*'):
-                info.setdefault('long', {})[child.tag] = text_type(child.text)
-            for child in elem.findall('short/*'):
-                info.setdefault('short', {})[child.tag] = text_type(child.text)
-            time_zones[elem.attrib['type']] = info
-
-        meta_zones = data.setdefault('meta_zones', {})
-        for elem in tree.findall('.//timeZoneNames/metazone'):
-            info = {}
-            city = elem.findtext('exemplarCity')
-            if city:
-                info['city'] = text_type(city)
-            for child in elem.findall('long/*'):
-                info.setdefault('long', {})[child.tag] = text_type(child.text)
-            for child in elem.findall('short/*'):
-                info.setdefault('short', {})[child.tag] = text_type(child.text)
-            meta_zones[elem.attrib['type']] = info
+        parse_currency_formats(data, tree)
+        parse_currency_names(data, tree)
+        parse_unit_patterns(data, tree)
+        parse_date_fields(data, tree)
+
+        write_datafile(data_filename, data, dump_json=dump_json)
+
+
+def parse_locale_display_names(data, tree):
+    territories = data.setdefault('territories', {})
+    for elem in tree.findall('.//territories/territory'):
+        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+            and elem.attrib['type'] in territories:
+            continue
+        territories[elem.attrib['type']] = _text(elem)
+    languages = data.setdefault('languages', {})
+    for elem in tree.findall('.//languages/language'):
+        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+            and elem.attrib['type'] in languages:
+            continue
+        languages[elem.attrib['type']] = _text(elem)
+    variants = data.setdefault('variants', {})
+    for elem in tree.findall('.//variants/variant'):
+        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+            and elem.attrib['type'] in variants:
+            continue
+        variants[elem.attrib['type']] = _text(elem)
+    scripts = data.setdefault('scripts', {})
+    for elem in tree.findall('.//scripts/script'):
+        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+            and elem.attrib['type'] in scripts:
+            continue
+        scripts[elem.attrib['type']] = _text(elem)
+    list_patterns = data.setdefault('list_patterns', {})
+    for listType in tree.findall('.//listPatterns/listPattern'):
+        if 'type' in listType.attrib:
+            continue
+        for listPattern in listType.findall('listPatternPart'):
+            list_patterns[listPattern.attrib['type']] = _text(listPattern)
+
+
+def parse_dates(data, tree, sup, regions, territory):
+    week_data = data.setdefault('week_data', {})
+    supelem = sup.find('.//weekData')
+    for elem in supelem.findall('minDays'):
+        territories = elem.attrib['territories'].split()
+        if territory in territories or any([r in territories for r in regions]):
+            week_data['min_days'] = int(elem.attrib['count'])
+    for elem in supelem.findall('firstDay'):
+        territories = elem.attrib['territories'].split()
+        if territory in territories or any([r in territories for r in regions]):
+            week_data['first_day'] = weekdays[elem.attrib['day']]
+    for elem in supelem.findall('weekendStart'):
+        territories = elem.attrib['territories'].split()
+        if territory in territories or any([r in territories for r in regions]):
+            week_data['weekend_start'] = weekdays[elem.attrib['day']]
+    for elem in supelem.findall('weekendEnd'):
+        territories = elem.attrib['territories'].split()
+        if territory in territories or any([r in territories for r in regions]):
+            week_data['weekend_end'] = weekdays[elem.attrib['day']]
+    zone_formats = data.setdefault('zone_formats', {})
+    for elem in tree.findall('.//timeZoneNames/gmtFormat'):
+        if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
+            zone_formats['gmt'] = text_type(elem.text).replace('{0}', '%s')
+            break
+    for elem in tree.findall('.//timeZoneNames/regionFormat'):
+        if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
+            zone_formats['region'] = text_type(elem.text).replace('{0}', '%s')
+            break
+    for elem in tree.findall('.//timeZoneNames/fallbackFormat'):
+        if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
+            zone_formats['fallback'] = text_type(elem.text) \
+                .replace('{0}', '%(0)s').replace('{1}', '%(1)s')
+            break
+    for elem in tree.findall('.//timeZoneNames/fallbackRegionFormat'):
+        if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
+            zone_formats['fallback_region'] = text_type(elem.text) \
+                .replace('{0}', '%(0)s').replace('{1}', '%(1)s')
+            break
+    time_zones = data.setdefault('time_zones', {})
+    for elem in tree.findall('.//timeZoneNames/zone'):
+        info = {}
+        city = elem.findtext('exemplarCity')
+        if city:
+            info['city'] = text_type(city)
+        for child in elem.findall('long/*'):
+            info.setdefault('long', {})[child.tag] = text_type(child.text)
+        for child in elem.findall('short/*'):
+            info.setdefault('short', {})[child.tag] = text_type(child.text)
+        time_zones[elem.attrib['type']] = info
+    meta_zones = data.setdefault('meta_zones', {})
+    for elem in tree.findall('.//timeZoneNames/metazone'):
+        info = {}
+        city = elem.findtext('exemplarCity')
+        if city:
+            info['city'] = text_type(city)
+        for child in elem.findall('long/*'):
+            info.setdefault('long', {})[child.tag] = text_type(child.text)
+        for child in elem.findall('short/*'):
+            info.setdefault('short', {})[child.tag] = text_type(child.text)
+        meta_zones[elem.attrib['type']] = info
+
+
+def parse_calendar_months(data, calendar):
+    months = data.setdefault('months', {})
+    for ctxt in calendar.findall('months/monthContext'):
+        ctxt_type = ctxt.attrib['type']
+        ctxts = months.setdefault(ctxt_type, {})
+        for width in ctxt.findall('monthWidth'):
+            width_type = width.attrib['type']
+            widths = ctxts.setdefault(width_type, {})
+            for elem in width.getiterator():
+                if elem.tag == 'month':
+                    if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+                        and int(elem.attrib['type']) in widths:
+                        continue
+                    widths[int(elem.attrib.get('type'))] = \
+                        text_type(elem.text)
+                elif elem.tag == 'alias':
+                    ctxts[width_type] = Alias(
+                        _translate_alias(['months', ctxt_type, width_type],
+                                         elem.attrib['path'])
+                    )
 
-        for calendar in tree.findall('.//calendars/calendar'):
-            if calendar.attrib['type'] != 'gregorian':
-                # TODO: support other calendar types
-                continue
 
-            months = data.setdefault('months', {})
-            for ctxt in calendar.findall('months/monthContext'):
-                ctxt_type = ctxt.attrib['type']
-                ctxts = months.setdefault(ctxt_type, {})
-                for width in ctxt.findall('monthWidth'):
-                    width_type = width.attrib['type']
-                    widths = ctxts.setdefault(width_type, {})
-                    for elem in width.getiterator():
-                        if elem.tag == 'month':
-                            if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                                    and int(elem.attrib['type']) in widths:
-                                continue
-                            widths[int(elem.attrib.get('type'))] = \
-                                text_type(elem.text)
-                        elif elem.tag == 'alias':
-                            ctxts[width_type] = Alias(
-                                _translate_alias(['months', ctxt_type, width_type],
-                                                 elem.attrib['path'])
-                            )
-
-            days = data.setdefault('days', {})
-            for ctxt in calendar.findall('days/dayContext'):
-                ctxt_type = ctxt.attrib['type']
-                ctxts = days.setdefault(ctxt_type, {})
-                for width in ctxt.findall('dayWidth'):
-                    width_type = width.attrib['type']
-                    widths = ctxts.setdefault(width_type, {})
-                    for elem in width.getiterator():
-                        if elem.tag == 'day':
-                            dtype = weekdays[elem.attrib['type']]
-                            if ('draft' in elem.attrib or
+def parse_calendar_days(data, calendar):
+    days = data.setdefault('days', {})
+    for ctxt in calendar.findall('days/dayContext'):
+        ctxt_type = ctxt.attrib['type']
+        ctxts = days.setdefault(ctxt_type, {})
+        for width in ctxt.findall('dayWidth'):
+            width_type = width.attrib['type']
+            widths = ctxts.setdefault(width_type, {})
+            for elem in width.getiterator():
+                if elem.tag == 'day':
+                    dtype = weekdays[elem.attrib['type']]
+                    if ('draft' in elem.attrib or
                                 'alt' not in elem.attrib) \
-                                    and dtype in widths:
-                                continue
-                            widths[dtype] = text_type(elem.text)
-                        elif elem.tag == 'alias':
-                            ctxts[width_type] = Alias(
-                                _translate_alias(['days', ctxt_type, width_type],
-                                                 elem.attrib['path'])
-                            )
-
-            quarters = data.setdefault('quarters', {})
-            for ctxt in calendar.findall('quarters/quarterContext'):
-                ctxt_type = ctxt.attrib['type']
-                ctxts = quarters.setdefault(ctxt.attrib['type'], {})
-                for width in ctxt.findall('quarterWidth'):
-                    width_type = width.attrib['type']
-                    widths = ctxts.setdefault(width_type, {})
-                    for elem in width.getiterator():
-                        if elem.tag == 'quarter':
-                            if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                                    and int(elem.attrib['type']) in widths:
-                                continue
-                            widths[int(elem.attrib['type'])] = text_type(elem.text)
-                        elif elem.tag == 'alias':
-                            ctxts[width_type] = Alias(
-                                _translate_alias(['quarters', ctxt_type,
-                                                  width_type],
-                                                 elem.attrib['path']))
-
-            eras = data.setdefault('eras', {})
-            for width in calendar.findall('eras/*'):
-                width_type = NAME_MAP[width.tag]
-                widths = eras.setdefault(width_type, {})
-                for elem in width.getiterator():
-                    if elem.tag == 'era':
-                        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                                and int(elem.attrib['type']) in widths:
-                            continue
-                        widths[int(elem.attrib.get('type'))] = text_type(elem.text)
-                    elif elem.tag == 'alias':
-                        eras[width_type] = Alias(
-                            _translate_alias(['eras', width_type],
-                                             elem.attrib['path'])
-                        )
-
-            # AM/PM
-            periods = data.setdefault('periods', {})
-            for day_period_width in calendar.findall(
-                    'dayPeriods/dayPeriodContext/dayPeriodWidth'):
-                if day_period_width.attrib['type'] == 'wide':
-                    for day_period in day_period_width.findall('dayPeriod'):
-                        if 'alt' not in day_period.attrib:
-                            periods[day_period.attrib['type']] = text_type(
-                                day_period.text)
-
-            date_formats = data.setdefault('date_formats', {})
-            for format in calendar.findall('dateFormats'):
-                for elem in format.getiterator():
-                    if elem.tag == 'dateFormatLength':
-                        if 'draft' in elem.attrib and \
-                                elem.attrib.get('type') in date_formats:
-                            continue
-                        try:
-                            date_formats[elem.attrib.get('type')] = \
-                                dates.parse_pattern(text_type(
-                                    elem.findtext('dateFormat/pattern')))
-                        except ValueError as e:
-                            error(e)
-                    elif elem.tag == 'alias':
-                        date_formats = Alias(_translate_alias(
-                            ['date_formats'], elem.attrib['path'])
-                        )
-
-            time_formats = data.setdefault('time_formats', {})
-            for format in calendar.findall('timeFormats'):
-                for elem in format.getiterator():
-                    if elem.tag == 'timeFormatLength':
-                        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                                and elem.attrib.get('type') in time_formats:
-                            continue
-                        try:
-                            time_formats[elem.attrib.get('type')] = \
-                                dates.parse_pattern(text_type(
-                                    elem.findtext('timeFormat/pattern')))
-                        except ValueError as e:
-                            error(e)
-                    elif elem.tag == 'alias':
-                        time_formats = Alias(_translate_alias(
-                            ['time_formats'], elem.attrib['path'])
-                        )
-
-            datetime_formats = data.setdefault('datetime_formats', {})
-            datetime_skeletons = data.setdefault('datetime_skeletons', {})
-            for format in calendar.findall('dateTimeFormats'):
-                for elem in format.getiterator():
-                    if elem.tag == 'dateTimeFormatLength':
-                        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                                and elem.attrib.get('type') in datetime_formats:
-                            continue
-                        try:
-                            datetime_formats[elem.attrib.get('type')] = \
-                                text_type(elem.findtext('dateTimeFormat/pattern'))
-                        except ValueError as e:
-                            error(e)
-                    elif elem.tag == 'alias':
-                        datetime_formats = Alias(_translate_alias(
-                            ['datetime_formats'], elem.attrib['path'])
-                        )
-                    elif elem.tag == 'availableFormats':
-                        for datetime_skeleton in elem.findall('dateFormatItem'):
-                            datetime_skeletons[datetime_skeleton.attrib['id']] = \
-                                dates.parse_pattern(text_type(datetime_skeleton.text))
+                        and dtype in widths:
+                        continue
+                    widths[dtype] = text_type(elem.text)
+                elif elem.tag == 'alias':
+                    ctxts[width_type] = Alias(
+                        _translate_alias(['days', ctxt_type, width_type],
+                                         elem.attrib['path'])
+                    )
 
-            parse_interval_formats(data, calendar)
 
-        # <numbers>
+def parse_calendar_quarters(data, calendar):
+    quarters = data.setdefault('quarters', {})
+    for ctxt in calendar.findall('quarters/quarterContext'):
+        ctxt_type = ctxt.attrib['type']
+        ctxts = quarters.setdefault(ctxt.attrib['type'], {})
+        for width in ctxt.findall('quarterWidth'):
+            width_type = width.attrib['type']
+            widths = ctxts.setdefault(width_type, {})
+            for elem in width.getiterator():
+                if elem.tag == 'quarter':
+                    if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+                        and int(elem.attrib['type']) in widths:
+                        continue
+                    widths[int(elem.attrib['type'])] = text_type(elem.text)
+                elif elem.tag == 'alias':
+                    ctxts[width_type] = Alias(
+                        _translate_alias(['quarters', ctxt_type,
+                                          width_type],
+                                         elem.attrib['path']))
+
+
+def parse_calendar_eras(data, calendar):
+    eras = data.setdefault('eras', {})
+    for width in calendar.findall('eras/*'):
+        width_type = NAME_MAP[width.tag]
+        widths = eras.setdefault(width_type, {})
+        for elem in width.getiterator():
+            if elem.tag == 'era':
+                if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+                    and int(elem.attrib['type']) in widths:
+                    continue
+                widths[int(elem.attrib.get('type'))] = text_type(elem.text)
+            elif elem.tag == 'alias':
+                eras[width_type] = Alias(
+                    _translate_alias(['eras', width_type],
+                                     elem.attrib['path'])
+                )
+
+
+def parse_calendar_periods(data, calendar):
+    # AM/PM
+    periods = data.setdefault('periods', {})
+    for day_period_width in calendar.findall(
+        'dayPeriods/dayPeriodContext/dayPeriodWidth'):
+        if day_period_width.attrib['type'] == 'wide':
+            for day_period in day_period_width.findall('dayPeriod'):
+                if 'alt' not in day_period.attrib:
+                    periods[day_period.attrib['type']] = text_type(
+                        day_period.text)
+
+
+def parse_calendar_date_formats(data, calendar):
+    date_formats = data.setdefault('date_formats', {})
+    for format in calendar.findall('dateFormats'):
+        for elem in format.getiterator():
+            if elem.tag == 'dateFormatLength':
+                if 'draft' in elem.attrib and \
+                        elem.attrib.get('type') in date_formats:
+                    continue
+                try:
+                    date_formats[elem.attrib.get('type')] = \
+                        dates.parse_pattern(text_type(
+                            elem.findtext('dateFormat/pattern')))
+                except ValueError as e:
+                    error(e)
+            elif elem.tag == 'alias':
+                date_formats = Alias(_translate_alias(
+                    ['date_formats'], elem.attrib['path'])
+                )
+
+
+def parse_calendar_time_formats(data, calendar):
+    time_formats = data.setdefault('time_formats', {})
+    for format in calendar.findall('timeFormats'):
+        for elem in format.getiterator():
+            if elem.tag == 'timeFormatLength':
+                if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+                    and elem.attrib.get('type') in time_formats:
+                    continue
+                try:
+                    time_formats[elem.attrib.get('type')] = \
+                        dates.parse_pattern(text_type(
+                            elem.findtext('timeFormat/pattern')))
+                except ValueError as e:
+                    error(e)
+            elif elem.tag == 'alias':
+                time_formats = Alias(_translate_alias(
+                    ['time_formats'], elem.attrib['path'])
+                )
+
+
+def parse_calendar_datetime_skeletons(data, calendar):
+    datetime_formats = data.setdefault('datetime_formats', {})
+    datetime_skeletons = data.setdefault('datetime_skeletons', {})
+    for format in calendar.findall('dateTimeFormats'):
+        for elem in format.getiterator():
+            if elem.tag == 'dateTimeFormatLength':
+                if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+                    and elem.attrib.get('type') in datetime_formats:
+                    continue
+                try:
+                    datetime_formats[elem.attrib.get('type')] = \
+                        text_type(elem.findtext('dateTimeFormat/pattern'))
+                except ValueError as e:
+                    error(e)
+            elif elem.tag == 'alias':
+                datetime_formats = Alias(_translate_alias(
+                    ['datetime_formats'], elem.attrib['path'])
+                )
+            elif elem.tag == 'availableFormats':
+                for datetime_skeleton in elem.findall('dateFormatItem'):
+                    datetime_skeletons[datetime_skeleton.attrib['id']] = \
+                        dates.parse_pattern(text_type(datetime_skeleton.text))
+
+
+def parse_number_symbols(data, tree):
+    number_symbols = data.setdefault('number_symbols', {})
+    for elem in tree.findall('.//numbers/symbols/*'):
+        if ('draft' in elem.attrib or 'alt' in elem.attrib):
+            continue
+        number_symbols[elem.tag] = text_type(elem.text)
 
-        number_symbols = data.setdefault('number_symbols', {})
-        for elem in tree.findall('.//numbers/symbols/*'):
-            if ('draft' in elem.attrib or 'alt' in elem.attrib):
-                continue
-            number_symbols[elem.tag] = text_type(elem.text)
 
-        decimal_formats = data.setdefault('decimal_formats', {})
-        for elem in tree.findall('.//decimalFormats/decimalFormatLength'):
-            if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                    and elem.attrib.get('type') in decimal_formats:
-                continue
-            if elem.findall('./alias'):
-                # TODO map the alias to its target
-                continue
-            pattern = text_type(elem.findtext('./decimalFormat/pattern'))
-            decimal_formats[elem.attrib.get('type')] = \
-                numbers.parse_pattern(pattern)
-
-        scientific_formats = data.setdefault('scientific_formats', {})
-        for elem in tree.findall('.//scientificFormats/scientificFormatLength'):
-            if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                    and elem.attrib.get('type') in scientific_formats:
-                continue
-            pattern = text_type(elem.findtext('scientificFormat/pattern'))
-            scientific_formats[elem.attrib.get('type')] = \
-                numbers.parse_pattern(pattern)
+def parse_decimal_formats(data, tree):
+    decimal_formats = data.setdefault('decimal_formats', {})
+    for elem in tree.findall('.//decimalFormats/decimalFormatLength'):
+        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+            and elem.attrib.get('type') in decimal_formats:
+            continue
+        if elem.findall('./alias'):
+            # TODO map the alias to its target
+            continue
+        pattern = text_type(elem.findtext('./decimalFormat/pattern'))
+        decimal_formats[elem.attrib.get('type')] = \
+            numbers.parse_pattern(pattern)
 
-        parse_currency_formats(data, tree)
 
-        percent_formats = data.setdefault('percent_formats', {})
-        for elem in tree.findall('.//percentFormats/percentFormatLength'):
-            if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                    and elem.attrib.get('type') in percent_formats:
-                continue
-            pattern = text_type(elem.findtext('percentFormat/pattern'))
-            percent_formats[elem.attrib.get('type')] = \
-                numbers.parse_pattern(pattern)
-
-        currency_names = data.setdefault('currency_names', {})
-        currency_names_plural = data.setdefault('currency_names_plural', {})
-        currency_symbols = data.setdefault('currency_symbols', {})
-        for elem in tree.findall('.//currencies/currency'):
-            code = elem.attrib['type']
-            for name in elem.findall('displayName'):
-                if ('draft' in name.attrib) and code in currency_names:
-                    continue
-                if 'count' in name.attrib:
-                    currency_names_plural.setdefault(code, {})[
-                        name.attrib['count']] = text_type(name.text)
-                else:
-                    currency_names[code] = text_type(name.text)
-            # TODO: support choice patterns for currency symbol selection
-            symbol = elem.find('symbol')
-            if symbol is not None and 'draft' not in symbol.attrib \
-                    and 'choice' not in symbol.attrib:
-                currency_symbols[code] = text_type(symbol.text)
-
-        # <units>
-
-        unit_patterns = data.setdefault('unit_patterns', {})
-        for elem in tree.findall('.//units/unitLength'):
-            unit_length_type = elem.attrib['type']
-            for unit in elem.findall('unit'):
-                unit_type = unit.attrib['type']
-                for pattern in unit.findall('unitPattern'):
-                    box = unit_type
-                    box += ':' + unit_length_type
-                    unit_patterns.setdefault(box, {})[pattern.attrib['count']] = \
-                        text_type(pattern.text)
-
-        date_fields = data.setdefault('date_fields', {})
-        for elem in tree.findall('.//dates/fields/field'):
-            field_type = elem.attrib['type']
-            date_fields.setdefault(field_type, {})
-            for rel_time in elem.findall('relativeTime'):
-                rel_time_type = rel_time.attrib['type']
-                for pattern in rel_time.findall('relativeTimePattern'):
-                    date_fields[field_type].setdefault(rel_time_type, {})\
-                        [pattern.attrib['count']] = text_type(pattern.text)
+def parse_scientific_formats(data, tree):
+    scientific_formats = data.setdefault('scientific_formats', {})
+    for elem in tree.findall('.//scientificFormats/scientificFormatLength'):
+        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+            and elem.attrib.get('type') in scientific_formats:
+            continue
+        pattern = text_type(elem.findtext('scientificFormat/pattern'))
+        scientific_formats[elem.attrib.get('type')] = \
+            numbers.parse_pattern(pattern)
 
-        write_datafile(data_filename, data, dump_json=dump_json)
+
+def parse_percent_formats(data, tree):
+    percent_formats = data.setdefault('percent_formats', {})
+    for elem in tree.findall('.//percentFormats/percentFormatLength'):
+        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
+            and elem.attrib.get('type') in percent_formats:
+            continue
+        pattern = text_type(elem.findtext('percentFormat/pattern'))
+        percent_formats[elem.attrib.get('type')] = \
+            numbers.parse_pattern(pattern)
+
+
+def parse_currency_names(data, tree):
+    currency_names = data.setdefault('currency_names', {})
+    currency_names_plural = data.setdefault('currency_names_plural', {})
+    currency_symbols = data.setdefault('currency_symbols', {})
+    for elem in tree.findall('.//currencies/currency'):
+        code = elem.attrib['type']
+        for name in elem.findall('displayName'):
+            if ('draft' in name.attrib) and code in currency_names:
+                continue
+            if 'count' in name.attrib:
+                currency_names_plural.setdefault(code, {})[
+                    name.attrib['count']] = text_type(name.text)
+            else:
+                currency_names[code] = text_type(name.text)
+        # TODO: support choice patterns for currency symbol selection
+        symbol = elem.find('symbol')
+        if symbol is not None and 'draft' not in symbol.attrib \
+            and 'choice' not in symbol.attrib:
+            currency_symbols[code] = text_type(symbol.text)
+
+
+def parse_unit_patterns(data, tree):
+    unit_patterns = data.setdefault('unit_patterns', {})
+    for elem in tree.findall('.//units/unitLength'):
+        unit_length_type = elem.attrib['type']
+        for unit in elem.findall('unit'):
+            unit_type = unit.attrib['type']
+            for pattern in unit.findall('unitPattern'):
+                box = unit_type
+                box += ':' + unit_length_type
+                unit_patterns.setdefault(box, {})[pattern.attrib['count']] = \
+                    text_type(pattern.text)
+
+
+def parse_date_fields(data, tree):
+    date_fields = data.setdefault('date_fields', {})
+    for elem in tree.findall('.//dates/fields/field'):
+        field_type = elem.attrib['type']
+        date_fields.setdefault(field_type, {})
+        for rel_time in elem.findall('relativeTime'):
+            rel_time_type = rel_time.attrib['type']
+            for pattern in rel_time.findall('relativeTimePattern'):
+                date_fields[field_type].setdefault(rel_time_type, {}) \
+                    [pattern.attrib['count']] = text_type(pattern.text)
 
 
 def parse_interval_formats(data, tree):
@@ -738,8 +773,8 @@ def parse_currency_formats(data, tree):
             for child in elem.getiterator():
                 if child.tag == 'alias':
                     currency_formats[type] = Alias(
-                            _translate_alias(['currency_formats', elem.attrib['type']],
-                                             child.attrib['path'])
+                        _translate_alias(['currency_formats', elem.attrib['type']],
+                                         child.attrib['path'])
                     )
                 elif child.tag == 'pattern':
                     pattern = text_type(child.text)

From 475a28d7e83496c4ff459a7e46507d1a70a027ce Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 14 Feb 2016 22:00:56 +0200
Subject: [PATCH 219/489] import_cldr: fix flake8 nits and remove duplicate
 code

---
 scripts/import_cldr.py | 84 +++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 55 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 0deca822a..0c7a99381 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -164,7 +164,6 @@ def main():
         '..', 'babel'
     )
 
-
     sup_filename = os.path.join(srcdir, 'supplemental', 'supplementalData.xml')
     sup = parse(sup_filename)
 
@@ -202,8 +201,7 @@ def parse_global(srcdir, sup):
     # aliases listed and we defer the decision of which ones to choose to the
     # 'bcp47' data
     _zone_territory_map = {}
-    for map_zone in sup_windows_zones.findall(
-        './/windowsZones/mapTimezones/mapZone'):
+    for map_zone in sup_windows_zones.findall('.//windowsZones/mapTimezones/mapZone'):
         if map_zone.attrib.get('territory') == '001':
             win_mapping[map_zone.attrib['other']] = \
                 map_zone.attrib['type'].split()[0]
@@ -397,31 +395,28 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
         write_datafile(data_filename, data, dump_json=dump_json)
 
 
+def _import_type_text(dest, elem, type=None):
+    # An utility to ignore drafts or alternates.
+    if type is None:
+        type = elem.attrib['type']
+    if ('draft' in elem.attrib or 'alt' in elem.attrib) and type in dest:
+        return
+    dest[type] = _text(elem)
+
+
 def parse_locale_display_names(data, tree):
     territories = data.setdefault('territories', {})
     for elem in tree.findall('.//territories/territory'):
-        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-            and elem.attrib['type'] in territories:
-            continue
-        territories[elem.attrib['type']] = _text(elem)
+        _import_type_text(territories, elem)
     languages = data.setdefault('languages', {})
     for elem in tree.findall('.//languages/language'):
-        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-            and elem.attrib['type'] in languages:
-            continue
-        languages[elem.attrib['type']] = _text(elem)
+        _import_type_text(languages, elem)
     variants = data.setdefault('variants', {})
     for elem in tree.findall('.//variants/variant'):
-        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-            and elem.attrib['type'] in variants:
-            continue
-        variants[elem.attrib['type']] = _text(elem)
+        _import_type_text(variants, elem)
     scripts = data.setdefault('scripts', {})
     for elem in tree.findall('.//scripts/script'):
-        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-            and elem.attrib['type'] in scripts:
-            continue
-        scripts[elem.attrib['type']] = _text(elem)
+        _import_type_text(scripts, elem)
     list_patterns = data.setdefault('list_patterns', {})
     for listType in tree.findall('.//listPatterns/listPattern'):
         if 'type' in listType.attrib:
@@ -502,11 +497,7 @@ def parse_calendar_months(data, calendar):
             widths = ctxts.setdefault(width_type, {})
             for elem in width.getiterator():
                 if elem.tag == 'month':
-                    if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                        and int(elem.attrib['type']) in widths:
-                        continue
-                    widths[int(elem.attrib.get('type'))] = \
-                        text_type(elem.text)
+                    _import_type_text(widths, elem, int(elem.attrib['type']))
                 elif elem.tag == 'alias':
                     ctxts[width_type] = Alias(
                         _translate_alias(['months', ctxt_type, width_type],
@@ -524,12 +515,7 @@ def parse_calendar_days(data, calendar):
             widths = ctxts.setdefault(width_type, {})
             for elem in width.getiterator():
                 if elem.tag == 'day':
-                    dtype = weekdays[elem.attrib['type']]
-                    if ('draft' in elem.attrib or
-                                'alt' not in elem.attrib) \
-                        and dtype in widths:
-                        continue
-                    widths[dtype] = text_type(elem.text)
+                    _import_type_text(widths, elem, weekdays[elem.attrib['type']])
                 elif elem.tag == 'alias':
                     ctxts[width_type] = Alias(
                         _translate_alias(['days', ctxt_type, width_type],
@@ -547,10 +533,7 @@ def parse_calendar_quarters(data, calendar):
             widths = ctxts.setdefault(width_type, {})
             for elem in width.getiterator():
                 if elem.tag == 'quarter':
-                    if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                        and int(elem.attrib['type']) in widths:
-                        continue
-                    widths[int(elem.attrib['type'])] = text_type(elem.text)
+                    _import_type_text(widths, elem, int(elem.attrib['type']))
                 elif elem.tag == 'alias':
                     ctxts[width_type] = Alias(
                         _translate_alias(['quarters', ctxt_type,
@@ -565,10 +548,7 @@ def parse_calendar_eras(data, calendar):
         widths = eras.setdefault(width_type, {})
         for elem in width.getiterator():
             if elem.tag == 'era':
-                if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                    and int(elem.attrib['type']) in widths:
-                    continue
-                widths[int(elem.attrib.get('type'))] = text_type(elem.text)
+                _import_type_text(widths, elem, type=int(elem.attrib.get('type')))
             elif elem.tag == 'alias':
                 eras[width_type] = Alias(
                     _translate_alias(['eras', width_type],
@@ -580,7 +560,8 @@ def parse_calendar_periods(data, calendar):
     # AM/PM
     periods = data.setdefault('periods', {})
     for day_period_width in calendar.findall(
-        'dayPeriods/dayPeriodContext/dayPeriodWidth'):
+        'dayPeriods/dayPeriodContext/dayPeriodWidth'
+    ):
         if day_period_width.attrib['type'] == 'wide':
             for day_period in day_period_width.findall('dayPeriod'):
                 if 'alt' not in day_period.attrib:
@@ -613,8 +594,7 @@ def parse_calendar_time_formats(data, calendar):
     for format in calendar.findall('timeFormats'):
         for elem in format.getiterator():
             if elem.tag == 'timeFormatLength':
-                if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                    and elem.attrib.get('type') in time_formats:
+                if ('draft' in elem.attrib or 'alt' in elem.attrib) and elem.attrib.get('type') in time_formats:
                     continue
                 try:
                     time_formats[elem.attrib.get('type')] = \
@@ -634,8 +614,7 @@ def parse_calendar_datetime_skeletons(data, calendar):
     for format in calendar.findall('dateTimeFormats'):
         for elem in format.getiterator():
             if elem.tag == 'dateTimeFormatLength':
-                if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-                    and elem.attrib.get('type') in datetime_formats:
+                if ('draft' in elem.attrib or 'alt' in elem.attrib) and elem.attrib.get('type') in datetime_formats:
                     continue
                 try:
                     datetime_formats[elem.attrib.get('type')] = \
@@ -663,8 +642,7 @@ def parse_number_symbols(data, tree):
 def parse_decimal_formats(data, tree):
     decimal_formats = data.setdefault('decimal_formats', {})
     for elem in tree.findall('.//decimalFormats/decimalFormatLength'):
-        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-            and elem.attrib.get('type') in decimal_formats:
+        if ('draft' in elem.attrib or 'alt' in elem.attrib) and elem.attrib.get('type') in decimal_formats:
             continue
         if elem.findall('./alias'):
             # TODO map the alias to its target
@@ -677,8 +655,7 @@ def parse_decimal_formats(data, tree):
 def parse_scientific_formats(data, tree):
     scientific_formats = data.setdefault('scientific_formats', {})
     for elem in tree.findall('.//scientificFormats/scientificFormatLength'):
-        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-            and elem.attrib.get('type') in scientific_formats:
+        if ('draft' in elem.attrib or 'alt' in elem.attrib) and elem.attrib.get('type') in scientific_formats:
             continue
         pattern = text_type(elem.findtext('scientificFormat/pattern'))
         scientific_formats[elem.attrib.get('type')] = \
@@ -688,8 +665,7 @@ def parse_scientific_formats(data, tree):
 def parse_percent_formats(data, tree):
     percent_formats = data.setdefault('percent_formats', {})
     for elem in tree.findall('.//percentFormats/percentFormatLength'):
-        if ('draft' in elem.attrib or 'alt' in elem.attrib) \
-            and elem.attrib.get('type') in percent_formats:
+        if ('draft' in elem.attrib or 'alt' in elem.attrib) and elem.attrib.get('type') in percent_formats:
             continue
         pattern = text_type(elem.findtext('percentFormat/pattern'))
         percent_formats[elem.attrib.get('type')] = \
@@ -712,8 +688,7 @@ def parse_currency_names(data, tree):
                 currency_names[code] = text_type(name.text)
         # TODO: support choice patterns for currency symbol selection
         symbol = elem.find('symbol')
-        if symbol is not None and 'draft' not in symbol.attrib \
-            and 'choice' not in symbol.attrib:
+        if symbol is not None and 'draft' not in symbol.attrib and 'choice' not in symbol.attrib:
             currency_symbols[code] = text_type(symbol.text)
 
 
@@ -726,8 +701,7 @@ def parse_unit_patterns(data, tree):
             for pattern in unit.findall('unitPattern'):
                 box = unit_type
                 box += ':' + unit_length_type
-                unit_patterns.setdefault(box, {})[pattern.attrib['count']] = \
-                    text_type(pattern.text)
+                unit_patterns.setdefault(box, {})[pattern.attrib['count']] = text_type(pattern.text)
 
 
 def parse_date_fields(data, tree):
@@ -738,8 +712,8 @@ def parse_date_fields(data, tree):
         for rel_time in elem.findall('relativeTime'):
             rel_time_type = rel_time.attrib['type']
             for pattern in rel_time.findall('relativeTimePattern'):
-                date_fields[field_type].setdefault(rel_time_type, {}) \
-                    [pattern.attrib['count']] = text_type(pattern.text)
+                type_dict = date_fields[field_type].setdefault(rel_time_type, {})
+                type_dict[pattern.attrib['count']] = text_type(pattern.text)
 
 
 def parse_interval_formats(data, tree):

From cdeb2d0a8ce5cce1b7bda28b2491163071fd0f79 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 15 Feb 2016 19:57:46 +0200
Subject: [PATCH 220/489] import_cldr: separate argument parsing from
 processing

---
 scripts/import_cldr.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 0c7a99381..2cea01bf1 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -26,7 +26,12 @@
         from xml.etree import ElementTree
 
 # Make sure we're using Babel source, and not some previously installed version
-sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), '..'))
+CHECKOUT_ROOT = os.path.abspath(os.path.join(
+    os.path.dirname(__file__),
+    '..'
+))
+BABEL_PACKAGE_ROOT = os.path.join(CHECKOUT_ROOT, "babel")
+sys.path.insert(0, CHECKOUT_ROOT)
 
 from babel import dates, numbers
 from babel._compat import pickle, text_type
@@ -156,14 +161,15 @@ def main():
     options, args = parser.parse_args()
     if len(args) != 1:
         parser.error('incorrect number of arguments')
-    force = bool(options.force)
-    dump_json = bool(options.dump_json)
-    srcdir = args[0]
-    destdir = os.path.join(
-        os.path.dirname(os.path.abspath(sys.argv[0])),
-        '..', 'babel'
+    return process_data(
+        srcdir=args[0],
+        destdir=BABEL_PACKAGE_ROOT,
+        force=bool(options.force),
+        dump_json=bool(options.dump_json)
     )
 
+
+def process_data(srcdir, destdir, force=False, dump_json=False):
     sup_filename = os.path.join(srcdir, 'supplemental', 'supplementalData.xml')
     sup = parse(sup_filename)
 

From 23d703c1d99a0527b09c7e840081ff2142ad72a7 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 15 Feb 2016 19:59:29 +0200
Subject: [PATCH 221/489] import_cldr: Use parentheses instead of backslashes
 to continue lines

---
 scripts/import_cldr.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 2cea01bf1..320091554 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -209,11 +209,9 @@ def parse_global(srcdir, sup):
     _zone_territory_map = {}
     for map_zone in sup_windows_zones.findall('.//windowsZones/mapTimezones/mapZone'):
         if map_zone.attrib.get('territory') == '001':
-            win_mapping[map_zone.attrib['other']] = \
-                map_zone.attrib['type'].split()[0]
+            win_mapping[map_zone.attrib['other']] = map_zone.attrib['type'].split()[0]
         for tzid in text_type(map_zone.attrib['type']).split():
-            _zone_territory_map[tzid] = \
-                text_type(map_zone.attrib['territory'])
+            _zone_territory_map[tzid] = text_type(map_zone.attrib['territory'])
     for key_elem in bcp47_timezone.findall('.//keyword/key'):
         if key_elem.attrib['name'] == 'tz':
             for elem in key_elem.findall('type'):
@@ -245,8 +243,7 @@ def parse_global(srcdir, sup):
 
     # Territory aliases
     for alias in sup_metadata.findall('.//alias/territoryAlias'):
-        territory_aliases[alias.attrib['type']] = \
-            alias.attrib['replacement'].split()
+        territory_aliases[alias.attrib['type']] = alias.attrib['replacement'].split()
 
     # Script aliases
     for alias in sup_metadata.findall('.//alias/scriptAlias'):
@@ -260,8 +257,7 @@ def parse_global(srcdir, sup):
 
     # Likely subtags
     for likely_subtag in sup_likely.findall('.//likelySubtags/likelySubtag'):
-        likely_subtags[likely_subtag.attrib['from']] = \
-            likely_subtag.attrib['to']
+        likely_subtags[likely_subtag.attrib['from']] = likely_subtag.attrib['to']
 
     # Currencies in territories
     for region in sup.findall('.//currencyData/region'):

From 3c19bc166e5478ac7eb184ebbf764f9beebf511a Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 15 Feb 2016 19:54:14 +0200
Subject: [PATCH 222/489] import_cldr: further DRY out draft/alt skipping

Thanks for the idea, @jtwang!
---
 scripts/import_cldr.py | 98 +++++++++++++++++++++++++++---------------
 1 file changed, 64 insertions(+), 34 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 320091554..5ffcbfcb5 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -397,11 +397,37 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
         write_datafile(data_filename, data, dump_json=dump_json)
 
 
+def _should_skip_elem(elem, type=None, dest=None):
+    """
+    Check whether the given element should be skipped.
+
+    Elements are skipped if they are drafts or alternates of data that already exists in `dest`.
+
+    :param elem: XML element
+    :param type: Type string. May be elided if the dest dict is elided.
+    :param dest: Destination dict. May be elided to skip the dict check.
+    :return: skip boolean
+    """
+    if 'draft' in elem.attrib or 'alt' in elem.attrib:
+        if dest is None or type in dest:
+            return True
+
+
 def _import_type_text(dest, elem, type=None):
-    # An utility to ignore drafts or alternates.
+    """
+    Conditionally import the element's inner text(s) into the `dest` dict.
+
+    The condition being, namely, that the element isn't a draft/alternate version
+    of a pre-existing element.
+
+    :param dest: Destination dict
+    :param elem: XML element.
+    :param type: Override type. (By default, the `type` attr of the element.)
+    :return:
+    """
     if type is None:
         type = elem.attrib['type']
-    if ('draft' in elem.attrib or 'alt' in elem.attrib) and type in dest:
+    if _should_skip_elem(elem, type, dest):
         return
     dest[type] = _text(elem)
 
@@ -448,22 +474,24 @@ def parse_dates(data, tree, sup, regions, territory):
             week_data['weekend_end'] = weekdays[elem.attrib['day']]
     zone_formats = data.setdefault('zone_formats', {})
     for elem in tree.findall('.//timeZoneNames/gmtFormat'):
-        if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
+        if not _should_skip_elem(elem):
             zone_formats['gmt'] = text_type(elem.text).replace('{0}', '%s')
             break
     for elem in tree.findall('.//timeZoneNames/regionFormat'):
-        if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
+        if not _should_skip_elem(elem):
             zone_formats['region'] = text_type(elem.text).replace('{0}', '%s')
             break
     for elem in tree.findall('.//timeZoneNames/fallbackFormat'):
-        if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
-            zone_formats['fallback'] = text_type(elem.text) \
-                .replace('{0}', '%(0)s').replace('{1}', '%(1)s')
+        if not _should_skip_elem(elem):
+            zone_formats['fallback'] = (
+                text_type(elem.text).replace('{0}', '%(0)s').replace('{1}', '%(1)s')
+            )
             break
     for elem in tree.findall('.//timeZoneNames/fallbackRegionFormat'):
-        if 'draft' not in elem.attrib and 'alt' not in elem.attrib:
-            zone_formats['fallback_region'] = text_type(elem.text) \
-                .replace('{0}', '%(0)s').replace('{1}', '%(1)s')
+        if not _should_skip_elem(elem):
+            zone_formats['fallback_region'] = (
+                text_type(elem.text).replace('{0}', '%(0)s').replace('{1}', '%(1)s')
+            )
             break
     time_zones = data.setdefault('time_zones', {})
     for elem in tree.findall('.//timeZoneNames/zone'):
@@ -576,13 +604,13 @@ def parse_calendar_date_formats(data, calendar):
     for format in calendar.findall('dateFormats'):
         for elem in format.getiterator():
             if elem.tag == 'dateFormatLength':
-                if 'draft' in elem.attrib and \
-                        elem.attrib.get('type') in date_formats:
+                type = elem.attrib.get('type')
+                if _should_skip_elem(elem, type, date_formats):
                     continue
                 try:
-                    date_formats[elem.attrib.get('type')] = \
-                        dates.parse_pattern(text_type(
-                            elem.findtext('dateFormat/pattern')))
+                    date_formats[type] = dates.parse_pattern(
+                        text_type(elem.findtext('dateFormat/pattern'))
+                    )
                 except ValueError as e:
                     error(e)
             elif elem.tag == 'alias':
@@ -596,12 +624,13 @@ def parse_calendar_time_formats(data, calendar):
     for format in calendar.findall('timeFormats'):
         for elem in format.getiterator():
             if elem.tag == 'timeFormatLength':
-                if ('draft' in elem.attrib or 'alt' in elem.attrib) and elem.attrib.get('type') in time_formats:
+                type = elem.attrib.get('type')
+                if _should_skip_elem(elem, type, time_formats):
                     continue
                 try:
-                    time_formats[elem.attrib.get('type')] = \
-                        dates.parse_pattern(text_type(
-                            elem.findtext('timeFormat/pattern')))
+                    time_formats[type] = dates.parse_pattern(
+                        text_type(elem.findtext('timeFormat/pattern'))
+                    )
                 except ValueError as e:
                     error(e)
             elif elem.tag == 'alias':
@@ -616,11 +645,11 @@ def parse_calendar_datetime_skeletons(data, calendar):
     for format in calendar.findall('dateTimeFormats'):
         for elem in format.getiterator():
             if elem.tag == 'dateTimeFormatLength':
-                if ('draft' in elem.attrib or 'alt' in elem.attrib) and elem.attrib.get('type') in datetime_formats:
+                type = elem.attrib.get('type')
+                if _should_skip_elem(elem, type, datetime_formats):
                     continue
                 try:
-                    datetime_formats[elem.attrib.get('type')] = \
-                        text_type(elem.findtext('dateTimeFormat/pattern'))
+                    datetime_formats[type] = text_type(elem.findtext('dateTimeFormat/pattern'))
                 except ValueError as e:
                     error(e)
             elif elem.tag == 'alias':
@@ -629,14 +658,15 @@ def parse_calendar_datetime_skeletons(data, calendar):
                 )
             elif elem.tag == 'availableFormats':
                 for datetime_skeleton in elem.findall('dateFormatItem'):
-                    datetime_skeletons[datetime_skeleton.attrib['id']] = \
+                    datetime_skeletons[datetime_skeleton.attrib['id']] = (
                         dates.parse_pattern(text_type(datetime_skeleton.text))
+                    )
 
 
 def parse_number_symbols(data, tree):
     number_symbols = data.setdefault('number_symbols', {})
     for elem in tree.findall('.//numbers/symbols/*'):
-        if ('draft' in elem.attrib or 'alt' in elem.attrib):
+        if _should_skip_elem(elem):
             continue
         number_symbols[elem.tag] = text_type(elem.text)
 
@@ -644,34 +674,34 @@ def parse_number_symbols(data, tree):
 def parse_decimal_formats(data, tree):
     decimal_formats = data.setdefault('decimal_formats', {})
     for elem in tree.findall('.//decimalFormats/decimalFormatLength'):
-        if ('draft' in elem.attrib or 'alt' in elem.attrib) and elem.attrib.get('type') in decimal_formats:
+        type = elem.attrib.get('type')
+        if _should_skip_elem(elem, type, decimal_formats):
             continue
         if elem.findall('./alias'):
             # TODO map the alias to its target
             continue
         pattern = text_type(elem.findtext('./decimalFormat/pattern'))
-        decimal_formats[elem.attrib.get('type')] = \
-            numbers.parse_pattern(pattern)
+        decimal_formats[type] = numbers.parse_pattern(pattern)
 
 
 def parse_scientific_formats(data, tree):
     scientific_formats = data.setdefault('scientific_formats', {})
     for elem in tree.findall('.//scientificFormats/scientificFormatLength'):
-        if ('draft' in elem.attrib or 'alt' in elem.attrib) and elem.attrib.get('type') in scientific_formats:
+        type = elem.attrib.get('type')
+        if _should_skip_elem(elem, type, scientific_formats):
             continue
         pattern = text_type(elem.findtext('scientificFormat/pattern'))
-        scientific_formats[elem.attrib.get('type')] = \
-            numbers.parse_pattern(pattern)
+        scientific_formats[type] = numbers.parse_pattern(pattern)
 
 
 def parse_percent_formats(data, tree):
     percent_formats = data.setdefault('percent_formats', {})
     for elem in tree.findall('.//percentFormats/percentFormatLength'):
-        if ('draft' in elem.attrib or 'alt' in elem.attrib) and elem.attrib.get('type') in percent_formats:
+        type = elem.attrib.get('type')
+        if _should_skip_elem(elem, type, percent_formats):
             continue
         pattern = text_type(elem.findtext('percentFormat/pattern'))
-        percent_formats[elem.attrib.get('type')] = \
-            numbers.parse_pattern(pattern)
+        percent_formats[type] = numbers.parse_pattern(pattern)
 
 
 def parse_currency_names(data, tree):
@@ -744,7 +774,7 @@ def parse_currency_formats(data, tree):
             if curr_length_type:
                 # Handle `<currencyFormatLength type="short">`, etc.
                 type = '%s:%s' % (type, curr_length_type)
-            if ('draft' in elem.attrib or 'alt' in elem.attrib) and type in currency_formats:
+            if _should_skip_elem(elem, type, currency_formats):
                 continue
             for child in elem.getiterator():
                 if child.tag == 'alias':

From 0bf8cb7711427aa69ef7c9834066eab43d18e460 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kdeldycke@scaleway.com>
Date: Wed, 17 Feb 2016 16:30:56 +0100
Subject: [PATCH 223/489] Unittest locale_identifiers() and exists() bijection.

---
 tests/test_localedata.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 17ecd6392..80dd118c4 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -72,3 +72,7 @@ def test_merge():
     d = {1: 'foo', 3: 'baz'}
     localedata.merge(d, {1: 'Foo', 2: 'Bar'})
     assert d == {1: 'Foo', 2: 'Bar', 3: 'baz'}
+
+def test_locale_identification():
+    for l in localedata.locale_identifiers():
+        assert localedata.exists(l)

From da4f5e818417e94858c643be531f7a388bacf200 Mon Sep 17 00:00:00 2001
From: Lukas Balaga <lukas.balaga@gmail.com>
Date: Sat, 27 Feb 2016 16:30:48 -0800
Subject: [PATCH 224/489] Add pre-commit.

---
 .pre-commit-config.yaml | 16 ++++++++++++++++
 tox.ini                 |  6 ++++++
 2 files changed, 22 insertions(+)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000..2598b5110
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,16 @@
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    sha: 97b88d9610bcc03982ddac33caba98bb2b751f5f
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: autopep8-wrapper
+        exclude: (tests/messages/data/)
+    -   id: check-docstring-first
+    -   id: check-json
+    -   id: check-added-large-files
+    -   id: check-yaml
+    -   id: debug-statements
+    -   id: name-tests-test
+        args: ['--django']
+        exclude: (tests/messages/data/)
+    -   id: requirements-txt-fixer
diff --git a/tox.ini b/tox.ini
index 6f552d8b0..0fa957a73 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,3 +7,9 @@ deps =
     cdecimal: m3-cdecimal
 whitelist_externals = make
 commands = make clean-cldr test
+
+[pep8]
+ignore = E501,E731
+
+[flake8]
+ignore = E501,E731

From 92bb5177b19cc9e99c643c6dc7f9e35331cde2db Mon Sep 17 00:00:00 2001
From: Lukas Balaga <lukas.balaga@gmail.com>
Date: Sat, 27 Feb 2016 16:31:18 -0800
Subject: [PATCH 225/489] Apply pre-commit fixes.

---
 .pre-commit-config.yaml         |   3 +-
 CONTRIBUTING.md                 |   2 +-
 babel/__init__.py               |   2 +-
 babel/dates.py                  |  20 ++--
 babel/languages.py              |   1 -
 babel/localedata.py             |   6 +-
 babel/localtime/__init__.py     |   4 +-
 babel/localtime/_unix.py        |   1 +
 babel/messages/catalog.py       |   6 +-
 babel/messages/extract.py       |  20 ++--
 babel/messages/frontend.py      |   5 +-
 babel/messages/mofile.py        |  22 ++--
 babel/messages/pofile.py        |  21 ++--
 babel/numbers.py                |  36 +++----
 babel/plural.py                 |   6 +-
 babel/support.py                |   6 +-
 babel/util.py                   |  16 +--
 contrib/babel.js                |   4 +-
 scripts/make-release.py         |   1 +
 setup.py                        |   3 +-
 tests/messages/test_catalog.py  |  27 ++---
 tests/messages/test_checkers.py | 112 ++++++++++----------
 tests/messages/test_extract.py  |  34 +++---
 tests/messages/test_frontend.py | 178 ++++++++++++++++----------------
 tests/messages/test_pofile.py   |   6 +-
 tests/test_core.py              |   3 +
 tests/test_dates.py             |  39 +++----
 tests/test_localedata.py        |   1 +
 tests/test_numbers.py           |  57 +++++-----
 tests/test_plural.py            |   4 +-
 tests/test_support.py           |  10 +-
 tests/test_util.py              |   2 +
 32 files changed, 345 insertions(+), 313 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2598b5110..f22634779 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,8 +4,9 @@
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: autopep8-wrapper
-        exclude: (tests/messages/data/)
+        exclude: (docs/conf.py|tests/messages/data/)
     -   id: check-docstring-first
+        exclude: (docs/conf.py)
     -   id: check-json
     -   id: check-added-large-files
     -   id: check-yaml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e492cee95..497627303 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -39,7 +39,7 @@ For a PR to be merged, the following statements must hold true:
   not the author of the PR. Commits shall comply to the "Good Commits" standards
   outlined below.
 
-To begin contributing have a look at the open [easy issues](https://github.com/python-babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow) 
+To begin contributing have a look at the open [easy issues](https://github.com/python-babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow)
 which could be fixed.
 
 ## Correcting PRs
diff --git a/babel/__init__.py b/babel/__init__.py
index d2e52599c..d6b548562 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -18,7 +18,7 @@
 """
 
 from babel.core import UnknownLocaleError, Locale, default_locale, \
-     negotiate_locale, parse_locale, get_locale_identifier
+    negotiate_locale, parse_locale, get_locale_identifier
 
 
 __version__ = '2.2.0.dev0'
diff --git a/babel/dates.py b/babel/dates.py
index 1af9955a5..8e3409403 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -477,7 +477,7 @@ def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME, return_city=False):
     region_format = locale.zone_formats['region']
     territory = get_global('zone_territories').get(zone)
     if territory not in locale.territories:
-        territory = 'ZZ' # invalid/unknown
+        territory = 'ZZ'  # invalid/unknown
     territory_name = locale.territories[territory]
     if not return_city and territory and len(get_global('territory_zones').get(territory, [])) == 1:
         return region_format % (territory_name)
@@ -756,7 +756,7 @@ def format_time(time=None, format='medium', tzinfo=None, locale=LC_TIME):
     if isinstance(time, datetime):
         if tzinfo is not None:
             time = time.astimezone(tzinfo)
-            if hasattr(tzinfo, 'normalize'): # pytz
+            if hasattr(tzinfo, 'normalize'):  # pytz
                 time = tzinfo.normalize(time)
         time = time.timetz()
     elif tzinfo is not None:
@@ -807,11 +807,11 @@ def format_skeleton(skeleton, datetime=None, tzinfo=None, fuzzy=True, locale=LC_
 
 
 TIMEDELTA_UNITS = (
-    ('year',   3600 * 24 * 365),
-    ('month',  3600 * 24 * 30),
-    ('week',   3600 * 24 * 7),
-    ('day',    3600 * 24),
-    ('hour',   3600),
+    ('year', 3600 * 24 * 365),
+    ('month', 3600 * 24 * 30),
+    ('week', 3600 * 24 * 7),
+    ('day', 3600 * 24),
+    ('hour', 3600),
     ('minute', 60),
     ('second', 1)
 )
@@ -1250,7 +1250,7 @@ def format_month(self, char, num):
         return get_month_names(width, context, self.locale)[self.value.month]
 
     def format_week(self, char, num):
-        if char.islower(): # week of year
+        if char.islower():  # week of year
             day_of_year = self.get_day_of_year()
             week = self.get_week_number(day_of_year)
             if week == 0:
@@ -1258,7 +1258,7 @@ def format_week(self, char, num):
                 week = self.get_week_number(self.get_day_of_year(date),
                                             date.weekday())
             return self.format(week, num)
-        else: # week of month
+        else:  # week of month
             week = self.get_week_number(self.value.day)
             if week == 0:
                 date = self.value - timedelta(days=self.value.day)
@@ -1292,7 +1292,7 @@ def format_frac_seconds(self, num):
 
     def format_milliseconds_in_day(self, num):
         msecs = self.value.microsecond // 1000 + self.value.second * 1000 + \
-                self.value.minute * 60000 + self.value.hour * 3600000
+            self.value.minute * 60000 + self.value.hour * 3600000
         return self.format(msecs, num)
 
     def format_timezone(self, char, num):
diff --git a/babel/languages.py b/babel/languages.py
index a7708712e..40f5d9828 100644
--- a/babel/languages.py
+++ b/babel/languages.py
@@ -42,7 +42,6 @@ def get_official_languages(territory, regional=False, de_facto=False):
     return tuple(lang for _, lang in pairs)
 
 
-
 def get_territory_language_info(territory):
     """
     Get a dictionary of language information for a territory.
diff --git a/babel/localedata.py b/babel/localedata.py
index 437f49fae..985e743bf 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -190,13 +190,13 @@ def __iter__(self):
 
     def __getitem__(self, key):
         orig = val = self._data[key]
-        if isinstance(val, Alias): # resolve an alias
+        if isinstance(val, Alias):  # resolve an alias
             val = val.resolve(self.base)
-        if isinstance(val, tuple): # Merge a partial dict with an alias
+        if isinstance(val, tuple):  # Merge a partial dict with an alias
             alias, others = val
             val = alias.resolve(self.base).copy()
             merge(val, others)
-        if type(val) is dict: # Return a nested alias-resolving dict
+        if type(val) is dict:  # Return a nested alias-resolving dict
             val = LocaleDataDict(val, base=self.base)
         if val is not orig:
             self._data[key] = val
diff --git a/babel/localtime/__init__.py b/babel/localtime/__init__.py
index 4cab2364e..883ff1661 100644
--- a/babel/localtime/__init__.py
+++ b/babel/localtime/__init__.py
@@ -26,9 +26,9 @@
 _cached_tz = None
 _cache_lock = RLock()
 
-STDOFFSET = timedelta(seconds = -time.timezone)
+STDOFFSET = timedelta(seconds=-time.timezone)
 if time.daylight:
-    DSTOFFSET = timedelta(seconds = -time.altzone)
+    DSTOFFSET = timedelta(seconds=-time.altzone)
 else:
     DSTOFFSET = STDOFFSET
 
diff --git a/babel/localtime/_unix.py b/babel/localtime/_unix.py
index b4a3b599f..378a90b43 100644
--- a/babel/localtime/_unix.py
+++ b/babel/localtime/_unix.py
@@ -27,6 +27,7 @@ def _tz_from_env(tzenv):
             "tzlocal() does not support non-zoneinfo timezones like %s. \n"
             "Please use a timezone in the form of Continent/City")
 
+
 def _get_localzone(_root='/'):
     """Tries to find the local timezone configuration.
     This method prefers finding the timezone name and passing that to pytz,
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index ca4a5680c..8c807f8fc 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -378,8 +378,8 @@ def _get_mime_headers(self):
             headers.append(('Language', str(self.locale)))
         if (self.locale is not None) and ('LANGUAGE' in self.language_team):
             headers.append(('Language-Team',
-                           self.language_team.replace('LANGUAGE',
-                                                      str(self.locale))))
+                            self.language_team.replace('LANGUAGE',
+                                                       str(self.locale))))
         else:
             headers.append(('Language-Team', self.language_team))
         if self.locale is not None:
@@ -779,7 +779,7 @@ def _merge(message, oldkey, newkey):
                     if no_fuzzy_matching is False:
                         # do some fuzzy matching with difflib
                         if isinstance(key, tuple):
-                            matchkey = key[0] # just the msgid, no context
+                            matchkey = key[0]  # just the msgid, no context
                         else:
                             matchkey = key
                         matches = get_close_matches(matchkey.lower().strip(),
diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index c2dcd5b99..b383bdb22 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -45,8 +45,8 @@
 DEFAULT_MAPPING = [('**.py', 'python')]
 
 empty_msgid_warning = (
-'%s: warning: Empty msgid.  It is reserved by GNU gettext: gettext("") '
-'returns the header entry with meta information, not the empty string.')
+    '%s: warning: Empty msgid.  It is reserved by GNU gettext: gettext("") '
+    'returns the header entry with meta information, not the empty string.')
 
 
 def _strip_comment_tags(comments, tags):
@@ -354,8 +354,8 @@ def extract(method, fileobj, keywords=DEFAULT_KEYWORDS, comment_tags=(),
             first_msg_index = spec[0] - 1
         if not messages[first_msg_index]:
             # An empty string msgid isn't valid, emit a warning
-            where = '%s:%i' % (hasattr(fileobj, 'name') and \
-                                   fileobj.name or '(unknown)', lineno)
+            where = '%s:%i' % (hasattr(fileobj, 'name') and
+                               fileobj.name or '(unknown)', lineno)
             sys.stderr.write((empty_msgid_warning % where) + '\n')
             continue
 
@@ -471,7 +471,7 @@ def extract_python(fileobj, keywords, comment_tags, options):
                 # https://sourceforge.net/tracker/?func=detail&atid=355470&
                 # aid=617979&group_id=5470
                 value = eval('# coding=%s\n%s' % (str(encoding), value),
-                             {'__builtins__':{}}, {})
+                             {'__builtins__': {}}, {})
                 if PY2 and not isinstance(value, text_type):
                     value = value.decode(encoding)
                 buf.append(value)
@@ -487,7 +487,7 @@ def extract_python(fileobj, keywords, comment_tags, options):
                     # Let's increase the last comment's lineno in order
                     # for the comment to still be a valid one
                     old_lineno, old_comment = translator_comments.pop()
-                    translator_comments.append((old_lineno+1, old_comment))
+                    translator_comments.append((old_lineno + 1, old_comment))
         elif call_stack > 0 and tok == OP and value == ')':
             call_stack -= 1
         elif funcname and call_stack == -1:
@@ -597,16 +597,16 @@ def extract_javascript(fileobj, keywords, comment_tags, options):
                     concatenate_next = True
 
         elif call_stack > 0 and token.type == 'operator' \
-             and token.value == ')':
+                and token.value == ')':
             call_stack -= 1
 
         elif funcname and call_stack == -1:
             funcname = None
 
         elif call_stack == -1 and token.type == 'name' and \
-             token.value in keywords and \
-             (last_token is None or last_token.type != 'name' or
-              last_token.value != 'function'):
+            token.value in keywords and \
+            (last_token is None or last_token.type != 'name' or
+             last_token.value != 'function'):
             funcname = token.value
 
         last_token = token
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 9bb46bbce..3cacec9d3 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -398,7 +398,6 @@ def callback(filename, method, options):
                     catalog.add(message, None, [(filepath, lineno)],
                                 auto_comments=comments, context=context)
 
-
             self.log.info('writing PO template file to %s' % self.output_file)
             write_po(outfile, catalog, width=self.width,
                      no_location=self.no_location,
@@ -710,8 +709,8 @@ class CommandLineInterface(object):
     commands = {
         'compile': 'compile message catalogs to MO files',
         'extract': 'extract messages from source files and generate a POT file',
-        'init':    'create new message catalogs from a POT file',
-        'update':  'update existing message catalogs from a POT file'
+        'init': 'create new message catalogs from a POT file',
+        'update': 'update existing message catalogs from a POT file'
     }
 
     command_classes = {
diff --git a/babel/messages/mofile.py b/babel/messages/mofile.py
index 2ab96d523..79042e003 100644
--- a/babel/messages/mofile.py
+++ b/babel/messages/mofile.py
@@ -41,7 +41,7 @@ def read_mo(fileobj):
 
     # Parse the .mo file header, which consists of 5 little endian 32
     # bit words.
-    magic = unpack('<I', buf[:4])[0] # Are we big endian or little endian?
+    magic = unpack('<I', buf[:4])[0]  # Are we big endian or little endian?
     if magic == LE_MAGIC:
         version, msgcount, origidx, transidx = unpack('<4I', buf[4:20])
         ii = '<II'
@@ -79,12 +79,12 @@ def read_mo(fileobj):
                 elif lastkey:
                     headers[lastkey] += b'\n' + item
 
-        if b'\x04' in msg: # context
+        if b'\x04' in msg:  # context
             ctxt, msg = msg.split(b'\x04')
         else:
             ctxt = None
 
-        if b'\x00' in msg: # plural forms
+        if b'\x00' in msg:  # plural forms
             msg = msg.split(b'\x00')
             tmsg = tmsg.split(b'\x00')
             if catalog.charset:
@@ -184,7 +184,7 @@ def write_mo(fileobj, catalog, use_fuzzy=False):
                 msgstr = message.string.encode(catalog.charset)
         if message.context:
             msgid = b'\x04'.join([message.context.encode(catalog.charset),
-                                 msgid])
+                                  msgid])
         offsets.append((len(ids), len(msgid), len(strs), len(msgstr)))
         ids += msgid + b'\x00'
         strs += msgstr + b'\x00'
@@ -204,10 +204,10 @@ def write_mo(fileobj, catalog, use_fuzzy=False):
     offsets = koffsets + voffsets
 
     fileobj.write(struct.pack('Iiiiiii',
-        LE_MAGIC,                   # magic
-        0,                          # version
-        len(messages),              # number of entries
-        7 * 4,                      # start of key index
-        7 * 4 + len(messages) * 8,  # start of value index
-        0, 0                        # size and offset of hash table
-    ) + array_tobytes(array.array("i", offsets)) + ids + strs)
+                              LE_MAGIC,                   # magic
+                              0,                          # version
+                              len(messages),              # number of entries
+                              7 * 4,                      # start of key index
+                              7 * 4 + len(messages) * 8,  # start of value index
+                              0, 0                        # size and offset of hash table
+                              ) + array_tobytes(array.array("i", offsets)) + ids + strs)
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 1fb2c1c3d..00a21f49f 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -163,8 +163,13 @@ def _add_message():
                 catalog.obsolete[msgid] = message
         else:
             catalog[msgid] = message
-        del messages[:]; del translations[:]; del context[:]; del locations[:];
-        del flags[:]; del auto_comments[:]; del user_comments[:];
+        del messages[:]
+        del translations[:]
+        del context[:]
+        del locations[:]
+        del flags[:]
+        del auto_comments[:]
+        del user_comments[:]
         obsolete[0] = False
         counter[0] += 1
 
@@ -230,7 +235,7 @@ def _process_message_line(lineno, line):
             elif line[1:].startswith('.'):
                 # These are called auto-comments
                 comment = line[2:].strip()
-                if comment: # Just check that we're not adding empty comments
+                if comment:  # Just check that we're not adding empty comments
                     auto_comments.append(comment)
             else:
                 # These are called user comments
@@ -252,10 +257,10 @@ def _process_message_line(lineno, line):
 
 
 WORD_SEP = re.compile('('
-    r'\s+|'                                 # any whitespace
-    r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|' # hyphenated words
-    r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w)'   # em-dash
-')')
+                      r'\s+|'                                 # any whitespace
+                      r'[^\s\w]*\w+[a-zA-Z]-(?=\w+[a-zA-Z])|'  # hyphenated words
+                      r'(?<=[\w\!\"\'\&\.\,\?])-{2,}(?=\w)'   # em-dash
+                      ')')
 
 
 def escape(string):
@@ -434,7 +439,7 @@ def _write_message(message, prefix=''):
         sort_by = "location"
 
     for message in _sort_messages(catalog, sort_by=sort_by):
-        if not message.id: # This is the header "message"
+        if not message.id:  # This is the header "message"
             if omit_header:
                 continue
             comment_header = catalog.header_comment
diff --git a/babel/numbers.py b/babel/numbers.py
index e4b3e8ee4..c4a2b2031 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -137,8 +137,8 @@ def _is_active(start, end):
             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 ((is_tender and tender) or
+                (not is_tender and non_tender)) and _is_active(start, end):
             if include_details:
                 result.append({
                     'currency': currency_code,
@@ -438,7 +438,7 @@ def parse_decimal(string, locale=LC_NUMERIC):
     locale = Locale.parse(locale)
     try:
         return Decimal(string.replace(get_group_symbol(locale), '')
-                           .replace(get_decimal_symbol(locale), '.'))
+                       .replace(get_decimal_symbol(locale), '.'))
     except InvalidOperation:
         raise NumberFormatError('%r is not a valid decimal number' % string)
 
@@ -528,7 +528,7 @@ def parse_precision(p):
     int_prec = parse_precision(integer)
     frac_prec = parse_precision(fraction)
     if exp:
-        frac_prec = parse_precision(integer+fraction)
+        frac_prec = parse_precision(integer + fraction)
         exp_plus = exp.startswith('+')
         exp = exp.lstrip('+')
         exp_prec = parse_precision(exp)
@@ -570,7 +570,7 @@ def apply(self, value, locale, currency=None, force_frac=None):
             value = Decimal(str(value))
         value = value.scaleb(self.scale)
         is_negative = int(value.is_signed())
-        if self.exp_prec: # Scientific notation
+        if self.exp_prec:  # Scientific notation
             exp = value.adjusted()
             value = abs(value)
             # Minimum number of integer digits
@@ -590,11 +590,11 @@ def apply(self, value, locale, currency=None, force_frac=None):
                 exp_sign = get_plus_sign_symbol(locale)
             exp = abs(exp)
             number = u'%s%s%s%s' % \
-                 (self._format_significant(value, frac_prec[0], frac_prec[1]),
-                  get_exponential_symbol(locale),  exp_sign,
-                  self._format_int(str(exp), self.exp_prec[0],
-                                   self.exp_prec[1], locale))
-        elif '@' in self.pattern: # Is it a siginificant digits pattern?
+                (self._format_significant(value, frac_prec[0], frac_prec[1]),
+                 get_exponential_symbol(locale), exp_sign,
+                 self._format_int(str(exp), self.exp_prec[0],
+                                  self.exp_prec[1], locale))
+        elif '@' in self.pattern:  # Is it a siginificant digits pattern?
             text = self._format_significant(abs(value),
                                             self.int_prec[0],
                                             self.int_prec[1])
@@ -602,7 +602,7 @@ def apply(self, value, locale, currency=None, force_frac=None):
             number = self._format_int(a, 0, 1000, locale)
             if sep:
                 number += get_decimal_symbol(locale) + b
-        else: # A normal number pattern
+        else:  # A normal number pattern
             precision = Decimal('1.' + '1' * frac_prec[1])
             rounded = value.quantize(precision, ROUND_HALF_EVEN)
             a, sep, b = str(abs(rounded)).partition(".")
@@ -610,10 +610,10 @@ def apply(self, value, locale, currency=None, force_frac=None):
                                        self.int_prec[1], locale) +
                       self._format_frac(b or '0', locale, force_frac))
         retval = u'%s%s%s' % (self.prefix[is_negative], number,
-                                self.suffix[is_negative])
+                              self.suffix[is_negative])
         if u'¤' in retval:
             retval = retval.replace(u'¤¤¤',
-                get_currency_name(currency, value, locale))
+                                    get_currency_name(currency, value, locale))
             retval = retval.replace(u'¤¤', currency.upper())
             retval = retval.replace(u'¤', get_currency_symbol(currency, locale))
         return retval
@@ -649,11 +649,11 @@ def _format_significant(self, value, minimum, maximum):
             i = len(intpart)
             j = i + max(minimum - i, 0)
             result = "{intpart}.{pad:0<{fill}}{fracpart}{fracextra}".format(
-                    intpart=intpart or '0',
-                    pad='',
-                    fill=-min(exp + 1, 0),
-                    fracpart=digits[i:j],
-                    fracextra=digits[j:].rstrip('0'),
+                intpart=intpart or '0',
+                pad='',
+                fill=-min(exp + 1, 0),
+                fracpart=digits[i:j],
+                fracextra=digits[j:].rstrip('0'),
             ).rstrip('.')
         return result
 
diff --git a/babel/plural.py b/babel/plural.py
index 9cb1d5cc6..980629dcc 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -186,9 +186,9 @@ def to_python(rule):
     :raise RuleError: if the expression is malformed
     """
     namespace = {
-        'IN':       in_range_list,
-        'WITHIN':   within_range_list,
-        'MOD':      cldr_modulo,
+        'IN': in_range_list,
+        'WITHIN': within_range_list,
+        'MOD': cldr_modulo,
         'extract_operands': extract_operands,
     }
     to_python_func = _PythonCompiler().compile
diff --git a/babel/support.py b/babel/support.py
index e803138e0..24bc9aaa1 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -17,9 +17,9 @@
 
 from babel.core import Locale
 from babel.dates import format_date, format_datetime, format_time, \
-     format_timedelta
+    format_timedelta
 from babel.numbers import format_number, format_decimal, format_currency, \
-     format_percent, format_scientific
+    format_percent, format_scientific
 from babel._compat import PY2, text_type, text_to_native
 
 
@@ -340,7 +340,7 @@ def udngettext(self, domain, singular, plural, num):
         """
         return self._domains.get(domain, self).ungettext(singular, plural, num)
     # backward compatibility with 0.9
-    dungettext  = udngettext
+    dungettext = udngettext
 
     # Most of the downwards code, until it get's included in stdlib, from:
     #    http://bugs.python.org/file10036/gettext-pgettext.patch
diff --git a/babel/util.py b/babel/util.py
index 54f7d2db0..c0a94172c 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -41,6 +41,8 @@ def distinct(iterable):
 # Regexp to match python magic encoding line
 PYTHON_MAGIC_COMMENT_re = re.compile(
     br'[ \t\f]* \# .* coding[=:][ \t]*([-\w.]+)', re.VERBOSE)
+
+
 def parse_encoding(fp):
     """Deduce the encoding of a source file from magic comment.
 
@@ -90,6 +92,7 @@ def parse_encoding(fp):
     finally:
         fp.seek(pos)
 
+
 def pathmatch(pattern, filename):
     """Extended pathname pattern matching.
 
@@ -119,12 +122,12 @@ def pathmatch(pattern, filename):
     :param filename: the path name of the file to match against
     """
     symbols = {
-        '?':   '[^/]',
-        '?/':  '[^/]/',
-        '*':   '[^/]+',
-        '*/':  '[^/]+/',
+        '?': '[^/]',
+        '?/': '[^/]/',
+        '*': '[^/]+',
+        '*/': '[^/]+/',
         '**/': '(?:.+/)*?',
-        '**':  '(?:.+/)*?[^/]+',
+        '**': '(?:.+/)*?[^/]+',
     }
     buf = []
     for idx, part in enumerate(re.split('([?*]+/?)', pattern)):
@@ -165,6 +168,7 @@ class odict(dict):
 
     :see: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/107747
     """
+
     def __init__(self, data=None):
         dict.__init__(self, data or {})
         self._keys = list(dict.keys(self))
@@ -216,7 +220,7 @@ def popitem(self, key):
         self._keys.remove(key)
         return dict.popitem(key)
 
-    def setdefault(self, key, failobj = None):
+    def setdefault(self, key, failobj=None):
         dict.setdefault(self, key, failobj)
         if key not in self._keys:
             self._keys.append(key)
diff --git a/contrib/babel.js b/contrib/babel.js
index 8ebab9793..506efeb84 100644
--- a/contrib/babel.js
+++ b/contrib/babel.js
@@ -138,7 +138,7 @@ var babel = new function() {
    *
    *    babel.format(_('Hello %s'), name)
    *    babel.format(_('Progress: %(percent)s%%'), {percent: 100})
-   */ 
+   */
   this.format = function() {
     var arg, string = arguments[0], idx = 0;
     if (arguments.length == 1)
@@ -153,7 +153,7 @@ var babel = new function() {
     return string.replace(formatRegex, function(all, name, type) {
       if (all[0] == all[1]) return all.substring(1);
       var value = arg[name || idx++];
-      return (type == 'i' || type == 'd') ? +value : value; 
+      return (type == 'i' || type == 'd') ? +value : value;
     });
   }
 
diff --git a/scripts/make-release.py b/scripts/make-release.py
index 463ab2883..a695da2e9 100755
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -63,6 +63,7 @@ def parse_date(string):
 
 def set_filename_version(filename, version_number, pattern):
     changed = []
+
     def inject_version(match):
         before, old, after = match.groups()
         changed.append(True)
diff --git a/setup.py b/setup.py
index 85c8b6d19..146f38dc4 100755
--- a/setup.py
+++ b/setup.py
@@ -31,8 +31,7 @@ def run(self):
     name='Babel',
     version=__version__,
     description='Internationalization utilities',
-    long_description=\
-"""A collection of tools for internationalizing Python applications.""",
+    long_description="""A collection of tools for internationalizing Python applications.""",
     author='Armin Ronacher',
     author_email='armin.ronacher@active-4.com',
     license='BSD',
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index 3eeaf64ec..5194a783a 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -44,9 +44,9 @@ def test_translator_comments(self):
         self.assertEqual(mess.user_comments, ['Comment About `foo`'])
         mess = catalog.Message('foo',
                                auto_comments=['Comment 1 About `foo`',
-                                         'Comment 2 About `foo`'])
+                                              'Comment 2 About `foo`'])
         self.assertEqual(mess.auto_comments, ['Comment 1 About `foo`',
-                                         'Comment 2 About `foo`'])
+                                              'Comment 2 About `foo`'])
 
     def test_clone_message_object(self):
         msg = catalog.Message('foo', locations=[('foo.py', 42)])
@@ -58,6 +58,7 @@ def test_clone_message_object(self):
 
 
 class CatalogTestCase(unittest.TestCase):
+
     def test_add_returns_message_instance(self):
         cat = catalog.Catalog()
         message = cat.add('foo')
@@ -254,7 +255,7 @@ def test_update_po_updates_pot_creation_date(self):
         self.assertEqual(template.creation_date,
                          localized_catalog.creation_date)
         template.creation_date = datetime.datetime.now() - \
-                                                datetime.timedelta(minutes=5)
+            datetime.timedelta(minutes=5)
         localized_catalog.update(template)
         self.assertEqual(template.creation_date,
                          localized_catalog.creation_date)
@@ -270,7 +271,7 @@ def test_update_po_keeps_po_revision_date(self):
         self.assertEqual(template.creation_date,
                          localized_catalog.creation_date)
         template.creation_date = datetime.datetime.now() - \
-                                                datetime.timedelta(minutes=5)
+            datetime.timedelta(minutes=5)
         localized_catalog.update(template)
         self.assertEqual(localized_catalog.revision_date, fake_rev_date)
 
@@ -278,8 +279,8 @@ def test_stores_datetime_correctly(self):
         localized = catalog.Catalog()
         localized.locale = 'de_DE'
         localized[''] = catalog.Message('',
-                       "POT-Creation-Date: 2009-03-09 15:47-0700\n" +
-                       "PO-Revision-Date: 2009-03-09 15:47-0700\n")
+                                        "POT-Creation-Date: 2009-03-09 15:47-0700\n" +
+                                        "PO-Revision-Date: 2009-03-09 15:47-0700\n")
         for key, value in localized.mime_headers:
             if key in ('POT-Creation-Date', 'PO-Revision-Date'):
                 self.assertEqual(value, '2009-03-09 15:47-0700')
@@ -287,10 +288,10 @@ def test_stores_datetime_correctly(self):
     def test_mime_headers_contain_same_information_as_attributes(self):
         cat = catalog.Catalog()
         cat[''] = catalog.Message('',
-                      "Last-Translator: Foo Bar <foo.bar@example.com>\n" +
-                      "Language-Team: de <de@example.com>\n" +
-                      "POT-Creation-Date: 2009-03-01 11:20+0200\n" +
-                      "PO-Revision-Date: 2009-03-09 15:47-0700\n")
+                                  "Last-Translator: Foo Bar <foo.bar@example.com>\n" +
+                                  "Language-Team: de <de@example.com>\n" +
+                                  "POT-Creation-Date: 2009-03-01 11:20+0200\n" +
+                                  "PO-Revision-Date: 2009-03-09 15:47-0700\n")
         self.assertEqual(None, cat.locale)
         mime_headers = dict(cat.mime_headers)
 
@@ -313,10 +314,12 @@ def test_message_fuzzy():
     assert msg.fuzzy
     assert msg.id == 'foo'
 
+
 def test_message_pluralizable():
     assert not catalog.Message('foo').pluralizable
     assert catalog.Message(('foo', 'bar')).pluralizable
 
+
 def test_message_python_format():
     assert catalog.Message('foo %(name)s bar').python_format
     assert catalog.Message(('foo %(name)s', 'foo %(name)s')).python_format
@@ -329,7 +332,7 @@ def test_catalog():
         '# Translations template for Foobar.\n'
         '# Copyright (C) %(year)d Foo Company\n'
         '# This file is distributed under the same '
-            'license as the Foobar project.\n'
+        'license as the Foobar project.\n'
         '# FIRST AUTHOR <EMAIL@ADDRESS>, %(year)d.\n'
         '#') % {'year': datetime.date.today().year}
 
@@ -436,7 +439,7 @@ def test_catalog_update():
     cat.add('blue', u'blau', locations=[('main.py', 98)])
     cat.add('head', u'Kopf', locations=[('util.py', 33)])
     cat.add(('salad', 'salads'), (u'Salat', u'Salate'),
-                locations=[('util.py', 38)])
+            locations=[('util.py', 38)])
 
     cat.update(template)
     assert len(cat) == 3
diff --git a/tests/messages/test_checkers.py b/tests/messages/test_checkers.py
index b954acba7..e9c34bcb7 100644
--- a/tests/messages/test_checkers.py
+++ b/tests/messages/test_checkers.py
@@ -67,15 +67,15 @@ def test_1_num_plurals_checkers(self):
 msgid_plural "foobars"
 msgstr[0] ""
 
-""" % dict(locale       = _locale,
-           english_name = locale.english_name,
-           version      = VERSION,
-           year         = time.strftime('%Y'),
-           date         = format_datetime(datetime.now(LOCALTZ),
-                                          'yyyy-MM-dd HH:mmZ',
-                                          tzinfo=LOCALTZ, locale=_locale),
-           num_plurals  = PLURALS[_locale][0],
-           plural_expr  = PLURALS[_locale][0])).encode('utf-8')
+""" % dict(locale=_locale,
+                english_name=locale.english_name,
+                version=VERSION,
+                year=time.strftime('%Y'),
+                date=format_datetime(datetime.now(LOCALTZ),
+                                     'yyyy-MM-dd HH:mmZ',
+                                     tzinfo=LOCALTZ, locale=_locale),
+                num_plurals=PLURALS[_locale][0],
+                plural_expr=PLURALS[_locale][0])).encode('utf-8')
 
             # This test will fail for revisions <= 406 because so far
             # catalog.num_plurals was neglected
@@ -89,11 +89,11 @@ def test_2_num_plurals_checkers(self):
         for _locale in [p for p in PLURALS if PLURALS[p][0] == 2]:
             if _locale in ['nn', 'no']:
                 _locale = 'nn_NO'
-                num_plurals  = PLURALS[_locale.split('_')[0]][0]
-                plural_expr  = PLURALS[_locale.split('_')[0]][1]
+                num_plurals = PLURALS[_locale.split('_')[0]][0]
+                plural_expr = PLURALS[_locale.split('_')[0]][1]
             else:
-                num_plurals  = PLURALS[_locale][0]
-                plural_expr  = PLURALS[_locale][1]
+                num_plurals = PLURALS[_locale][0]
+                plural_expr = PLURALS[_locale][1]
             try:
                 locale = Locale(_locale)
                 date = format_datetime(datetime.now(LOCALTZ),
@@ -136,13 +136,13 @@ def test_2_num_plurals_checkers(self):
 msgstr[1] ""
 msgstr[2] ""
 
-""" % dict(locale       = _locale,
-           english_name = locale.english_name,
-           version      = VERSION,
-           year         = time.strftime('%Y'),
-           date         = date,
-           num_plurals  = num_plurals,
-           plural_expr  = plural_expr)).encode('utf-8')
+""" % dict(locale=_locale,
+                english_name=locale.english_name,
+                version=VERSION,
+                year=time.strftime('%Y'),
+                date=date,
+                num_plurals=num_plurals,
+                plural_expr=plural_expr)).encode('utf-8')
             # we should be adding the missing msgstr[0]
 
             # This test will fail for revisions <= 406 because so far
@@ -186,15 +186,15 @@ def test_3_num_plurals_checkers(self):
 msgstr[0] ""
 msgstr[1] ""
 
-""" % dict(locale       = _locale,
-           english_name = Locale.parse(_locale).english_name,
-           version      = VERSION,
-           year         = time.strftime('%Y'),
-           date         = format_datetime(datetime.now(LOCALTZ),
-                                          'yyyy-MM-dd HH:mmZ',
-                                          tzinfo=LOCALTZ, locale=_locale),
-           num_plurals  = PLURALS[_locale][0],
-           plural_expr  = PLURALS[_locale][0])).encode('utf-8')
+""" % dict(locale=_locale,
+                english_name=Locale.parse(_locale).english_name,
+                version=VERSION,
+                year=time.strftime('%Y'),
+                date=format_datetime(datetime.now(LOCALTZ),
+                                     'yyyy-MM-dd HH:mmZ',
+                                     tzinfo=LOCALTZ, locale=_locale),
+                num_plurals=PLURALS[_locale][0],
+                plural_expr=PLURALS[_locale][0])).encode('utf-8')
 
             # This test will fail for revisions <= 406 because so far
             # catalog.num_plurals was neglected
@@ -238,15 +238,15 @@ def test_4_num_plurals_checkers(self):
 msgstr[1] ""
 msgstr[2] ""
 
-""" % dict(locale       = _locale,
-           english_name = Locale.parse(_locale).english_name,
-           version      = VERSION,
-           year         = time.strftime('%Y'),
-           date         = format_datetime(datetime.now(LOCALTZ),
-                                          'yyyy-MM-dd HH:mmZ',
-                                          tzinfo=LOCALTZ, locale=_locale),
-           num_plurals  = PLURALS[_locale][0],
-           plural_expr  = PLURALS[_locale][0])).encode('utf-8')
+""" % dict(locale=_locale,
+                english_name=Locale.parse(_locale).english_name,
+                version=VERSION,
+                year=time.strftime('%Y'),
+                date=format_datetime(datetime.now(LOCALTZ),
+                                     'yyyy-MM-dd HH:mmZ',
+                                     tzinfo=LOCALTZ, locale=_locale),
+                num_plurals=PLURALS[_locale][0],
+                plural_expr=PLURALS[_locale][0])).encode('utf-8')
 
             # This test will fail for revisions <= 406 because so far
             # catalog.num_plurals was neglected
@@ -291,15 +291,15 @@ def test_5_num_plurals_checkers(self):
 msgstr[2] ""
 msgstr[3] ""
 
-""" % dict(locale       = _locale,
-           english_name = Locale.parse(_locale).english_name,
-           version      = VERSION,
-           year         = time.strftime('%Y'),
-           date         = format_datetime(datetime.now(LOCALTZ),
-                                          'yyyy-MM-dd HH:mmZ',
-                                          tzinfo=LOCALTZ, locale=_locale),
-           num_plurals  = PLURALS[_locale][0],
-           plural_expr  = PLURALS[_locale][0])).encode('utf-8')
+""" % dict(locale=_locale,
+                english_name=Locale.parse(_locale).english_name,
+                version=VERSION,
+                year=time.strftime('%Y'),
+                date=format_datetime(datetime.now(LOCALTZ),
+                                     'yyyy-MM-dd HH:mmZ',
+                                     tzinfo=LOCALTZ, locale=_locale),
+                num_plurals=PLURALS[_locale][0],
+                plural_expr=PLURALS[_locale][0])).encode('utf-8')
 
             # This test will fail for revisions <= 406 because so far
             # catalog.num_plurals was neglected
@@ -345,15 +345,15 @@ def test_6_num_plurals_checkers(self):
 msgstr[3] ""
 msgstr[4] ""
 
-""" % dict(locale       = _locale,
-           english_name = Locale.parse(_locale).english_name,
-           version      = VERSION,
-           year         = time.strftime('%Y'),
-           date         = format_datetime(datetime.now(LOCALTZ),
-                                          'yyyy-MM-dd HH:mmZ',
-                                          tzinfo=LOCALTZ, locale=_locale),
-           num_plurals  = PLURALS[_locale][0],
-           plural_expr  = PLURALS[_locale][0])).encode('utf-8')
+""" % dict(locale=_locale,
+                english_name=Locale.parse(_locale).english_name,
+                version=VERSION,
+                year=time.strftime('%Y'),
+                date=format_datetime(datetime.now(LOCALTZ),
+                                     'yyyy-MM-dd HH:mmZ',
+                                     tzinfo=LOCALTZ, locale=_locale),
+                num_plurals=PLURALS[_locale][0],
+                plural_expr=PLURALS[_locale][0])).encode('utf-8')
 
             # This test will fail for revisions <= 406 because so far
             # catalog.num_plurals was neglected
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 66c8cd908..74d3101d1 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -38,17 +38,17 @@ def test_nested_calls(self):
                                                extract.DEFAULT_KEYWORDS.keys(),
                                                [], {}))
         self.assertEqual([
-                (1, '_', None, []),
-                (2, 'ungettext', (None, None, None), []),
-                (3, 'ungettext', (u'Babel', None, None), []),
-                (4, 'ungettext', (None, u'Babels', None), []),
-                (5, 'ungettext', (u'bunny', u'bunnies', None), []),
-                (6, 'ungettext', (None, u'bunnies', None), []),
-                (7, '_', None, []),
-                (8, 'gettext', u'Rabbit', []),
-                (9, 'dgettext', (u'wiki', None), []),
-                (10, 'dngettext', (None, u'Page', u'Pages', None), [])],
-                         messages)
+            (1, '_', None, []),
+            (2, 'ungettext', (None, None, None), []),
+            (3, 'ungettext', (u'Babel', None, None), []),
+            (4, 'ungettext', (None, u'Babels', None), []),
+            (5, 'ungettext', (u'bunny', u'bunnies', None), []),
+            (6, 'ungettext', (None, u'bunnies', None), []),
+            (7, '_', None, []),
+            (8, 'gettext', u'Rabbit', []),
+            (9, 'dgettext', (u'wiki', None), []),
+            (10, 'dngettext', (None, u'Page', u'Pages', None), [])],
+            messages)
 
     def test_nested_comments(self):
         buf = BytesIO(b"""\
@@ -79,9 +79,9 @@ def test_comments_with_calls_that_spawn_multiple_lines(self):
 add_notice(req, ngettext("Bar deleted.",
                          "Bars deleted.", len(selected)))
 """)
-        messages = list(extract.extract_python(buf, ('ngettext','_'), ['NOTE:'],
+        messages = list(extract.extract_python(buf, ('ngettext', '_'), ['NOTE:'],
 
-                                               {'strip_comment_tags':False}))
+                                               {'strip_comment_tags': False}))
         self.assertEqual((6, '_', 'Locale deleted.',
                           [u'NOTE: This Comment SHOULD Be Extracted']),
                          messages[1])
@@ -90,9 +90,9 @@ def test_comments_with_calls_that_spawn_multiple_lines(self):
                           [u'NOTE: This Comment SHOULD Be Extracted']),
                          messages[2])
         self.assertEqual((3, 'ngettext',
-                           (u'Catalog deleted.',
-                            u'Catalogs deleted.', None),
-                           [u'NOTE: This Comment SHOULD Be Extracted']),
+                          (u'Catalog deleted.',
+                           u'Catalogs deleted.', None),
+                          [u'NOTE: This Comment SHOULD Be Extracted']),
                          messages[0])
         self.assertEqual((15, 'ngettext', (u'Bar deleted.', u'Bars deleted.',
                                            None),
@@ -143,7 +143,7 @@ def test_npgettext(self):
         messages = list(extract.extract_python(buf, ('npgettext',), [], {}))
         self.assertEqual([(1, 'npgettext', (u'Strings', u'pylon', u'pylons', None), []),
                           (3, 'npgettext', (u'Strings', u'elvis', u'elvises', None), [])],
-                          messages)
+                         messages)
         buf = BytesIO(b"""\
 msg = npgettext('Strings', 'pylon',  # TRANSLATORS: shouldn't be
                 'pylons', # TRANSLATORS: seeing this
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 42e3e3836..df4803332 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -32,13 +32,14 @@
 
 this_dir = os.path.abspath(os.path.dirname(__file__))
 
+
 class CompileCatalogTestCase(unittest.TestCase):
 
     def setUp(self):
         self.olddir = os.getcwd()
         self.datadir = os.path.join(this_dir, 'data')
         os.chdir(self.datadir)
-        _global_log.threshold = 5 # shut up distutils logging
+        _global_log.threshold = 5  # shut up distutils logging
 
         self.dist = Distribution(dict(
             name='TestProject',
@@ -68,7 +69,7 @@ def setUp(self):
         self.olddir = os.getcwd()
         self.datadir = os.path.join(this_dir, 'data')
         os.chdir(self.datadir)
-        _global_log.threshold = 5 # shut up distutils logging
+        _global_log.threshold = 5  # shut up distutils logging
 
         self.dist = Distribution(dict(
             name='TestProject',
@@ -195,9 +196,9 @@ def test_extraction_with_default_mapping(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-       'year': time.strftime('%Y'),
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'year': time.strftime('%Y'),
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(self._pot_file(), 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -247,9 +248,9 @@ def test_extraction_with_mapping_file(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-       'year': time.strftime('%Y'),
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'year': time.strftime('%Y'),
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(self._pot_file(), 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -257,8 +258,8 @@ def test_extraction_with_mapping_file(self):
     def test_extraction_with_mapping_dict(self):
         self.dist.message_extractors = {
             'project': [
-                ('**/ignored/**.*', 'ignore',   None),
-                ('**.py',           'python',   None),
+                ('**/ignored/**.*', 'ignore', None),
+                ('**.py', 'python', None),
             ]
         }
         self.cmd.copyright_holder = 'FooBar, Inc.'
@@ -304,9 +305,9 @@ def test_extraction_with_mapping_dict(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-       'year': time.strftime('%Y'),
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'year': time.strftime('%Y'),
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(self._pot_file(), 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -318,7 +319,7 @@ def setUp(self):
         self.olddir = os.getcwd()
         self.datadir = os.path.join(this_dir, 'data')
         os.chdir(self.datadir)
-        _global_log.threshold = 5 # shut up distutils logging
+        _global_log.threshold = 5  # shut up distutils logging
 
         self.dist = Distribution(dict(
             name='TestProject',
@@ -336,7 +337,7 @@ def tearDown(self):
 
         os.chdir(self.olddir)
 
-    def  _i18n_dir(self):
+    def _i18n_dir(self):
         return os.path.join(self.datadir, 'project', 'i18n')
 
     def _po_file(self, locale):
@@ -398,8 +399,8 @@ def test_with_output_dir(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -449,8 +450,8 @@ def test_keeps_catalog_non_fuzzy(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -502,8 +503,8 @@ def test_correct_init_more_than_2_plurals(self):
 msgstr[2] ""
 
 """ % {'version': VERSION,
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -552,8 +553,8 @@ def test_correct_init_singular_plural_forms(self):
 msgstr[0] ""
 
 """ % {'version': VERSION,
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='ja_JP')}
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='ja_JP')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -563,7 +564,7 @@ def test_supports_no_wrap(self):
         self.cmd.locale = 'en_US'
         self.cmd.output_dir = 'project/i18n'
 
-        long_message = '"'+ 'xxxxx '*15 + '"'
+        long_message = '"' + 'xxxxx ' * 15 + '"'
 
         with open('project/i18n/messages.pot', 'rb') as f:
             pot_contents = f.read().decode('latin-1')
@@ -611,9 +612,9 @@ def test_supports_no_wrap(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en_US'),
-       'long_message': long_message}
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en_US'),
+            'long_message': long_message}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -623,7 +624,7 @@ def test_supports_width(self):
         self.cmd.locale = 'en_US'
         self.cmd.output_dir = 'project/i18n'
 
-        long_message = '"'+ 'xxxxx '*15 + '"'
+        long_message = '"' + 'xxxxx ' * 15 + '"'
 
         with open('project/i18n/messages.pot', 'rb') as f:
             pot_contents = f.read().decode('latin-1')
@@ -670,9 +671,9 @@ def test_supports_width(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en_US'),
-       'long_message': long_message}
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en_US'),
+            'long_message': long_message}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -785,11 +786,11 @@ def assert_pot_file_exists(self):
     def test_extract_with_default_mapping(self):
         pot_file = self._pot_file()
         self.cli.run(sys.argv + ['extract',
-            '--copyright-holder', 'FooBar, Inc.',
-            '--project', 'TestProject', '--version', '0.1',
-            '--msgid-bugs-address', 'bugs.address@email.tld',
-            '-c', 'TRANSLATOR', '-c', 'TRANSLATORS:',
-            '-o', pot_file, 'project'])
+                                 '--copyright-holder', 'FooBar, Inc.',
+                                 '--project', 'TestProject', '--version', '0.1',
+                                 '--msgid-bugs-address', 'bugs.address@email.tld',
+                                 '-c', 'TRANSLATOR', '-c', 'TRANSLATORS:',
+                                 '-o', pot_file, 'project'])
         self.assert_pot_file_exists()
         expected_content = r"""# Translations template for TestProject.
 # Copyright (C) %(year)s FooBar, Inc.
@@ -830,9 +831,9 @@ def test_extract_with_default_mapping(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-       'year': time.strftime('%Y'),
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'year': time.strftime('%Y'),
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(pot_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -840,12 +841,12 @@ def test_extract_with_default_mapping(self):
     def test_extract_with_mapping_file(self):
         pot_file = self._pot_file()
         self.cli.run(sys.argv + ['extract',
-            '--copyright-holder', 'FooBar, Inc.',
-            '--project', 'TestProject', '--version', '0.1',
-            '--msgid-bugs-address', 'bugs.address@email.tld',
-            '--mapping', os.path.join(self.datadir, 'mapping.cfg'),
-            '-c', 'TRANSLATOR', '-c', 'TRANSLATORS:',
-            '-o', pot_file, 'project'])
+                                 '--copyright-holder', 'FooBar, Inc.',
+                                 '--project', 'TestProject', '--version', '0.1',
+                                 '--msgid-bugs-address', 'bugs.address@email.tld',
+                                 '--mapping', os.path.join(self.datadir, 'mapping.cfg'),
+                                 '-c', 'TRANSLATOR', '-c', 'TRANSLATORS:',
+                                 '-o', pot_file, 'project'])
         self.assert_pot_file_exists()
         expected_content = r"""# Translations template for TestProject.
 # Copyright (C) %(year)s FooBar, Inc.
@@ -880,9 +881,9 @@ def test_extract_with_mapping_file(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-       'year': time.strftime('%Y'),
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'year': time.strftime('%Y'),
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(pot_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -894,12 +895,12 @@ def test_extract_with_exact_file(self):
         pot_file = self._pot_file()
         file_to_extract = os.path.join(self.datadir, 'project', 'file2.py')
         self.cli.run(sys.argv + ['extract',
-            '--copyright-holder', 'FooBar, Inc.',
-            '--project', 'TestProject', '--version', '0.1',
-            '--msgid-bugs-address', 'bugs.address@email.tld',
-            '--mapping', os.path.join(self.datadir, 'mapping.cfg'),
-            '-c', 'TRANSLATOR', '-c', 'TRANSLATORS:',
-            '-o', pot_file, file_to_extract])
+                                 '--copyright-holder', 'FooBar, Inc.',
+                                 '--project', 'TestProject', '--version', '0.1',
+                                 '--msgid-bugs-address', 'bugs.address@email.tld',
+                                 '--mapping', os.path.join(self.datadir, 'mapping.cfg'),
+                                 '-c', 'TRANSLATOR', '-c', 'TRANSLATORS:',
+                                 '-o', pot_file, file_to_extract])
         self.assert_pot_file_exists()
         expected_content = r"""# Translations template for TestProject.
 # Copyright (C) %(year)s FooBar, Inc.
@@ -928,9 +929,9 @@ def test_extract_with_exact_file(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-       'year': time.strftime('%Y'),
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'year': time.strftime('%Y'),
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(pot_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -938,9 +939,9 @@ def test_extract_with_exact_file(self):
     def test_init_with_output_dir(self):
         po_file = self._po_file('en_US')
         self.cli.run(sys.argv + ['init',
-            '--locale', 'en_US',
-            '-d', os.path.join(self._i18n_dir()),
-            '-i', os.path.join(self._i18n_dir(), 'messages.pot')])
+                                 '--locale', 'en_US',
+                                 '-d', os.path.join(self._i18n_dir()),
+                                 '-i', os.path.join(self._i18n_dir(), 'messages.pot')])
         assert os.path.isfile(po_file)
         expected_content = r"""# English (United States) translations for TestProject.
 # Copyright (C) 2007 FooBar, Inc.
@@ -976,21 +977,21 @@ def test_init_with_output_dir(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
-    def  _i18n_dir(self):
+    def _i18n_dir(self):
         return os.path.join(self.datadir, 'project', 'i18n')
 
     def test_init_singular_plural_forms(self):
         po_file = self._po_file('ja_JP')
         self.cli.run(sys.argv + ['init',
-            '--locale', 'ja_JP',
-            '-d', os.path.join(self._i18n_dir()),
-            '-i', os.path.join(self._i18n_dir(), 'messages.pot')])
+                                 '--locale', 'ja_JP',
+                                 '-d', os.path.join(self._i18n_dir()),
+                                 '-i', os.path.join(self._i18n_dir(), 'messages.pot')])
         assert os.path.isfile(po_file)
         expected_content = r"""# Japanese (Japan) translations for TestProject.
 # Copyright (C) 2007 FooBar, Inc.
@@ -1025,8 +1026,8 @@ def test_init_singular_plural_forms(self):
 msgstr[0] ""
 
 """ % {'version': VERSION,
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -1034,9 +1035,9 @@ def test_init_singular_plural_forms(self):
     def test_init_more_than_2_plural_forms(self):
         po_file = self._po_file('lv_LV')
         self.cli.run(sys.argv + ['init',
-            '--locale', 'lv_LV',
-            '-d', self._i18n_dir(),
-            '-i', os.path.join(self._i18n_dir(), 'messages.pot')])
+                                 '--locale', 'lv_LV',
+                                 '-d', self._i18n_dir(),
+                                 '-i', os.path.join(self._i18n_dir(), 'messages.pot')])
         assert os.path.isfile(po_file)
         expected_content = r"""# Latvian (Latvia) translations for TestProject.
 # Copyright (C) 2007 FooBar, Inc.
@@ -1074,8 +1075,8 @@ def test_init_more_than_2_plural_forms(self):
 msgstr[2] ""
 
 """ % {'version': VERSION,
-       'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
-                               tzinfo=LOCALTZ, locale='en')}
+            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+                                    tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
@@ -1084,8 +1085,8 @@ def test_compile_catalog(self):
         po_file = self._po_file('de_DE')
         mo_file = po_file.replace('.po', '.mo')
         self.cli.run(sys.argv + ['compile',
-            '--locale', 'de_DE',
-            '-d', self._i18n_dir()])
+                                 '--locale', 'de_DE',
+                                 '-d', self._i18n_dir()])
         assert not os.path.isfile(mo_file), 'Expected no file at %r' % mo_file
         self.assertEqual("""\
 catalog %r is marked as fuzzy, skipping
@@ -1096,8 +1097,8 @@ def test_compile_fuzzy_catalog(self):
         mo_file = po_file.replace('.po', '.mo')
         try:
             self.cli.run(sys.argv + ['compile',
-                '--locale', 'de_DE', '--use-fuzzy',
-                '-d', self._i18n_dir()])
+                                     '--locale', 'de_DE', '--use-fuzzy',
+                                     '-d', self._i18n_dir()])
             assert os.path.isfile(mo_file)
             self.assertEqual("""\
 compiling catalog %r to %r
@@ -1115,8 +1116,8 @@ def test_compile_catalog_with_more_than_2_plural_forms(self):
         mo_file = po_file.replace('.po', '.mo')
         try:
             self.cli.run(sys.argv + ['compile',
-                '--locale', 'ru_RU', '--use-fuzzy',
-                '-d', self._i18n_dir()])
+                                     '--locale', 'ru_RU', '--use-fuzzy',
+                                     '-d', self._i18n_dir()])
             assert os.path.isfile(mo_file)
             self.assertEqual("""\
 compiling catalog %r to %r
@@ -1134,8 +1135,8 @@ def test_compile_catalog_multidomain(self):
         mo_bar = po_bar.replace('.po', '.mo')
         try:
             self.cli.run(sys.argv + ['compile',
-                '--locale', 'de_DE', '--domain', 'foo bar', '--use-fuzzy',
-                '-d', self._i18n_dir()])
+                                     '--locale', 'de_DE', '--domain', 'foo bar', '--use-fuzzy',
+                                     '-d', self._i18n_dir()])
             for mo_file in [mo_foo, mo_bar]:
                 assert os.path.isfile(mo_file)
             self.assertEqual("""\
@@ -1158,10 +1159,10 @@ def test_update(self):
             write_po(outfp, template)
         po_file = os.path.join(self._i18n_dir(), 'temp1.po')
         self.cli.run(sys.argv + ['init',
-            '-l', 'fi',
-            '-o', po_file,
-            '-i', tmpl_file
-        ])
+                                 '-l', 'fi',
+                                 '-o', po_file,
+                                 '-i', tmpl_file
+                                 ])
         with open(po_file, "r") as infp:
             catalog = read_po(infp)
             assert len(catalog) == 3
@@ -1174,14 +1175,15 @@ def test_update(self):
             write_po(outfp, template)
 
         self.cli.run(sys.argv + ['update',
-            '-l', 'fi_FI',
-            '-o', po_file,
-            '-i', tmpl_file])
+                                 '-l', 'fi_FI',
+                                 '-o', po_file,
+                                 '-i', tmpl_file])
 
         with open(po_file, "r") as infp:
             catalog = read_po(infp)
             assert len(catalog) == 4  # Catalog was updated
 
+
 def test_parse_mapping():
     buf = StringIO(
         '[extractors]\n'
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index f375a1a42..1bac3603c 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -188,7 +188,7 @@ def test_with_context(self):
         out_buf = BytesIO()
         pofile.write_po(out_buf, catalog, omit_header=True)
         assert out_buf.getvalue().strip() == buf.getvalue().strip(), \
-                                                            out_buf.getvalue()
+            out_buf.getvalue()
 
     def test_with_context_two(self):
         buf = BytesIO(b'''msgctxt "Menu"
@@ -299,7 +299,7 @@ def test_wrap_long_lines(self):
         catalog.add(text, locations=[('main.py', 1)])
         buf = BytesIO()
         pofile.write_po(buf, catalog, no_location=True, omit_header=True,
-                         width=42)
+                        width=42)
         self.assertEqual(b'''msgid ""
 "Here's some text where\\n"
 "white space and line breaks matter, and"
@@ -317,7 +317,7 @@ def test_wrap_long_lines_with_long_word(self):
         catalog.add(text, locations=[('main.py', 1)])
         buf = BytesIO()
         pofile.write_po(buf, catalog, no_location=True, omit_header=True,
-                         width=32)
+                        width=32)
         self.assertEqual(b'''msgid ""
 "Here's some text that\\n"
 "includesareallylongwordthatmightbutshouldnt"
diff --git a/tests/test_core.py b/tests/test_core.py
index 54cf37dde..b9de4cbe6 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -31,6 +31,7 @@ def test_locale_repr():
     assert ("Locale('zh', territory='CN', script='Hans')" ==
             repr(Locale('zh', 'CN', script='Hans')))
 
+
 def test_locale_comparison():
     en_US = Locale('en', 'US')
     en_US_2 = Locale('en', 'US')
@@ -72,6 +73,7 @@ def test_hash():
 
 
 class TestLocaleClass:
+
     def test_attributes(self):
         locale = Locale('en', 'US')
         assert locale.language == 'en'
@@ -306,6 +308,7 @@ def test_compatible_classes_in_global_and_localedata(filename):
     import pickle
 
     class Unpickler(pickle.Unpickler):
+
         def find_class(self, module, name):
             # *.dat files must have compatible classes between Python 2 and 3
             if module.split('.')[0] == 'babel':
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 5155c0cca..069c9bd18 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -36,9 +36,9 @@ def test_quarter_format(self):
     def test_month_context(self):
         d = date(2006, 2, 8)
         fmt = dates.DateTimeFormat(d, locale='mt_MT')
-        self.assertEqual(u'F', fmt['MMMMM']) # narrow format
+        self.assertEqual(u'F', fmt['MMMMM'])  # narrow format
         fmt = dates.DateTimeFormat(d, locale='mt_MT')
-        self.assertEqual(u'Fr', fmt['LLLLL']) # narrow standalone
+        self.assertEqual(u'Fr', fmt['LLLLL'])  # narrow standalone
 
     def test_abbreviated_month_alias(self):
         d = date(2006, 3, 8)
@@ -122,38 +122,38 @@ def test_day_of_week_in_month_last(self):
         self.assertEqual('5', fmt['F'])
 
     def test_local_day_of_week(self):
-        d = date(2007, 4, 1) # a sunday
+        d = date(2007, 4, 1)  # a sunday
         fmt = dates.DateTimeFormat(d, locale='de_DE')
-        self.assertEqual('7', fmt['e']) # monday is first day of week
+        self.assertEqual('7', fmt['e'])  # monday is first day of week
         fmt = dates.DateTimeFormat(d, locale='en_US')
-        self.assertEqual('01', fmt['ee']) # sunday is first day of week
+        self.assertEqual('01', fmt['ee'])  # sunday is first day of week
         fmt = dates.DateTimeFormat(d, locale='bn_BD')
-        self.assertEqual('03', fmt['ee']) # friday is first day of week
+        self.assertEqual('03', fmt['ee'])  # friday is first day of week
 
-        d = date(2007, 4, 2) # a monday
+        d = date(2007, 4, 2)  # a monday
         fmt = dates.DateTimeFormat(d, locale='de_DE')
-        self.assertEqual('1', fmt['e']) # monday is first day of week
+        self.assertEqual('1', fmt['e'])  # monday is first day of week
         fmt = dates.DateTimeFormat(d, locale='en_US')
-        self.assertEqual('02', fmt['ee']) # sunday is first day of week
+        self.assertEqual('02', fmt['ee'])  # sunday is first day of week
         fmt = dates.DateTimeFormat(d, locale='bn_BD')
-        self.assertEqual('04', fmt['ee']) # friday is first day of week
+        self.assertEqual('04', fmt['ee'])  # friday is first day of week
 
     def test_local_day_of_week_standalone(self):
-        d = date(2007, 4, 1) # a sunday
+        d = date(2007, 4, 1)  # a sunday
         fmt = dates.DateTimeFormat(d, locale='de_DE')
-        self.assertEqual('7', fmt['c']) # monday is first day of week
+        self.assertEqual('7', fmt['c'])  # monday is first day of week
         fmt = dates.DateTimeFormat(d, locale='en_US')
-        self.assertEqual('1', fmt['c']) # sunday is first day of week
+        self.assertEqual('1', fmt['c'])  # sunday is first day of week
         fmt = dates.DateTimeFormat(d, locale='bn_BD')
-        self.assertEqual('3', fmt['c']) # friday is first day of week
+        self.assertEqual('3', fmt['c'])  # friday is first day of week
 
-        d = date(2007, 4, 2) # a monday
+        d = date(2007, 4, 2)  # a monday
         fmt = dates.DateTimeFormat(d, locale='de_DE')
-        self.assertEqual('1', fmt['c']) # monday is first day of week
+        self.assertEqual('1', fmt['c'])  # monday is first day of week
         fmt = dates.DateTimeFormat(d, locale='en_US')
-        self.assertEqual('2', fmt['c']) # sunday is first day of week
+        self.assertEqual('2', fmt['c'])  # sunday is first day of week
         fmt = dates.DateTimeFormat(d, locale='bn_BD')
-        self.assertEqual('4', fmt['c']) # friday is first day of week
+        self.assertEqual('4', fmt['c'])  # friday is first day of week
 
     def test_fractional_seconds(self):
         t = time(15, 30, 12, 34567)
@@ -451,8 +451,10 @@ def test_format_invalid(self):
 
 
 class TimeZoneAdjustTestCase(unittest.TestCase):
+
     def _utc(self):
         class EvilFixedOffsetTimezone(FixedOffsetTimezone):
+
             def localize(self, dt, is_dst=False):
                 raise NotImplementedError()
         UTC = EvilFixedOffsetTimezone(0, 'UTC')
@@ -702,6 +704,7 @@ def test_format_current_moment(monkeypatch):
     frozen_instant = datetime.utcnow()
 
     class frozen_datetime(datetime):
+
         @classmethod
         def utcnow(cls):
             return frozen_instant
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 80dd118c4..1c568ed99 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -73,6 +73,7 @@ def test_merge():
     localedata.merge(d, {1: 'Foo', 2: 'Bar'})
     assert d == {1: 'Foo', 2: 'Bar', 3: 'baz'}
 
+
 def test_locale_identification():
     for l in localedata.locale_identifiers():
         assert localedata.exists(l)
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 4b8a48dce..19f9bc76d 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -24,7 +24,7 @@ class FormatDecimalTestCase(unittest.TestCase):
 
     def test_patterns(self):
         self.assertEqual(numbers.format_decimal(12345, '##0',
-                         locale='en_US'), '12345')
+                                                locale='en_US'), '12345')
         self.assertEqual(numbers.format_decimal(6.5, '0.00', locale='sv'),
                          '6,50')
         self.assertEqual(numbers.format_decimal(10.0**20,
@@ -35,13 +35,13 @@ def test_patterns(self):
         # significant digits
         self.assertEqual(u'12,345,678.05',
                          numbers.format_decimal(12345678.051, '#,##0.00',
-                         locale='en_US'))
+                                                locale='en_US'))
 
     def test_subpatterns(self):
         self.assertEqual(numbers.format_decimal(-12345, '#,##0.##;-#',
-                         locale='en_US'), '-12,345')
+                                                locale='en_US'), '-12,345')
         self.assertEqual(numbers.format_decimal(-12345, '#,##0.##;(#)',
-                         locale='en_US'), '(12,345)')
+                                                locale='en_US'), '(12,345)')
 
     def test_default_rounding(self):
         """
@@ -57,8 +57,8 @@ def test_default_rounding(self):
 
     def test_significant_digits(self):
         """Test significant digits patterns"""
-        self.assertEqual(numbers.format_decimal(123004, '@@',locale='en_US'),
-                        '120000')
+        self.assertEqual(numbers.format_decimal(123004, '@@', locale='en_US'),
+                         '120000')
         self.assertEqual(numbers.format_decimal(1.12, '@', locale='sv'), '1')
         self.assertEqual(numbers.format_decimal(1.1, '@@', locale='sv'), '1,1')
         self.assertEqual(numbers.format_decimal(1.1, '@@@@@##', locale='sv'),
@@ -67,27 +67,27 @@ def test_significant_digits(self):
                          '0,000100')
         self.assertEqual(numbers.format_decimal(0.0001234, '@@@', locale='sv'),
                          '0,000123')
-        self.assertEqual(numbers.format_decimal(0.0001234, '@@@#',locale='sv'),
+        self.assertEqual(numbers.format_decimal(0.0001234, '@@@#', locale='sv'),
                          '0,0001234')
-        self.assertEqual(numbers.format_decimal(0.0001234, '@@@#',locale='sv'),
+        self.assertEqual(numbers.format_decimal(0.0001234, '@@@#', locale='sv'),
                          '0,0001234')
-        self.assertEqual(numbers.format_decimal(0.12345, '@@@',locale='sv'),
+        self.assertEqual(numbers.format_decimal(0.12345, '@@@', locale='sv'),
                          '0,123')
-        self.assertEqual(numbers.format_decimal(3.14159, '@@##',locale='sv'),
+        self.assertEqual(numbers.format_decimal(3.14159, '@@##', locale='sv'),
                          '3,142')
-        self.assertEqual(numbers.format_decimal(1.23004, '@@##',locale='sv'),
+        self.assertEqual(numbers.format_decimal(1.23004, '@@##', locale='sv'),
                          '1,23')
-        self.assertEqual(numbers.format_decimal(1230.04, '@@,@@',locale='en_US'),
+        self.assertEqual(numbers.format_decimal(1230.04, '@@,@@', locale='en_US'),
                          '12,30')
-        self.assertEqual(numbers.format_decimal(123.41, '@@##',locale='en_US'),
+        self.assertEqual(numbers.format_decimal(123.41, '@@##', locale='en_US'),
                          '123.4')
-        self.assertEqual(numbers.format_decimal(1, '@@',locale='en_US'),
+        self.assertEqual(numbers.format_decimal(1, '@@', locale='en_US'),
                          '1.0')
-        self.assertEqual(numbers.format_decimal(0, '@',locale='en_US'),
+        self.assertEqual(numbers.format_decimal(0, '@', locale='en_US'),
                          '0')
-        self.assertEqual(numbers.format_decimal(0.1, '@',locale='en_US'),
+        self.assertEqual(numbers.format_decimal(0.1, '@', locale='en_US'),
                          '0.1')
-        self.assertEqual(numbers.format_decimal(0.1, '@#',locale='en_US'),
+        self.assertEqual(numbers.format_decimal(0.1, '@#', locale='en_US'),
                          '0.1')
         self.assertEqual(numbers.format_decimal(0.1, '@@', locale='en_US'),
                          '0.10')
@@ -137,7 +137,7 @@ def test_scientific_notation(self):
         fmt = numbers.format_scientific(0.012345, '#.##E00 m/s', locale='en_US')
         self.assertEqual(fmt, '1.23E-02 m/s')
         fmt = numbers.format_scientific(Decimal('12345'), '#.##E+00 m/s',
-        locale='en_US')
+                                        locale='en_US')
         self.assertEqual(fmt, '1.23E+04 m/s')
         # 0 (see ticket #99)
         fmt = numbers.format_scientific(0, '#E0', locale='en_US')
@@ -152,11 +152,12 @@ def test_formatting_of_very_small_decimals(self):
 
 
 class NumberParsingTestCase(unittest.TestCase):
+
     def test_can_parse_decimals(self):
         self.assertEqual(Decimal('1099.98'),
-            numbers.parse_decimal('1,099.98', locale='en_US'))
+                         numbers.parse_decimal('1,099.98', locale='en_US'))
         self.assertEqual(Decimal('1099.98'),
-            numbers.parse_decimal('1.099,98', locale='de'))
+                         numbers.parse_decimal('1.099,98', locale='de'))
         self.assertRaises(numbers.NumberFormatError,
                           lambda: numbers.parse_decimal('2,109,998', locale='de'))
 
@@ -176,15 +177,15 @@ def test_get_territory_currencies():
 
     assert numbers.get_territory_currencies('US', date(2013, 1, 1)) == ['USD']
     assert sorted(numbers.get_territory_currencies('US', date(2013, 1, 1),
-        non_tender=True)) == ['USD', 'USN', 'USS']
+                                                   non_tender=True)) == ['USD', 'USN', 'USS']
 
     assert numbers.get_territory_currencies('US', date(2013, 1, 1),
-        include_details=True) == [{
-            'currency': 'USD',
-            'from': date(1792, 1, 1),
-            'to': None,
-            'tender': True
-        }]
+                                            include_details=True) == [{
+                                                'currency': 'USD',
+                                                'from': date(1792, 1, 1),
+                                                'to': None,
+                                                'tender': True
+                                            }]
 
     assert numbers.get_territory_currencies('LS', date(2013, 1, 1)) == ['ZAR', 'LSL']
 
@@ -254,7 +255,7 @@ def test_format_currency_format_type():
 
     with pytest.raises(numbers.UnknownCurrencyFormatError) as excinfo:
         numbers.format_currency(1099.98, 'USD', locale='en_US',
-                                    format_type='unknown')
+                                format_type='unknown')
     assert excinfo.value.args[0] == "'unknown' is not a known currency format type"
 
     assert (numbers.format_currency(1099.98, 'JPY', locale='en_US')
diff --git a/tests/test_plural.py b/tests/test_plural.py
index d51efef1e..60a2de4a1 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -145,7 +145,7 @@ def test_locales_with_no_plural_rules_have_default():
     ('n = 1 @integer 1', [('value', '1'), ('symbol', '='), ('word', 'n'), ]),
     ('n is 1', [('value', '1'), ('word', 'is'), ('word', 'n'), ]),
     ('n % 100 = 3..10', [('value', '10'), ('ellipsis', '..'), ('value', '3'),
-                         ('symbol', '='),  ('value', '100'), ('symbol', '%'),
+                         ('symbol', '='), ('value', '100'), ('symbol', '%'),
                          ('word', 'n'), ]),
 )
 
@@ -167,6 +167,7 @@ def test_tokenize_malformed(rule_text):
 
 
 class TestNextTokenTestCase(unittest.TestCase):
+
     def test_empty(self):
         assert not plural.test_next_token([], '')
 
@@ -197,6 +198,7 @@ def make_range_list(*values):
 
 
 class PluralRuleParserTestCase(unittest.TestCase):
+
     def setUp(self):
         self.n = plural.ident_node('n')
 
diff --git a/tests/test_support.py b/tests/test_support.py
index efdddeb71..f2a99b7ba 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -186,6 +186,7 @@ def test_load(self):
 
 
 class NullTranslationsTestCase(unittest.TestCase):
+
     def setUp(self):
         fp = BytesIO()
         write_mo(fp, Catalog(locale='de'))
@@ -225,8 +226,10 @@ def test_same_return_values(self):
 
 
 class LazyProxyTestCase(unittest.TestCase):
+
     def test_proxy_caches_result_of_function_call(self):
         self.counter = 0
+
         def add_one():
             self.counter += 1
             return self.counter
@@ -236,6 +239,7 @@ def add_one():
 
     def test_can_disable_proxy_cache(self):
         self.counter = 0
+
         def add_one():
             self.counter += 1
             return self.counter
@@ -246,7 +250,8 @@ def add_one():
     def test_can_copy_proxy(self):
         from copy import copy
 
-        numbers = [1,2]
+        numbers = [1, 2]
+
         def first(xs):
             return xs[0]
 
@@ -259,7 +264,8 @@ def first(xs):
 
     def test_can_deepcopy_proxy(self):
         from copy import deepcopy
-        numbers = [1,2]
+        numbers = [1, 2]
+
         def first(xs):
             return xs[0]
 
diff --git a/tests/test_util.py b/tests/test_util.py
index d4b4be523..068a102ea 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -29,6 +29,7 @@ def test_pathmatch():
     assert util.pathmatch('**/templates/*.html', 'templates/index.html')
     assert not util.pathmatch('**/templates/*.html', 'templates/foo/bar.html')
 
+
 def test_odict_pop():
     odict = util.odict()
     odict[0] = 1
@@ -44,6 +45,7 @@ def test_odict_pop():
 
 
 class FixedOffsetTimezoneTestCase(unittest.TestCase):
+
     def test_zone_negative_offset(self):
         self.assertEqual('Etc/GMT-60', util.FixedOffsetTimezone(-60).zone)
 

From ac17d10daed46943d6c270afc0734d9f525e9aeb Mon Sep 17 00:00:00 2001
From: srisankethu <sanketh.uppalapati@research.iiit.ac.in>
Date: Mon, 29 Feb 2016 18:07:01 +0530
Subject: [PATCH 226/489] docs/dates.rst: Correct line length

Fixes https://github.com/python-babel/babel/issues/356
---
 docs/dates.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/dates.rst b/docs/dates.rst
index f35ee15f7..48fd58fd5 100644
--- a/docs/dates.rst
+++ b/docs/dates.rst
@@ -85,8 +85,8 @@ inherited from C and POSIX. The patterns used in Babel are based on the
 follows:
 
     A date/time pattern is a string of characters, where specific strings of
-    characters are replaced with date and time data from a calendar when formatting
-    or used to generate data for a calendar when parsing. […]
+    characters are replaced with date and time data from a calendar when
+    formatting or used to generate data for a calendar when parsing. […]
 
     Characters may be used multiple times. For example, if ``y`` is used for the
     year, ``yy`` might produce "99", whereas ``yyyy`` produces "1999". For most
@@ -123,7 +123,8 @@ The syntax for custom datetime format patterns is described in detail in the
 the `Locale Data Markup Language specification`_. The following table is just a
 relatively brief overview.
 
- .. _`Locale Data Markup Language specification`: http://unicode.org/reports/tr35/#Date_Format_Patterns
+ .. _`Locale Data Markup Language specification`:
+    http://unicode.org/reports/tr35/#Date_Format_Patterns
 
 Date Fields
 -----------

From 6adfcea8bc2660d73de0c11f41c60115589efff6 Mon Sep 17 00:00:00 2001
From: iamshubh22 <sgshubham03@gmail.com>
Date: Mon, 29 Feb 2016 21:50:10 +0530
Subject: [PATCH 227/489] format_datetime: using 'S...S' format is incorrect

Fixes https://github.com/python-babel/babel/issues/350
---
 babel/dates.py      |  9 +++++++--
 tests/test_dates.py | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 1af9955a5..bd496cbd1 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1287,8 +1287,13 @@ def format_period(self, char):
         return get_period_names(locale=self.locale)[period]
 
     def format_frac_seconds(self, num):
-        value = str(self.value.microsecond)
-        return self.format(round(float('.%s' % value), num) * 10**num, num)
+        """ Return fractional seconds.
+
+        Rounds the time's microseconds to the precision given by the number \
+        of digits passed in.
+        """
+        value = self.value.microsecond / 1000000
+        return self.format(round(value, num) * 10**num, num)
 
     def format_milliseconds_in_day(self, num):
         msecs = self.value.microsecond // 1000 + self.value.second * 1000 + \
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 5155c0cca..3b1ea36d3 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -156,9 +156,21 @@ def test_local_day_of_week_standalone(self):
         self.assertEqual('4', fmt['c']) # friday is first day of week
 
     def test_fractional_seconds(self):
-        t = time(15, 30, 12, 34567)
+        t = time(8, 3, 9, 799)
         fmt = dates.DateTimeFormat(t, locale='en_US')
-        self.assertEqual('3457', fmt['SSSS'])
+        self.assertEqual('0', fmt['S'])
+        t = time(8, 3, 1, 799)
+        fmt = dates.DateTimeFormat(t, locale='en_US')
+        self.assertEqual('0008', fmt['SSSS'])
+        t = time(8, 3, 1, 34567)
+        fmt = dates.DateTimeFormat(t, locale='en_US')
+        self.assertEqual('0346', fmt['SSSS'])
+        t = time(8, 3, 1, 345678)
+        fmt = dates.DateTimeFormat(t, locale='en_US')
+        self.assertEqual('345678', fmt['SSSSSS'])
+        t = time(8, 3, 1, 799)
+        fmt = dates.DateTimeFormat(t, locale='en_US')
+        self.assertEqual('00080', fmt['SSSSS'])
 
     def test_fractional_seconds_zero(self):
         t = time(15, 30, 0)

From de523751539225b121bf1a464f1cbb9a71625917 Mon Sep 17 00:00:00 2001
From: Sachin Paliwal <sachin.pali146@gmail.com>
Date: Tue, 1 Mar 2016 19:50:16 +0530
Subject: [PATCH 228/489] dates: Add additional pattern for quarter

Added test cases and additional pattern for quarter format
---
 babel/dates.py      | 6 ++++--
 tests/test_dates.py | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index bd496cbd1..6e45d92fd 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -299,6 +299,8 @@ def get_quarter_names(width='wide', context='format', locale=LC_TIME):
     u'1st quarter'
     >>> get_quarter_names('abbreviated', locale='de_DE')[1]
     u'Q1'
+    >>> get_quarter_names('narrow', locale='de_DE')[1]
+    u'1'
 
     :param width: the width to use, one of "wide", "abbreviated", or "narrow"
     :param context: the context, either "format" or "stand-alone"
@@ -1387,11 +1389,11 @@ def get_week_number(self, day_of_period, day_of_week=None):
 PATTERN_CHARS = {
     'G': [1, 2, 3, 4, 5],                                               # era
     'y': None, 'Y': None, 'u': None,                                    # year
-    'Q': [1, 2, 3, 4], 'q': [1, 2, 3, 4],                               # quarter
+    'Q': [1, 2, 3, 4, 5], 'q': [1, 2, 3, 4, 5],                         # quarter
     'M': [1, 2, 3, 4, 5], 'L': [1, 2, 3, 4, 5],                         # month
     'w': [1, 2], 'W': [1],                                              # week
     'd': [1, 2], 'D': [1, 2, 3], 'F': [1], 'g': None,                   # day
-    'E': [1, 2, 3, 4, 5], 'e': [1, 2, 3, 4, 5], 'c': [1, 3, 4, 5],      # week day
+    'E': [1, 2, 3, 4, 5, 6], 'e': [1, 2, 3, 4, 5, 6], 'c': [1, 3, 4, 5, 6],  # week day
     'a': [1],                                                           # period
     'h': [1, 2], 'H': [1, 2], 'K': [1, 2], 'k': [1, 2],                 # hour
     'm': [1, 2],                                                        # minute
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 3b1ea36d3..7d3236ace 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -29,9 +29,14 @@ def test_quarter_format(self):
         fmt = dates.DateTimeFormat(d, locale='en_US')
         self.assertEqual('2', fmt['Q'])
         self.assertEqual('2nd quarter', fmt['QQQQ'])
+        self.assertEqual('2', fmt['q'])
+        self.assertEqual('2nd quarter', fmt['qqqq'])
         d = date(2006, 12, 31)
         fmt = dates.DateTimeFormat(d, locale='en_US')
+        self.assertEqual('Q4', fmt['qqq'])
+        self.assertEqual('4', fmt['qqqqq'])
         self.assertEqual('Q4', fmt['QQQ'])
+        self.assertEqual('4', fmt['QQQQQ'])
 
     def test_month_context(self):
         d = date(2006, 2, 8)
@@ -501,6 +506,7 @@ def test_get_month_names():
 def test_get_quarter_names():
     assert dates.get_quarter_names('wide', locale='en_US')[1] == u'1st quarter'
     assert dates.get_quarter_names('abbreviated', locale='de_DE')[1] == u'Q1'
+    assert dates.get_quarter_names('narrow', locale='de_DE')[1] == u'1'
 
 
 def test_get_era_names():

From 4d93b227de7b01320a05196968f0d4ed008ff820 Mon Sep 17 00:00:00 2001
From: Sachin Paliwal <sachin.pali146@gmail.com>
Date: Tue, 1 Mar 2016 19:51:10 +0530
Subject: [PATCH 229/489] dates: Add additional pattern for week day

Added test cases and additional pattern for Weekday format
---
 babel/dates.py      | 39 +++++++++++++++++++++++++++++++++++----
 tests/test_dates.py | 27 +++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 6e45d92fd..2d94f893b 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -263,12 +263,14 @@ def get_day_names(width='wide', context='format', locale=LC_TIME):
 
     >>> get_day_names('wide', locale='en_US')[1]
     u'Tuesday'
+    >>> get_day_names('short', locale='en_US')[1]
+    u'Tu'
     >>> get_day_names('abbreviated', locale='es')[1]
     u'mar.'
     >>> get_day_names('narrow', context='stand-alone', locale='de_DE')[1]
     u'D'
 
-    :param width: the width to use, one of "wide", "abbreviated", or "narrow"
+    :param width: the width to use, one of "wide", "abbreviated", "short" or "narrow"
     :param context: the context, either "format" or "stand-alone"
     :param locale: the `Locale` object, or a locale string
     """
@@ -1267,15 +1269,44 @@ def format_week(self, char, num):
                 week = self.get_week_number(date.day, date.weekday())
             return '%d' % week
 
-    def format_weekday(self, char, num):
+    def format_weekday(self, char='E', num=4):
+        """
+        Return weekday from parsed datetime according to format pattern.
+
+        >>> format = DateTimeFormat(date(2016, 2, 28), Locale.parse('en_US'))
+        >>> format.format_weekday()
+        u'Sunday'
+
+        'E': Day of week - Use one through three letters for the abbreviated day name, four for the full (wide) name,
+             five for the narrow name, or six for the short name.
+        >>> format.format_weekday('E',2)
+        u'Sun'
+
+        'e': Local day of week. Same as E except adds a numeric value that will depend on the local starting day of the
+             week, using one or two letters. For this example, Monday is the first day of the week.
+        >>> format.format_weekday('e',2)
+        '01'
+
+        'c': Stand-Alone local day of week - Use one letter for the local numeric value (same as 'e'), three for the
+             abbreviated day name, four for the full (wide) name, five for the narrow name, or six for the short name.
+        >>> format.format_weekday('c',1)
+        '1'
+
+        :param char: pattern format character ('e','E','c')
+        :param num: count of format character
+
+        """
         if num < 3:
             if char.islower():
                 value = 7 - self.locale.first_week_day + self.value.weekday()
                 return self.format(value % 7 + 1, num)
             num = 3
         weekday = self.value.weekday()
-        width = {3: 'abbreviated', 4: 'wide', 5: 'narrow'}[num]
-        context = {3: 'format', 4: 'format', 5: 'stand-alone'}[num]
+        width = {3: 'abbreviated', 4: 'wide', 5: 'narrow', 6: 'short'}[num]
+        if char == 'c':
+            context = 'stand-alone'
+        else:
+            context = 'format'
         return get_day_names(width, context, self.locale)[weekday]
 
     def format_day_of_year(self, num):
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 7d3236ace..ee73d9db9 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -160,6 +160,32 @@ def test_local_day_of_week_standalone(self):
         fmt = dates.DateTimeFormat(d, locale='bn_BD')
         self.assertEqual('4', fmt['c']) # friday is first day of week
 
+    def test_pattern_day_of_week(self):
+        dt = datetime(2016,2,6)
+        fmt = dates.DateTimeFormat(dt, locale='en_US')
+        self.assertEqual('7', fmt['c'])
+        self.assertEqual('Sat', fmt['ccc'])
+        self.assertEqual('Saturday', fmt['cccc'])
+        self.assertEqual('S', fmt['ccccc'])
+        self.assertEqual('Sa', fmt['cccccc'])
+        self.assertEqual('7', fmt['e'])
+        self.assertEqual('07', fmt['ee'])
+        self.assertEqual('Sat', fmt['eee'])
+        self.assertEqual('Saturday', fmt['eeee'])
+        self.assertEqual('S', fmt['eeeee'])
+        self.assertEqual('Sa', fmt['eeeeee'])
+        self.assertEqual('Sat', fmt['E'])
+        self.assertEqual('Sat', fmt['EE'])
+        self.assertEqual('Sat', fmt['EEE'])
+        self.assertEqual('Saturday', fmt['EEEE'])
+        self.assertEqual('S', fmt['EEEEE'])
+        self.assertEqual('Sa', fmt['EEEEEE'])
+        fmt = dates.DateTimeFormat(dt, locale='uk')
+        self.assertEqual('6', fmt['c'])
+        self.assertEqual('6', fmt['e'])
+        self.assertEqual('06', fmt['ee'])
+
+
     def test_fractional_seconds(self):
         t = time(8, 3, 9, 799)
         fmt = dates.DateTimeFormat(t, locale='en_US')
@@ -491,6 +517,7 @@ def test_get_period_names():
 
 def test_get_day_names():
     assert dates.get_day_names('wide', locale='en_US')[1] == u'Tuesday'
+    assert dates.get_day_names('short', locale='en_US')[1] == u'Tu'
     assert dates.get_day_names('abbreviated', locale='es')[1] == u'mar.'
     de = dates.get_day_names('narrow', context='stand-alone', locale='de_DE')
     assert de[1] == u'D'

From 6844ccc6da9fca94b51dd11623b32f05e805dcfa Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kdeldycke@scaleway.com>
Date: Wed, 2 Mar 2016 12:11:51 +0100
Subject: [PATCH 230/489] Test parsing of mixed-cased locale ID.

---
 tests/test_localedata.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 80dd118c4..e8e91b317 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -13,6 +13,8 @@
 
 import doctest
 import unittest
+import random
+from operator import methodcaller
 
 from babel import localedata
 
@@ -73,6 +75,14 @@ def test_merge():
     localedata.merge(d, {1: 'Foo', 2: 'Bar'})
     assert d == {1: 'Foo', 2: 'Bar', 3: 'baz'}
 
+
 def test_locale_identification():
     for l in localedata.locale_identifiers():
         assert localedata.exists(l)
+
+
+def test_mixedcased_locale():
+    for l in localedata.locale_identifiers():
+        locale_id = ''.join([
+            methodcaller(random.choice(['lower', 'upper']))(c) for c in l])
+        assert localedata.exists(locale_id)

From 3450a6747d85ee458b0c7ab20e1f195bb3f9effe Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kdeldycke@scaleway.com>
Date: Wed, 2 Mar 2016 13:01:37 +0100
Subject: [PATCH 231/489] Test locale IDs uniqueness.

---
 tests/test_localedata.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index e8e91b317..d0d92f61c 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -81,6 +81,15 @@ def test_locale_identification():
         assert localedata.exists(l)
 
 
+def test_unique_ids():
+    # Check all locale IDs are uniques.
+    all_ids = localedata.locale_identifiers()
+    assert len(all_ids) == len(set(all_ids))
+    # Check locale IDs don't collide after lower-case normalization.
+    lower_case_ids = list(map(methodcaller('lower'), all_ids))
+    assert len(lower_case_ids) == len(set(lower_case_ids))
+
+
 def test_mixedcased_locale():
     for l in localedata.locale_identifiers():
         locale_id = ''.join([

From 78eea4c158bfcd9f50205c7ffff08130dbb8286f Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kdeldycke@scaleway.com>
Date: Wed, 2 Mar 2016 17:04:13 +0100
Subject: [PATCH 232/489] Force normalization of locale ID.

---
 babel/localedata.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/babel/localedata.py b/babel/localedata.py
index 437f49fae..a20a8813a 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -15,6 +15,7 @@
 import os
 import threading
 from collections import MutableMapping
+from itertools import chain
 
 from babel._compat import pickle
 
@@ -24,15 +25,22 @@
 _dirname = os.path.join(os.path.dirname(__file__), 'locale-data')
 
 
+def normalize_locale(name):
+    """Return a normalized locale ID or `None` if the ID is not recognized."""
+    name = name.strip().lower()
+    for locale_id in chain.from_iterable([_cache, locale_identifiers()]):
+        if name == locale_id.lower():
+            return locale_id
+
+
 def exists(name):
-    """Check whether locale data is available for the given locale.  Ther
-    return value is `True` if it exists, `False` otherwise.
+    """Check whether locale data is available for the given locale.
+
+    Returns `True` if it exists, `False` otherwise.
 
     :param name: the locale identifier string
     """
-    if name in _cache:
-        return True
-    return os.path.exists(os.path.join(_dirname, '%s.dat' % name))
+    return True if normalize_locale(name) else False
 
 
 def locale_identifiers():

From 5e1c89456ddc1534ddf9b9b0260644a68038f046 Mon Sep 17 00:00:00 2001
From: saurabhiiit <saurabh.agrahari@research.iiit.ac.in>
Date: Thu, 3 Mar 2016 00:00:03 +0530
Subject: [PATCH 233/489] license.rst: Fix typo in General License Defination

---
 docs/license.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/license.rst b/docs/license.rst
index a206e749a..a619b5746 100644
--- a/docs/license.rst
+++ b/docs/license.rst
@@ -26,7 +26,7 @@ documentation.
     :ref:`authors` section.
 
 -   The ":ref:`babel-license`" applies to all the sourcecode shipped as
-    part of Babel (Babel itself as well as the examples and the unittests)
+    part of Babel (Babel itself as well as the examples and the unit tests)
     as well as documentation.
 
 .. _babel-license:

From a5cb8317626b71d532f78c8d86c6b0e790ad4b7f Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kdeldycke@scaleway.com>
Date: Thu, 3 Mar 2016 18:09:05 +0100
Subject: [PATCH 234/489] Explicit normalize_locale() documentation.

---
 babel/localedata.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/babel/localedata.py b/babel/localedata.py
index a20a8813a..265e4b8fd 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -26,7 +26,11 @@
 
 
 def normalize_locale(name):
-    """Return a normalized locale ID or `None` if the ID is not recognized."""
+    """Normalize a locale ID by stripping spaces and apply proper casing.
+
+    Returns the normalized locale ID string or `None` if the ID is not
+    recognized.
+    """
     name = name.strip().lower()
     for locale_id in chain.from_iterable([_cache, locale_identifiers()]):
         if name == locale_id.lower():

From 1a6731e2b51747764199da40bb39fcb9354dfe58 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kdeldycke@scaleway.com>
Date: Thu, 3 Mar 2016 18:17:44 +0100
Subject: [PATCH 235/489] Only attempt a normalization search if filesystem
 lookup fails.

---
 babel/localedata.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/babel/localedata.py b/babel/localedata.py
index 265e4b8fd..1f4373798 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -44,7 +44,10 @@ def exists(name):
 
     :param name: the locale identifier string
     """
-    return True if normalize_locale(name) else False
+    if name in _cache:
+        return True
+    file_found = os.path.exists(os.path.join(_dirname, '%s.dat' % name))
+    return True if file_found else bool(normalize_locale(name))
 
 
 def locale_identifiers():

From ddb5f1f3a8c916453bbe7318b07d361d7521457b Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 14 Feb 2016 19:19:51 +0200
Subject: [PATCH 236/489] import_cldr: improve parsing of day periods

* Day period rules are now imported
* All periods (not just a single context/width) are imported
---
 babel/core.py          |  5 ++-
 scripts/import_cldr.py | 71 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 8764360ab..1c6c98a2f 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -614,7 +614,10 @@ def periods(self):
         >>> Locale('en', 'US').periods['am']
         u'AM'
         """
-        return self._data['periods']
+        try:
+            return self._data['day_periods']['stand-alone']['wide']
+        except KeyError:
+            return {}
 
     @property
     def days(self):
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 5ffcbfcb5..00d11e95e 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -132,6 +132,31 @@ def _extract_plural_rules(file_path):
     return rule_dict
 
 
+def _time_to_seconds_past_midnight(time_expr):
+    """
+    Parse a time expression to seconds after midnight.
+    :param time_expr: Time expression string (H:M or H:M:S)
+    :rtype: int
+    """
+    if time_expr is None:
+        return None
+    if time_expr.count(":") == 1:
+        time_expr += ":00"
+    hour, minute, second = [int(p, 10) for p in time_expr.split(":")]
+    return hour * 60 * 60 + minute * 60 + second
+
+
+def _compact_dict(dict):
+    """
+    "Compact" the given dict by removing items whose value is None or False.
+    """
+    out_dict = {}
+    for key, value in dict.items():
+        if value is not None and value is not False:
+            out_dict[key] = value
+    return out_dict
+
+
 def debug_repr(obj):
     if isinstance(obj, PluralRule):
         return obj.abstract
@@ -301,6 +326,7 @@ def parse_global(srcdir, sup):
 
 
 def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
+    day_period_rules = parse_day_period_rules(parse(os.path.join(srcdir, 'supplemental', 'dayPeriods.xml')))
     # build a territory containment mapping for inheritance
     regions = {}
     for elem in sup.findall('.//territoryContainment/group'):
@@ -355,15 +381,17 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
         log('Processing %s (Language = %s; Territory = %s)',
             filename, language, territory)
 
-        # plural rules
         locale_id = '_'.join(filter(None, [
             language,
             territory != '001' and territory or None
         ]))
+
         if locale_id in plural_rules:
             data['plural_form'] = plural_rules[locale_id]
         if locale_id in ordinal_rules:
             data['ordinal_form'] = ordinal_rules[locale_id]
+        if locale_id in day_period_rules:
+            data["day_period_rules"] = day_period_rules[locale_id]
 
         parse_locale_display_names(data, tree)
 
@@ -587,16 +615,17 @@ def parse_calendar_eras(data, calendar):
 
 
 def parse_calendar_periods(data, calendar):
-    # AM/PM
-    periods = data.setdefault('periods', {})
-    for day_period_width in calendar.findall(
-        'dayPeriods/dayPeriodContext/dayPeriodWidth'
-    ):
-        if day_period_width.attrib['type'] == 'wide':
+    # Day periods (AM/PM/others)
+    periods = data.setdefault('day_periods', {})
+    for day_period_ctx in calendar.findall('dayPeriods/dayPeriodContext'):
+        ctx_type = day_period_ctx.attrib["type"]
+        for day_period_width in day_period_ctx.findall('dayPeriodWidth'):
+            width_type = day_period_width.attrib["type"]
+            dest_dict = periods.setdefault(ctx_type, {}).setdefault(width_type, {})
             for day_period in day_period_width.findall('dayPeriod'):
+                period_type = day_period.attrib['type']
                 if 'alt' not in day_period.attrib:
-                    periods[day_period.attrib['type']] = text_type(
-                        day_period.text)
+                    dest_dict[period_type] = text_type(day_period.text)
 
 
 def parse_calendar_date_formats(data, calendar):
@@ -787,5 +816,29 @@ def parse_currency_formats(data, tree):
                     currency_formats[type] = numbers.parse_pattern(pattern)
 
 
+def parse_day_period_rules(tree):
+    """
+    Parse dayPeriodRule data into a dict.
+
+    :param tree: ElementTree
+    """
+    day_periods = {}
+    for ruleset in tree.findall(".//dayPeriodRuleSet"):
+        ruleset_type = ruleset.attrib.get("type")  # None|"selection"
+        for rules in ruleset.findall("dayPeriodRules"):
+            locales = rules.attrib["locales"].split()
+            for rule in rules.findall("dayPeriodRule"):
+                type = rule.attrib["type"]
+                rule = _compact_dict(dict(
+                    (key, _time_to_seconds_past_midnight(rule.attrib.get(key)))
+                    for key in ("after", "at", "before", "from", "to")
+                ))
+                for locale in locales:
+                    dest_list = day_periods.setdefault(locale, {}).setdefault(ruleset_type, {}).setdefault(type, [])
+                    dest_list.append(rule)
+    return day_periods
+
+
+
 if __name__ == '__main__':
     main()

From a1a0a2310bbc7b9c926e972076bffbd626d8081c Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 14 Feb 2016 19:37:40 +0200
Subject: [PATCH 237/489] Use `day_periods` for `get_period_names`

---
 babel/core.py  | 8 ++++++++
 babel/dates.py | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 1c6c98a2f..f6bc25f14 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -619,6 +619,14 @@ def periods(self):
         except KeyError:
             return {}
 
+    @property
+    def day_periods(self):
+        """Locale display names for various day periods (not necessarily only AM/PM).
+
+        These are not meant to be used without the relevant `day_period_rules`.
+        """
+        return self._data['day_periods']
+
     @property
     def days(self):
         """Locale display names for weekdays.
diff --git a/babel/dates.py b/babel/dates.py
index 0ba2a2f5e..65c597356 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -247,15 +247,17 @@ def __repr__(self):
         )
 
 
-def get_period_names(locale=LC_TIME):
+def get_period_names(width='wide', context='stand-alone', locale=LC_TIME):
     """Return the names for day periods (AM/PM) used by the locale.
 
     >>> get_period_names(locale='en_US')['am']
     u'AM'
 
+    :param width: the width to use, one of "abbreviated", "narrow", or "wide"
+    :param context: the context, either "format" or "stand-alone"
     :param locale: the `Locale` object, or a locale string
     """
-    return Locale.parse(locale).periods
+    return Locale.parse(locale).day_periods[context][width]
 
 
 def get_day_names(width='wide', context='format', locale=LC_TIME):

From 05f845cb22b52bbab61f51464ff1acd2b05fa08b Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 14 Feb 2016 20:04:45 +0200
Subject: [PATCH 238/489] dates: refactor `_get_time()` into a helper

---
 babel/dates.py | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 65c597356..991d11b7f 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -138,6 +138,32 @@ def _ensure_datetime_tzinfo(datetime, tzinfo=None):
     return datetime
 
 
+def _get_time(time, tzinfo=None):
+    """
+    Get a timezoned time from a given instant.
+
+    .. warning:: The return values of this function may depend on the system clock.
+
+    :param time: time, datetime or None
+    :rtype: time
+    """
+    if time is None:
+        time = datetime.utcnow()
+    elif isinstance(time, number_types):
+        time = datetime.utcfromtimestamp(time)
+    if time.tzinfo is None:
+        time = time.replace(tzinfo=UTC)
+    if isinstance(time, datetime):
+        if tzinfo is not None:
+            time = time.astimezone(tzinfo)
+            if hasattr(tzinfo, 'normalize'):  # pytz
+                time = tzinfo.normalize(time)
+        time = time.timetz()
+    elif tzinfo is not None:
+        time = time.replace(tzinfo=tzinfo)
+    return time
+
+
 def get_timezone(zone=None):
     """Looks up a timezone by name and returns it.  The timezone object
     returned comes from ``pytz`` and corresponds to the `tzinfo` interface and
@@ -753,20 +779,7 @@ def format_time(time=None, format='medium', tzinfo=None, locale=LC_TIME):
     :param tzinfo: the time-zone to apply to the time for display
     :param locale: a `Locale` object or a locale identifier
     """
-    if time is None:
-        time = datetime.utcnow()
-    elif isinstance(time, number_types):
-        time = datetime.utcfromtimestamp(time)
-    if time.tzinfo is None:
-        time = time.replace(tzinfo=UTC)
-    if isinstance(time, datetime):
-        if tzinfo is not None:
-            time = time.astimezone(tzinfo)
-            if hasattr(tzinfo, 'normalize'):  # pytz
-                time = tzinfo.normalize(time)
-        time = time.timetz()
-    elif tzinfo is not None:
-        time = time.replace(tzinfo=tzinfo)
+    time = _get_time(time, tzinfo)
 
     locale = Locale.parse(locale)
     if format in ('full', 'long', 'medium', 'short'):

From 151fda947accfb3501053613e5ebb17c63d64ef4 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 14 Feb 2016 20:56:02 +0200
Subject: [PATCH 239/489] dates: Add day period API

---
 babel/core.py             |  6 +++++
 babel/dates.py            | 50 +++++++++++++++++++++++++++++++++++++++
 tests/test_day_periods.py | 18 ++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 tests/test_day_periods.py

diff --git a/babel/core.py b/babel/core.py
index f6bc25f14..c7d299e04 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -627,6 +627,12 @@ def day_periods(self):
         """
         return self._data['day_periods']
 
+    @property
+    def day_period_rules(self):
+        """Day period rules for the locale.  Used by `get_period_id`.
+        """
+        return self._data.get('day_period_rules', {})
+
     @property
     def days(self):
         """Locale display names for weekdays.
diff --git a/babel/dates.py b/babel/dates.py
index 991d11b7f..62ba79b96 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1059,6 +1059,56 @@ def format_interval(start, end, skeleton=None, tzinfo=None, fuzzy=True, locale=L
     return _format_fallback_interval(start, end, skeleton, tzinfo, locale)
 
 
+def get_period_id(time, tzinfo=None, type=None, locale=LC_TIME):
+    """
+    Get the day period ID for a given time.
+
+    This ID can be used as a key for the period name dictionary.
+
+    >>> get_period_names(locale="de")[get_period_id(time(7, 42), locale="de")]
+    u'Morgen'
+
+    :param time: The time to inspect.
+    :param tzinfo: The timezone for the time. See ``format_time``.
+    :param type: The period type to use. Either "selection" or None.
+                 The selection type is used for selecting among phrases such as
+                 “Your email arrived yesterday evening” or “Your email arrived last night”.
+    :param locale: the `Locale` object, or a locale string
+    :return: period ID. Something is always returned -- even if it's just "am" or "pm".
+    """
+    time = _get_time(time, tzinfo)
+    seconds_past_midnight = int(time.hour * 60 * 60 + time.minute * 60 + time.second)
+    locale = Locale.parse(locale)
+
+    # The LDML rules state that the rules may not overlap, so iterating in arbitrary
+    # order should be alright.
+    for rule_id, rules in locale.day_period_rules.get(type, {}).items():
+        for rule in rules:
+            if "at" in rule and rule["at"] == seconds_past_midnight:
+                return rule_id
+
+            start_ok = end_ok = False
+
+            if "from" in rule and seconds_past_midnight >= rule["from"]:
+                start_ok = True
+            if "to" in rule and seconds_past_midnight <= rule["to"]:
+                # This rule type does not exist in the present CLDR data;
+                # excuse the lack of test coverage.
+                end_ok = True
+            if "before" in rule and seconds_past_midnight < rule["before"]:
+                end_ok = True
+            if "after" in rule and seconds_past_midnight > rule["after"]:
+                start_ok = True
+
+            if start_ok and end_ok:
+                return rule_id
+
+    if seconds_past_midnight < 43200:
+        return "am"
+    else:
+        return "pm"
+
+
 def parse_date(string, locale=LC_TIME):
     """Parse a date from a string.
 
diff --git a/tests/test_day_periods.py b/tests/test_day_periods.py
new file mode 100644
index 000000000..eb12b07f4
--- /dev/null
+++ b/tests/test_day_periods.py
@@ -0,0 +1,18 @@
+# -- encoding: UTF-8 --
+from datetime import time
+
+import babel.dates as dates
+import pytest
+
+
+@pytest.mark.parametrize("locale, time, expected_period_id", [
+    ("de", time(7, 42), "morning1"),  # (from, before)
+    ("de", time(3, 11), "night1"),  # (after, before)
+    ("fi", time(0), "midnight"),  # (at)
+    ("en_US", time(12), "noon"),  # (at)
+    ("agq", time(10), "am"),  # no periods defined
+    ("agq", time(22), "pm"),  # no periods defined
+    ("am", time(14), "afternoon1"),  # (before, after)
+])
+def test_day_period_rules(locale, time, expected_period_id):
+    assert dates.get_period_id(time, locale=locale) == expected_period_id

From aaa5bfffe8621f3fbc6f73b37a0256a5d95007cd Mon Sep 17 00:00:00 2001
From: saurabhiiit <saurabh.agrahari@research.iiit.ac.in>
Date: Mon, 7 Mar 2016 00:04:07 +0530
Subject: [PATCH 240/489] docs/numbers.rst: Correct line length

Fixes https://github.com/python-babel/babel/issues/363
---
 docs/numbers.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/numbers.rst b/docs/numbers.rst
index fb71adf1e..fbba1f3ed 100644
--- a/docs/numbers.rst
+++ b/docs/numbers.rst
@@ -46,7 +46,8 @@ Examples:
 The syntax for custom number format patterns is described in detail in the
 the specification. The following table is just a relatively brief overview.
 
- .. _`Locale Data Markup Language specification`: http://unicode.org/reports/tr35/#Number_Format_Patterns
+ .. _`Locale Data Markup Language specification`:
+    http://unicode.org/reports/tr35/#Number_Format_Patterns
 
   +----------+-----------------------------------------------------------------+
   | Symbol   | Description                                                     |

From bc52d1a588ba4c68eaf6395e93a218c439dee090 Mon Sep 17 00:00:00 2001
From: Lukas Balaga <lukas.balaga@gmail.com>
Date: Mon, 7 Mar 2016 21:15:37 -0800
Subject: [PATCH 241/489] Add flake8 pre-commit hook and apply fixes.

---
 .pre-commit-config.yaml        | 8 +++++---
 babel/core.py                  | 6 +++---
 babel/messages/pofile.py       | 2 +-
 babel/numbers.py               | 1 -
 babel/util.py                  | 5 ++---
 scripts/make-release.py        | 1 -
 tests/messages/test_catalog.py | 2 +-
 tests/test_core.py             | 6 ++----
 tests/test_dates.py            | 4 +---
 tests/test_localedata.py       | 1 -
 tox.ini                        | 4 ++--
 11 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f22634779..1fd8b5cb5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,17 +1,19 @@
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     sha: 97b88d9610bcc03982ddac33caba98bb2b751f5f
     hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
     -   id: autopep8-wrapper
         exclude: (docs/conf.py|tests/messages/data/)
+    -   id: check-added-large-files
     -   id: check-docstring-first
         exclude: (docs/conf.py)
     -   id: check-json
-    -   id: check-added-large-files
     -   id: check-yaml
     -   id: debug-statements
+    -   id: end-of-file-fixer
+    -   id: flake8
+        exclude: (docs/conf.py|babel/messages/__init__.py|babel/__init__.py|babel/_compat.py|tests/messages/data|scripts/import_cldr.py)
     -   id: name-tests-test
         args: ['--django']
         exclude: (tests/messages/data/)
     -   id: requirements-txt-fixer
+    -   id: trailing-whitespace
diff --git a/babel/core.py b/babel/core.py
index 8764360ab..482e7ab96 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -469,7 +469,7 @@ def english_name(self):
         :type: `unicode`"""
         return self.get_display_name(Locale('en'))
 
-    #{ General Locale Display Names
+    # { General Locale Display Names
 
     @property
     def languages(self):
@@ -516,7 +516,7 @@ def variants(self):
         """
         return self._data['variants']
 
-    #{ Number Formatting
+    # { Number Formatting
 
     @property
     def currencies(self):
@@ -605,7 +605,7 @@ def scientific_formats(self):
         """
         return self._data['scientific_formats']
 
-    #{ Calendar Information and Date Formatting
+    # { Calendar Information and Date Formatting
 
     @property
     def periods(self):
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 00a21f49f..a775ec049 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -339,7 +339,7 @@ def normalize(string, prefix='', width=76):
     if lines and not lines[-1]:
         del lines[-1]
         lines[-1] += '\n'
-    return u'""\n' + u'\n'.join([(prefix + escape(l)) for l in lines])
+    return u'""\n' + u'\n'.join([(prefix + escape(line)) for line in lines])
 
 
 def write_po(fileobj, catalog, width=76, no_location=False, omit_header=False,
diff --git a/babel/numbers.py b/babel/numbers.py
index c4a2b2031..3ab366ccc 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -676,7 +676,6 @@ def _format_frac(self, value, locale, force_frac=None):
             value += ('0' * (min - len(value)))
         if max == 0 or (min == 0 and int(value) == 0):
             return ''
-        width = len(value)
         while len(value) > min and value[-1] == '0':
             value = value[:-1]
         return get_decimal_symbol(locale) + value
diff --git a/babel/util.py b/babel/util.py
index c0a94172c..aeb9a5fab 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -15,6 +15,8 @@
 import re
 import textwrap
 from babel._compat import izip, imap
+import pytz as _pytz
+from babel import localtime
 
 missing = object()
 
@@ -261,9 +263,6 @@ def dst(self, dt):
         return ZERO
 
 
-import pytz as _pytz
-from babel import localtime
-
 # Export the localtime functionality here because that's
 # where it was in the past.
 UTC = _pytz.utc
diff --git a/scripts/make-release.py b/scripts/make-release.py
index a695da2e9..7477ad387 100755
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -26,7 +26,6 @@ def parse_changelog():
             match = re.search('^Version\s+(.*)', line.strip())
             if match is None:
                 continue
-            length = len(match.group(1))
             version = match.group(1).strip()
             if lineiter.next().count('-') != len(match.group(0)):
                 continue
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index 5194a783a..f16a4dcb7 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -456,7 +456,7 @@ def test_catalog_update():
     assert msg3.string == (u'Salat', u'Salate')
     assert msg3.locations == [('util.py', 42)]
 
-    assert not 'head' in cat
+    assert 'head' not in cat
     assert list(cat.obsolete.values())[0].id == 'head'
 
     cat.update(template, update_header_comment=True)
diff --git a/tests/test_core.py b/tests/test_core.py
index b9de4cbe6..29081f079 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -11,11 +11,9 @@
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
 
-import doctest
-import unittest
 import pytest
 
-from babel import core, Locale
+from babel import core
 from babel.core import default_locale, Locale
 
 
@@ -41,7 +39,7 @@ def test_locale_comparison():
     assert en_US == en_US_2
     assert en_US != fi_FI
     assert not (en_US != en_US_2)
-    assert None != en_US
+    assert en_US is not None
     assert en_US != bad_en_US
     assert fi_FI != bad_en_US
 
diff --git a/tests/test_dates.py b/tests/test_dates.py
index ca1faf0a9..d99baf308 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -13,7 +13,6 @@
 
 import calendar
 from datetime import date, datetime, time, timedelta
-import types
 import unittest
 
 from pytz import timezone
@@ -161,7 +160,7 @@ def test_local_day_of_week_standalone(self):
         self.assertEqual('4', fmt['c'])  # friday is first day of week
 
     def test_pattern_day_of_week(self):
-        dt = datetime(2016,2,6)
+        dt = datetime(2016, 2, 6)
         fmt = dates.DateTimeFormat(dt, locale='en_US')
         self.assertEqual('7', fmt['c'])
         self.assertEqual('Sat', fmt['ccc'])
@@ -185,7 +184,6 @@ def test_pattern_day_of_week(self):
         self.assertEqual('6', fmt['e'])
         self.assertEqual('06', fmt['ee'])
 
-
     def test_fractional_seconds(self):
         t = time(8, 3, 9, 799)
         fmt = dates.DateTimeFormat(t, locale='en_US')
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index d0d92f61c..6a41ac2ad 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -11,7 +11,6 @@
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
 
-import doctest
 import unittest
 import random
 from operator import methodcaller
diff --git a/tox.ini b/tox.ini
index 0fa957a73..812561da7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ whitelist_externals = make
 commands = make clean-cldr test
 
 [pep8]
-ignore = E501,E731
+ignore = E501,E731,W503
 
 [flake8]
-ignore = E501,E731
+ignore = E501,E731,W503

From c3536d49c1b72a94b3cf73499174238fb89cf05a Mon Sep 17 00:00:00 2001
From: "alexbodn@gmail.com" <alexbodn@gmail.com>
Date: Sun, 13 Mar 2016 13:28:20 +0200
Subject: [PATCH 242/489] Add support for character order information

---
 babel/core.py          | 23 +++++++++++++++++++++++
 scripts/import_cldr.py |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/babel/core.py b/babel/core.py
index 3e9f9a399..251ebf161 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -885,6 +885,29 @@ def ordinal_form(self):
         """
         return self._data.get('ordinal_form', _default_plural_rule)
 
+    @property
+    def character_order(self):
+        """The text direction for the language.
+
+        >>> Locale('de', 'DE').character_order
+        'left-to-right'
+        >>> Locale('ar', 'SA').character_order
+        'right-to-left'
+        """
+        return self._data['character_order']
+
+    @property
+    def direction(self):
+        """The text direction for the language in CSS short-hand form.
+
+        >>> Locale('de', 'DE').direction
+        'ltr'
+        >>> Locale('ar', 'SA').direction
+        'rtl'
+        """
+        order = self.character_order
+        return ''.join([word[0] for word in order.split('-')])
+
 
 def default_locale(category=None, aliases=LOCALE_ALIASES):
     """Returns the system default locale for a given category, based on
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 00d11e95e..af48d0f3d 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -422,6 +422,9 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
         parse_unit_patterns(data, tree)
         parse_date_fields(data, tree)
 
+        for elem in tree.findall('.//layout/orientation/characterOrder'):
+            data['character_order'] = elem.text
+
         write_datafile(data_filename, data, dump_json=dump_json)
 
 

From 2ab44a043b870a7532efaf48eec808456c134f91 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 30 Mar 2016 17:53:09 +0300
Subject: [PATCH 243/489] Move character order parsing into a function of its
 own

---
 scripts/import_cldr.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index af48d0f3d..898ec30fd 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -421,9 +421,7 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
         parse_currency_names(data, tree)
         parse_unit_patterns(data, tree)
         parse_date_fields(data, tree)
-
-        for elem in tree.findall('.//layout/orientation/characterOrder'):
-            data['character_order'] = elem.text
+        parse_character_order(data, tree)
 
         write_datafile(data_filename, data, dump_json=dump_json)
 
@@ -842,6 +840,11 @@ def parse_day_period_rules(tree):
     return day_periods
 
 
+def parse_character_order(data, tree):
+    for elem in tree.findall('.//layout/orientation/characterOrder'):
+        data['character_order'] = elem.text
+
+
 
 if __name__ == '__main__':
     main()

From 532f638daed43125ea8acbea82d0ad97fd80ebcd Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 30 Mar 2016 17:32:27 +0300
Subject: [PATCH 244/489] Rename `Locale.direction` to `Locale.text_direction`.

---
 babel/core.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 251ebf161..cdd823887 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -897,16 +897,15 @@ def character_order(self):
         return self._data['character_order']
 
     @property
-    def direction(self):
+    def text_direction(self):
         """The text direction for the language in CSS short-hand form.
 
-        >>> Locale('de', 'DE').direction
+        >>> Locale('de', 'DE').text_direction
         'ltr'
-        >>> Locale('ar', 'SA').direction
+        >>> Locale('ar', 'SA').text_direction
         'rtl'
         """
-        order = self.character_order
-        return ''.join([word[0] for word in order.split('-')])
+        return ''.join(word[0] for word in self.character_order.split('-'))
 
 
 def default_locale(category=None, aliases=LOCALE_ALIASES):

From 91ae2ef5429e4c1ed69fe072086b9a3d50d3ad7a Mon Sep 17 00:00:00 2001
From: "alexbodn@gmail.com" <alexbodn@gmail.com>
Date: Sat, 19 Mar 2016 14:46:28 +0200
Subject: [PATCH 245/489] Expose measurement system names.

---
 babel/core.py          | 12 ++++++++++++
 scripts/import_cldr.py |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/babel/core.py b/babel/core.py
index cdd823887..dae7572a3 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -885,6 +885,18 @@ def ordinal_form(self):
         """
         return self._data.get('ordinal_form', _default_plural_rule)
 
+    @property
+    def measurement_systems(self):
+        """Localized names for various measurement systems.
+
+        >>> Locale('fr', 'FR').measurement_systems['US']
+        u'am\\xe9ricain'
+        >>> Locale('en', 'US').measurement_systems['US']
+        u'US'
+
+        """
+        return self._data['measurement_systems']
+
     @property
     def character_order(self):
         """The text direction for the language.
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 898ec30fd..ff66738d2 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -481,6 +481,10 @@ def parse_locale_display_names(data, tree):
         for listPattern in listType.findall('listPatternPart'):
             list_patterns[listPattern.attrib['type']] = _text(listPattern)
 
+    measurement_systems = data.setdefault('measurement_systems', {})
+    for measurement_system in tree.findall('.//measurementSystemNames/measurementSystemName'):
+        measurement_systems[measurement_system.attrib['type']] = _text(measurement_system)
+
 
 def parse_dates(data, tree, sup, regions, territory):
     week_data = data.setdefault('week_data', {})

From 99dc0c73b6a213aa3164a4719ed851dc514519c1 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 30 Mar 2016 17:40:14 +0300
Subject: [PATCH 246/489] Embetter measurement system parsing:

* Refactor into a separate function
* Use `_import_type_text` when importing measurement systems
---
 scripts/import_cldr.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index ff66738d2..c3a5e596d 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -422,6 +422,7 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
         parse_unit_patterns(data, tree)
         parse_date_fields(data, tree)
         parse_character_order(data, tree)
+        parse_measurement_systems(data, tree)
 
         write_datafile(data_filename, data, dump_json=dump_json)
 
@@ -481,10 +482,6 @@ def parse_locale_display_names(data, tree):
         for listPattern in listType.findall('listPatternPart'):
             list_patterns[listPattern.attrib['type']] = _text(listPattern)
 
-    measurement_systems = data.setdefault('measurement_systems', {})
-    for measurement_system in tree.findall('.//measurementSystemNames/measurementSystemName'):
-        measurement_systems[measurement_system.attrib['type']] = _text(measurement_system)
-
 
 def parse_dates(data, tree, sup, regions, territory):
     week_data = data.setdefault('week_data', {})
@@ -849,6 +846,14 @@ def parse_character_order(data, tree):
         data['character_order'] = elem.text
 
 
+def parse_measurement_systems(data, tree):
+    measurement_systems = data.setdefault('measurement_systems', {})
+    for measurement_system in tree.findall('.//measurementSystemNames/measurementSystemName'):
+        type = measurement_system.attrib['type']
+        if not _should_skip_elem(measurement_system, type=type, dest=measurement_systems):
+            _import_type_text(measurement_systems, measurement_system, type=type)
+
+
 
 if __name__ == '__main__':
     main()

From 128afa091715a194e1483f9d606c370cf6ae794d Mon Sep 17 00:00:00 2001
From: Yuriy Shatrov <y_shatrov@wargaming.net>
Date: Tue, 5 Apr 2016 11:24:51 +0300
Subject: [PATCH 247/489] plurals: correct plural forms for cs and sk locales

Change plural forms for Czech (cs) and Slovak (sk) locales from Plural rule #_7_ to Plural rule #_8_ according to https://developer.mozilla.org/en-US/docs/Mozilla/Localization/Localization_and_Plurals .

Fixes https://github.com/python-babel/babel/issues/372
---
 babel/messages/plurals.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
index cc7b79e3e..38c04ca44 100644
--- a/babel/messages/plurals.py
+++ b/babel/messages/plurals.py
@@ -75,7 +75,7 @@
     # Cree
     # 'cr': (),
     # Czech
-    'cs': (3, '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)'),
+    'cs': (3, '((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2)'),
     # Church Slavic
     # 'cu': (),
     # Chuvash
@@ -171,7 +171,7 @@
     # Russian
     'ru': (3, '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)'),
     # Slovak
-    'sk': (3, '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)'),
+    'sk': (3, '((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2)'),
     # Slovenian
     'sl': (4, '(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)'),
     # Serbian - From Pootle's PO's

From 57088a4ebbf6ba6a2c35e2b9f56dac28baeeb9ee Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 30 Mar 2016 19:41:52 +0300
Subject: [PATCH 248/489] CLDR: import unit_patterns as nested dicts

(Instead of colon-separated flat dicts.)

This should not be a breaking change, unless someone has used the private
API `l._data["unit_patterns"]`.
---
 babel/dates.py         | 3 +--
 scripts/import_cldr.py | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 62ba79b96..3c75b385e 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -915,8 +915,7 @@ def _iter_patterns(a_unit):
             else:
                 yield unit_rel_patterns['past']
         a_unit = 'duration-' + a_unit
-        yield locale._data['unit_patterns'].get(a_unit + ':' + format)
-        yield locale._data['unit_patterns'].get(a_unit)
+        yield locale._data['unit_patterns'].get(a_unit, {}).get(format)
 
     for unit, secs_per_unit in TIMEDELTA_UNITS:
         value = abs(seconds) / secs_per_unit
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index c3a5e596d..58a1a0124 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -761,10 +761,9 @@ def parse_unit_patterns(data, tree):
         unit_length_type = elem.attrib['type']
         for unit in elem.findall('unit'):
             unit_type = unit.attrib['type']
+            unit_and_length_patterns = unit_patterns.setdefault(unit_type, {}).setdefault(unit_length_type, {})
             for pattern in unit.findall('unitPattern'):
-                box = unit_type
-                box += ':' + unit_length_type
-                unit_patterns.setdefault(box, {})[pattern.attrib['count']] = text_type(pattern.text)
+                unit_and_length_patterns[pattern.attrib['count']] = _text(pattern)
 
 
 def parse_date_fields(data, tree):
@@ -804,6 +803,7 @@ def parse_currency_formats(data, tree):
             type = elem.attrib.get('type')
             if curr_length_type:
                 # Handle `<currencyFormatLength type="short">`, etc.
+                # TODO(3.x): use nested dicts instead of colon-separated madness
                 type = '%s:%s' % (type, curr_length_type)
             if _should_skip_elem(elem, type, currency_formats):
                 continue

From 3bb3dbb797f22225813252b82da12b89b61d7d3e Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 30 Mar 2016 19:15:59 +0300
Subject: [PATCH 249/489] Import and expose more measurement unit related
 information

---
 babel/core.py          | 14 ++++++++++++++
 scripts/import_cldr.py | 17 +++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/babel/core.py b/babel/core.py
index dae7572a3..4e00ebfb5 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -919,6 +919,20 @@ def text_direction(self):
         """
         return ''.join(word[0] for word in self.character_order.split('-'))
 
+    @property
+    def unit_display_names(self):
+        """Display names for units of measurement.
+
+        .. seealso::
+
+           You may want to use :py:func:`babel.units.get_unit_name` instead.
+
+        .. note:: The format of the value returned may change between
+                  Babel versions.
+
+        """
+        return self._data['unit_display_names']
+
 
 def default_locale(category=None, aliases=LOCALE_ALIASES):
     """Returns the system default locale for a given category, based on
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 58a1a0124..f684de343 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -757,6 +757,9 @@ def parse_currency_names(data, tree):
 
 def parse_unit_patterns(data, tree):
     unit_patterns = data.setdefault('unit_patterns', {})
+    compound_patterns = data.setdefault('compound_unit_patterns', {})
+    unit_display_names = data.setdefault('unit_display_names', {})
+
     for elem in tree.findall('.//units/unitLength'):
         unit_length_type = elem.attrib['type']
         for unit in elem.findall('unit'):
@@ -765,6 +768,20 @@ def parse_unit_patterns(data, tree):
             for pattern in unit.findall('unitPattern'):
                 unit_and_length_patterns[pattern.attrib['count']] = _text(pattern)
 
+            per_unit_pat = unit.find('perUnitPattern')
+            if per_unit_pat is not None:
+                unit_and_length_patterns['per'] = _text(per_unit_pat)
+
+            display_name = unit.find('displayName')
+            if display_name is not None:
+                unit_display_names.setdefault(unit_type, {})[unit_length_type] = _text(display_name)
+
+        for unit in elem.findall('compoundUnit'):
+            unit_type = unit.attrib['type']
+            compound_patterns.setdefault(unit_type, {})[unit_length_type] = (
+                _text(unit.find('compoundUnitPattern'))
+            )
+
 
 def parse_date_fields(data, tree):
     date_fields = data.setdefault('date_fields', {})

From ca9dedefc5bbde1298cde1518be7dff075abfd6a Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 30 Mar 2016 20:03:53 +0300
Subject: [PATCH 250/489] Add new unit formatting APIs:

* babel.units.format_unit
* babel.units.format_compound_unit
* babel.units.get_unit_name
---
 babel/units.py     | 241 +++++++++++++++++++++++++++++++++++++++++++++
 docs/api/index.rst |   3 +-
 docs/api/units.rst |  13 +++
 3 files changed, 256 insertions(+), 1 deletion(-)
 create mode 100644 babel/units.py
 create mode 100644 docs/api/units.rst

diff --git a/babel/units.py b/babel/units.py
new file mode 100644
index 000000000..621952ecc
--- /dev/null
+++ b/babel/units.py
@@ -0,0 +1,241 @@
+# -- encoding: UTF-8 --
+
+from babel._compat import string_types
+from babel.core import Locale
+from babel.numbers import format_decimal, LC_NUMERIC
+
+
+class UnknownUnitError(ValueError):
+    def __init__(self, unit, locale):
+        ValueError.__init__(self, "%s is not a known unit in %s" % (unit, locale))
+
+
+def get_unit_name(measurement_unit, length='long', locale=LC_NUMERIC):
+    """
+    Get the display name for a measurement unit in the given locale.
+
+    >>> get_unit_name("radian", locale="en")
+    'radians'
+
+    Unknown units will raise exceptions:
+
+    >>> get_unit_name("battery", locale="fi")
+    Traceback (most recent call last):
+        ...
+    UnknownUnitError: battery/long is not a known unit/length in fi
+
+    :param measurement_unit: the code of a measurement unit.
+                             Known units can be found in the CLDR Unit Validity XML file:
+                             http://unicode.org/repos/cldr/tags/latest/common/validity/unit.xml
+
+    :param length: "short", "long" or "narrow"
+    :param locale: the `Locale` object or locale identifier
+    :return: The unit display name, or None.
+    """
+    locale = Locale.parse(locale)
+    unit = _find_unit_pattern(measurement_unit, locale=locale)
+    if not unit:
+        raise UnknownUnitError(unit=measurement_unit, locale=locale)
+    return locale.unit_display_names.get(unit, {}).get(length)
+
+
+def _find_unit_pattern(unit_id, locale=LC_NUMERIC):
+    """
+    Expand an unit into a qualified form.
+
+    Known units can be found in the CLDR Unit Validity XML file:
+    http://unicode.org/repos/cldr/tags/latest/common/validity/unit.xml
+
+    >>> _find_unit_pattern("radian", locale="en")
+    'angle-radian'
+
+    Unknown values will return None.
+
+    >>> _find_unit_pattern("horse", locale="en")
+
+    :param unit_id: the code of a measurement unit.
+    :return: A key to the `unit_patterns` mapping, or None.
+    """
+    locale = Locale.parse(locale)
+    unit_patterns = locale._data["unit_patterns"]
+    if unit_id in unit_patterns:
+        return unit_id
+    for unit_pattern in sorted(unit_patterns, key=len):
+        if unit_pattern.endswith(unit_id):
+            return unit_pattern
+
+
+def format_unit(value, measurement_unit, length='long', format=None, locale=LC_NUMERIC):
+    """Format a value of a given unit.
+
+    Values are formatted according to the locale's usual pluralization rules
+    and number formats.
+
+    >>> format_unit(12, 'length-meter', locale='ro_RO')
+    u'12 metri'
+    >>> format_unit(15.5, 'length-mile', locale='fi_FI')
+    u'15,5 mailia'
+    >>> format_unit(1200, 'pressure-inch-hg', locale='nb')
+    u'1\\xa0200 tommer kvikks\\xf8lv'
+
+    Number formats may be overridden with the ``format`` parameter.
+
+    >>> from babel._compat import Decimal
+    >>> format_unit(Decimal("-42.774"), 'temperature-celsius', 'short', format='#.0', locale='fr')
+    u'-42,8 \\xb0C'
+
+    The locale's usual pluralization rules are respected.
+
+    >>> format_unit(1, 'length-meter', locale='ro_RO')
+    u'1 metru'
+    >>> format_unit(0, 'length-picometer', locale='cy')
+    u'0 picometr'
+    >>> format_unit(2, 'length-picometer', locale='cy')
+    u'2 bicometr'
+    >>> format_unit(3, 'length-picometer', locale='cy')
+    u'3 phicometr'
+
+    >>> format_unit(15, 'length-horse', locale='fi')
+    Traceback (most recent call last):
+        ...
+    UnknownUnitError: length-horse is not a known unit in fi
+
+    .. versionadded:: 2.2.0
+
+    :param value: the value to format.
+    :param measurement_unit: the code of a measurement unit.
+                             Known units can be found in the CLDR Unit Validity XML file:
+                             http://unicode.org/repos/cldr/tags/latest/common/validity/unit.xml
+    :param length: "short", "long" or "narrow"
+    :param format: An optional format, as accepted by `format_decimal`.
+    :param locale: the `Locale` object or locale identifier
+    """
+    locale = Locale.parse(locale)
+
+    q_unit = _find_unit_pattern(measurement_unit, locale=locale)
+    if not q_unit:
+        raise UnknownUnitError(unit=measurement_unit, locale=locale)
+    unit_patterns = locale._data["unit_patterns"][q_unit].get(length, {})
+    formatted_value = format_decimal(value, format, locale)
+    plural_form = locale.plural_form(value)
+    if plural_form in unit_patterns:
+        return unit_patterns[plural_form].format(formatted_value)
+
+    # Fall back to a somewhat bad representation.
+    return '%s %s' % (
+        formatted_value,
+        (get_unit_name(measurement_unit, length=length, locale=locale) or measurement_unit)
+    )
+
+
+def _find_compound_unit(numerator_unit, denominator_unit, locale=LC_NUMERIC):
+    """
+    Find a predefined compound unit pattern.
+
+    Used internally by format_compound_unit.
+
+    >>> _find_compound_unit("kilometer", "hour", locale="en")
+    'speed-kilometer-per-hour'
+
+    >>> _find_compound_unit("mile", "gallon", locale="en")
+    'consumption-mile-per-gallon'
+
+    :param numerator_unit: The numerator unit's identifier
+    :param denominator_unit: The denominator unit's identifier
+    :param locale: the `Locale` object or locale identifier
+    :return: A key to the `unit_patterns` mapping, or None.
+    """
+    locale = Locale.parse(locale)
+    numerator_unit_length = _find_unit_pattern(numerator_unit, locale=locale)
+    denominator_unit_length = _find_unit_pattern(denominator_unit, locale=locale)
+    if not (numerator_unit_length and denominator_unit_length):
+        return None
+    # Since compound units are named "speed-kilometer-per-hour", we'll have to slice off
+    # the quantities from both qualified units.
+    bare_numerator_unit = numerator_unit_length.split("-", 1)[-1]
+    bare_denominator_unit = denominator_unit_length.split("-", 1)[-1]
+    # Now we can try and rebuild a compound unit specifier, then qualify it:
+    return _find_unit_pattern("%s-per-%s" % (bare_numerator_unit, bare_denominator_unit), locale=locale)
+
+
+def format_compound_unit(
+    numerator_value, numerator_unit=None,
+    denominator_value=1, denominator_unit=None,
+    length='long', format=None, locale=LC_NUMERIC
+):
+    """
+    Format a compound number value, i.e. "kilometers per hour" or similar.
+
+    Both unit specifiers are optional to allow for formatting of arbitrary values still according
+    to the locale's general "per" formatting specifier.
+
+    >>> format_compound_unit(7, denominator_value=11, length="short", locale="pt")
+    '7/11'
+
+    >>> format_compound_unit(150, "kilometer", denominator_unit="hour", locale="sv")
+    '150 kilometer per timme'
+
+    >>> format_compound_unit(150, "kilowatt", denominator_unit="year", locale="fi")
+    '150 kilowattia vuodessa'
+
+    >>> format_compound_unit(32.5, "ton", 15, denominator_unit="hour", locale="en")
+    '32.5 tons per 15 hours'
+
+    >>> format_compound_unit(160, denominator_unit="square-meter", locale="fr")
+    '160 par m\\xe8tre carr\\xe9'
+
+    >>> format_compound_unit(4, "meter", "ratakisko", length="short", locale="fi")
+    '4 m/ratakisko'
+
+    >>> from babel.numbers import format_currency
+    >>> format_compound_unit(format_currency(35, "JPY", locale="de"), denominator_unit="liter", locale="de")
+    '35\\xa0\\xa5 pro Liter'
+
+    :param numerator_value: The numerator value. This may be a string,
+                            in which case it is considered preformatted and the unit is ignored.
+    :param numerator_unit: The numerator unit. See `format_unit`.
+    :param denominator_value: The denominator value. This may be a string,
+                              in which case it is considered preformatted and the unit is ignored.
+    :param denominator_unit: The denominator unit. See `format_unit`.
+    :param length: The formatting length. "short", "long" or "narrow"
+    :param format: An optional format, as accepted by `format_decimal`.
+    :param locale: the `Locale` object or locale identifier
+    :return: A formatted compound value.
+    """
+    locale = Locale.parse(locale)
+
+    # Look for a specific compound unit first...
+
+    if numerator_unit and denominator_unit and denominator_value == 1:
+        compound_unit = _find_compound_unit(numerator_unit, denominator_unit, locale=locale)
+        if compound_unit:
+            return format_unit(numerator_value, compound_unit, length=length, format=format, locale=locale)
+
+    # ... failing that, construct one "by hand".
+
+    if isinstance(numerator_value, string_types):  # Numerator is preformatted
+        formatted_numerator = numerator_value
+    elif numerator_unit:  # Numerator has unit
+        formatted_numerator = format_unit(
+            numerator_value, numerator_unit, length=length, format=format, locale=locale
+        )
+    else:  # Unitless numerator
+        formatted_numerator = format_decimal(numerator_value, format=format, locale=locale)
+
+    if isinstance(denominator_value, string_types):  # Denominator is preformatted
+        formatted_denominator = denominator_value
+    elif denominator_unit:  # Denominator has unit
+        if denominator_value == 1:  # support perUnitPatterns when the denominator is 1
+            denominator_unit = _find_unit_pattern(denominator_unit, locale=locale)
+            per_pattern = locale._data["unit_patterns"].get(denominator_unit, {}).get(length, {}).get("per")
+            if per_pattern:
+                return per_pattern.format(formatted_numerator)
+        formatted_denominator = format_unit(
+            denominator_value, denominator_unit, length=length, format=format, locale=locale
+        )
+    else:  # Bare denominator
+        formatted_denominator = format_decimal(denominator_value, format=format, locale=locale)
+
+    per_pattern = locale._data["compound_unit_patterns"].get("per", {}).get(length, "{0}/{1}")
+
+    return per_pattern.format(formatted_numerator, formatted_denominator)
diff --git a/docs/api/index.rst b/docs/api/index.rst
index 91f0967ca..5901c873b 100644
--- a/docs/api/index.rst
+++ b/docs/api/index.rst
@@ -9,9 +9,10 @@ public API of Babel.
 
    core
    dates
-   lists
    languages
+   lists
    messages/index
    numbers
    plural
    support
+   units
diff --git a/docs/api/units.rst b/docs/api/units.rst
new file mode 100644
index 000000000..2b99be547
--- /dev/null
+++ b/docs/api/units.rst
@@ -0,0 +1,13 @@
+Units
+=====
+
+.. module:: babel.units
+
+The unit module provides functionality to format measurement units for different
+locales.
+
+.. autofunction:: format_unit
+
+.. autofunction:: format_compound_unit
+
+.. autofunction:: get_unit_name

From f21eb25370ddc0821a6b6e9af404c5c2b02e1968 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 6 Apr 2016 16:59:37 +0300
Subject: [PATCH 251/489] Make compound unit formatting adhere more closely to
 the TR-35 spec

---
 babel/units.py | 57 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/babel/units.py b/babel/units.py
index 621952ecc..798ade20a 100644
--- a/babel/units.py
+++ b/babel/units.py
@@ -102,7 +102,7 @@ def format_unit(value, measurement_unit, length='long', format=None, locale=LC_N
 
     .. versionadded:: 2.2.0
 
-    :param value: the value to format.
+    :param value: the value to format. If this is a string, no number formatting will be attempted.
     :param measurement_unit: the code of a measurement unit.
                              Known units can be found in the CLDR Unit Validity XML file:
                              http://unicode.org/repos/cldr/tags/latest/common/validity/unit.xml
@@ -116,13 +116,20 @@ def format_unit(value, measurement_unit, length='long', format=None, locale=LC_N
     if not q_unit:
         raise UnknownUnitError(unit=measurement_unit, locale=locale)
     unit_patterns = locale._data["unit_patterns"][q_unit].get(length, {})
-    formatted_value = format_decimal(value, format, locale)
-    plural_form = locale.plural_form(value)
+
+    if isinstance(value, string_types):  # Assume the value is a preformatted singular.
+        formatted_value = value
+        plural_form = "one"
+    else:
+        formatted_value = format_decimal(value, format, locale)
+        plural_form = locale.plural_form(value)
+
     if plural_form in unit_patterns:
         return unit_patterns[plural_form].format(formatted_value)
 
     # Fall back to a somewhat bad representation.
-    return '%s %s' % (
+    # nb: This is marked as no-cover, as the current CLDR seemingly has no way for this to happen.
+    return '%s %s' % (  # pragma: no cover
         formatted_value,
         (get_unit_name(measurement_unit, length=length, locale=locale) or measurement_unit)
     )
@@ -140,21 +147,39 @@ def _find_compound_unit(numerator_unit, denominator_unit, locale=LC_NUMERIC):
     >>> _find_compound_unit("mile", "gallon", locale="en")
     'consumption-mile-per-gallon'
 
+    If no predefined compound pattern can be found, `None` is returned.
+
+    >>> _find_compound_unit("gallon", "mile", locale="en")
+
+    >>> _find_compound_unit("horse", "purple", locale="en")
+
     :param numerator_unit: The numerator unit's identifier
     :param denominator_unit: The denominator unit's identifier
     :param locale: the `Locale` object or locale identifier
     :return: A key to the `unit_patterns` mapping, or None.
+    :rtype: str|None
     """
     locale = Locale.parse(locale)
-    numerator_unit_length = _find_unit_pattern(numerator_unit, locale=locale)
-    denominator_unit_length = _find_unit_pattern(denominator_unit, locale=locale)
-    if not (numerator_unit_length and denominator_unit_length):
+
+    # Qualify the numerator and denominator units.  This will turn possibly partial
+    # units like "kilometer" or "hour" into actual units like "length-kilometer" and
+    # "duration-hour".
+
+    numerator_unit = _find_unit_pattern(numerator_unit, locale=locale)
+    denominator_unit = _find_unit_pattern(denominator_unit, locale=locale)
+
+    # If either was not found, we can't possibly build a suitable compound unit either.
+    if not (numerator_unit and denominator_unit):
         return None
+
     # Since compound units are named "speed-kilometer-per-hour", we'll have to slice off
-    # the quantities from both qualified units.
-    bare_numerator_unit = numerator_unit_length.split("-", 1)[-1]
-    bare_denominator_unit = denominator_unit_length.split("-", 1)[-1]
+    # the quantities (i.e. "length", "duration") from both qualified units.
+
+    bare_numerator_unit = numerator_unit.split("-", 1)[-1]
+    bare_denominator_unit = denominator_unit.split("-", 1)[-1]
+
     # Now we can try and rebuild a compound unit specifier, then qualify it:
+
     return _find_unit_pattern("%s-per-%s" % (bare_numerator_unit, bare_denominator_unit), locale=locale)
 
 
@@ -187,10 +212,15 @@ def format_compound_unit(
     >>> format_compound_unit(4, "meter", "ratakisko", length="short", locale="fi")
     '4 m/ratakisko'
 
+    >>> format_compound_unit(35, "minute", denominator_unit="fathom", locale="sv")
+    '35 minuter per famn'
+
     >>> from babel.numbers import format_currency
     >>> format_compound_unit(format_currency(35, "JPY", locale="de"), denominator_unit="liter", locale="de")
     '35\\xa0\\xa5 pro Liter'
 
+    See http://www.unicode.org/reports/tr35/tr35-general.html#perUnitPatterns
+
     :param numerator_value: The numerator value. This may be a string,
                             in which case it is considered preformatted and the unit is ignored.
     :param numerator_unit: The numerator unit. See `format_unit`.
@@ -230,9 +260,14 @@ def format_compound_unit(
             per_pattern = locale._data["unit_patterns"].get(denominator_unit, {}).get(length, {}).get("per")
             if per_pattern:
                 return per_pattern.format(formatted_numerator)
+            # See TR-35's per-unit pattern algorithm, point 3.2.
+            # For denominator 1, we replace the value to be formatted with the empty string;
+            # this will make `format_unit` return " second" instead of "1 second".
+            denominator_value = ""
+
         formatted_denominator = format_unit(
             denominator_value, denominator_unit, length=length, format=format, locale=locale
-        )
+        ).strip()
     else:  # Bare denominator
         formatted_denominator = format_decimal(denominator_value, format=format, locale=locale)
 

From 5d7eff5a3f40b375505f2c6b3e43f2234648cdb3 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Thu, 7 Apr 2016 22:07:09 +0200
Subject: [PATCH 252/489] Update Changelog

---
 CHANGES | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 551b82a7a..c2dcfe688 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,39 @@ Babel Changelog
 Version 2.3
 -----------
 
-(Feature release, release data to be decided)
+(Feature release, released on April 8th)
+
+Internal improvements
+~~~~~~~~~~~~~~~~~~~~~
+
+* The CLI frontend and Distutils commands use a shared implementation (https://github.com/python-babel/babel/pull/311)
+* PyPy3 is supported (https://github.com/python-babel/babel/pull/343)
+
+Features
+~~~~~~~~
+
+* CLDR: Add an API for territory language data (https://github.com/python-babel/babel/pull/315)
+* Core: Character order and measurement system data is imported and exposed (https://github.com/python-babel/babel/pull/368)
+* Dates: Add an API for time interval formatting (https://github.com/python-babel/babel/pull/316)
+* Dates: More pattern formats and lengths are supported (https://github.com/python-babel/babel/pull/347)
+* Dates: Period IDs are imported and exposed (https://github.com/python-babel/babel/pull/349)
+* Dates: Support for date-time skeleton formats has been added (https://github.com/python-babel/babel/pull/265)
+* Dates: Timezone formatting has been improved (https://github.com/python-babel/babel/pull/338)
+* Messages: JavaScript extraction now supports dotted names, ES6 template strings and JSX tags (https://github.com/python-babel/babel/pull/332)
+* Messages: npgettext is recognized by default (https://github.com/python-babel/babel/pull/341)
+* Messages: The CLI learned to accept multiple domains (https://github.com/python-babel/babel/pull/335)
+* Messages: The extraction commands now accept filenames in addition to directories (https://github.com/python-babel/babel/pull/324)
+* Units: A new API for unit formatting is implemented (https://github.com/python-babel/babel/pull/369)
+
+Bugfixes
+~~~~~~~~
+
+* Core: Mixed-case locale IDs work more reliably (https://github.com/python-babel/babel/pull/361)
+* Dates: S...S formats work correctly now (https://github.com/python-babel/babel/pull/360)
+* Messages: All messages are now sorted correctly if sorting has been specified (https://github.com/python-babel/babel/pull/300)
+* Messages: Fix the unexpected behavior caused by catalog header updating (e0e7ef1) (https://github.com/python-babel/babel/pull/320)
+* Messages: Gettext operands are now generated correctly (https://github.com/python-babel/babel/pull/295)
+* Messages: Message extraction has been taught to detect encodings better (https://github.com/python-babel/babel/pull/274)
 
 Version 2.2
 -----------

From e96ebeb028cb6c7775144f3d4d1d68373919765c Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Thu, 7 Apr 2016 22:14:11 +0200
Subject: [PATCH 253/489] VERSION: Bump to 2.3

---
 babel/__init__.py | 2 +-
 docs/conf.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index d6b548562..dfcc7ee28 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.2.0.dev0'
+__version__ = '2.3.0'
diff --git a/docs/conf.py b/docs/conf.py
index 3a51901a7..c847e0027 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.2'
+version = '2.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.2'
+release = '2.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From f0e578b13dffa06dd9142f27125fcbc7a027962a Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Thu, 7 Apr 2016 22:20:01 +0200
Subject: [PATCH 254/489] VERSION: Bump to development

---
 babel/__init__.py | 2 +-
 docs/conf.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index dfcc7ee28..0162c145f 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.3.0'
+__version__ = '2.4.0.dev0'
diff --git a/docs/conf.py b/docs/conf.py
index c847e0027..58dcc25ac 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.3'
+version = '2.4'
 # The full version, including alpha/beta/rc tags.
-release = '2.3'
+release = '2.4.0.dev0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From d36f0fe57c897ba55d6efe48011681b791b9a717 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Thu, 7 Apr 2016 22:50:33 +0200
Subject: [PATCH 255/489] Version: Bump to 2.3.1

There was a stupid fault when releasing 2.3.0.
---
 babel/__init__.py | 2 +-
 docs/conf.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index dfcc7ee28..2aaf23131 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.3.0'
+__version__ = '2.3.1'
diff --git a/docs/conf.py b/docs/conf.py
index c847e0027..cba9264c5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '2.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.3'
+release = '2.3.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From c028a09a283dd2f62c747862d08da39fc62ed6ed Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 8 Apr 2016 08:14:06 +0300
Subject: [PATCH 256/489] dates: Use format context and fallback through widths

`zh_Hant` locale data does not have names for the
`am` and `pm` day periods in the `format`/`abbreviated` context,
so fallback logic is added to deal with that eventuality.

Fixes #378
---
 babel/dates.py      | 7 ++++++-
 tests/test_dates.py | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/babel/dates.py b/babel/dates.py
index 3c75b385e..4a0bbd3e0 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1239,6 +1239,7 @@ def __getitem__(self, name):
         elif char in ('E', 'e', 'c'):
             return self.format_weekday(char, num)
         elif char == 'a':
+            # TODO: Add support for the rest of the period formats (a*, b*, B*)
             return self.format_period(char)
         elif char == 'h':
             if self.value.hour % 12 == 0:
@@ -1381,7 +1382,11 @@ def format_day_of_week_in_month(self):
 
     def format_period(self, char):
         period = {0: 'am', 1: 'pm'}[int(self.value.hour >= 12)]
-        return get_period_names(locale=self.locale)[period]
+        for width in ('wide', 'narrow', 'abbreviated'):
+            period_names = get_period_names(context='format', width=width, locale=self.locale)
+            if period in period_names:
+                return period_names[period]
+        raise ValueError('Could not format period %s in %s' % (period, self.locale))
 
     def format_frac_seconds(self, num):
         """ Return fractional seconds.
diff --git a/tests/test_dates.py b/tests/test_dates.py
index d99baf308..3bb9e8b22 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -742,6 +742,11 @@ def test_lithuanian_long_format():
     )
 
 
+def test_zh_TW_format():
+    # Refs GitHub issue #378
+    assert dates.format_time(datetime(2016, 4, 8, 12, 34, 56), locale='zh_TW') == u'\u4e0b\u534812:34:56'
+
+
 def test_format_current_moment(monkeypatch):
     import datetime as datetime_module
     frozen_instant = datetime.utcnow()

From 971e7060082a8297947351db6c5aa6ce12fb0b7b Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 8 Apr 2016 08:34:31 +0300
Subject: [PATCH 257/489] Add smoke tests for basic operations

Refs #378
---
 tests/conftest.py   |  6 ++++++
 tests/test_smoke.py | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 tests/test_smoke.py

diff --git a/tests/conftest.py b/tests/conftest.py
index 117a1307f..be93b2be7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -7,3 +7,9 @@ def os_environ(monkeypatch):
     mock_environ = dict(os.environ)
     monkeypatch.setattr(os, 'environ', mock_environ)
     return mock_environ
+
+
+def pytest_generate_tests(metafunc):
+    if hasattr(metafunc.function, "all_locales"):
+        from babel.localedata import locale_identifiers
+        metafunc.parametrize("locale", list(locale_identifiers()))
diff --git a/tests/test_smoke.py b/tests/test_smoke.py
new file mode 100644
index 000000000..eda10ed34
--- /dev/null
+++ b/tests/test_smoke.py
@@ -0,0 +1,37 @@
+# -- encoding: UTF-8 --
+"""
+These tests do not verify any results and should not be run when
+looking at improving test coverage.  They just verify that basic
+operations don't fail due to odd corner cases on any locale that
+we ship.
+"""
+from datetime import datetime
+
+import pytest
+from babel import Locale
+from babel import dates
+from babel import numbers
+from babel._compat import Decimal
+
+
+@pytest.mark.all_locales
+def test_smoke_dates(locale):
+    locale = Locale.parse(locale)
+    instant = datetime.now()
+    for width in ("full", "long", "medium", "short"):
+        assert dates.format_date(instant, format=width, locale=locale)
+        assert dates.format_datetime(instant, format=width, locale=locale)
+        assert dates.format_time(instant, format=width, locale=locale)
+
+
+@pytest.mark.all_locales
+def test_smoke_numbers(locale):
+    locale = Locale.parse(locale)
+    for number in (
+        Decimal("-33.76"),  # Negative Decimal
+        Decimal("13.37"),  # Positive Decimal
+        1.2 - 1.0,  # Inaccurate float
+        10,  # Plain old integer
+        0,  # Zero
+    ):
+        assert numbers.format_number(number, locale=locale)

From 9f223b42e90fb80eedf33a6c09ccd2237c3eb344 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 8 Apr 2016 08:14:06 +0300
Subject: [PATCH 258/489] dates: Use format context and fallback through widths

`zh_Hant` locale data does not have names for the
`am` and `pm` day periods in the `format`/`abbreviated` context,
so fallback logic is added to deal with that eventuality.

Fixes #378
---
 babel/dates.py      | 7 ++++++-
 tests/test_dates.py | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/babel/dates.py b/babel/dates.py
index 3c75b385e..4a0bbd3e0 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1239,6 +1239,7 @@ def __getitem__(self, name):
         elif char in ('E', 'e', 'c'):
             return self.format_weekday(char, num)
         elif char == 'a':
+            # TODO: Add support for the rest of the period formats (a*, b*, B*)
             return self.format_period(char)
         elif char == 'h':
             if self.value.hour % 12 == 0:
@@ -1381,7 +1382,11 @@ def format_day_of_week_in_month(self):
 
     def format_period(self, char):
         period = {0: 'am', 1: 'pm'}[int(self.value.hour >= 12)]
-        return get_period_names(locale=self.locale)[period]
+        for width in ('wide', 'narrow', 'abbreviated'):
+            period_names = get_period_names(context='format', width=width, locale=self.locale)
+            if period in period_names:
+                return period_names[period]
+        raise ValueError('Could not format period %s in %s' % (period, self.locale))
 
     def format_frac_seconds(self, num):
         """ Return fractional seconds.
diff --git a/tests/test_dates.py b/tests/test_dates.py
index d99baf308..3bb9e8b22 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -742,6 +742,11 @@ def test_lithuanian_long_format():
     )
 
 
+def test_zh_TW_format():
+    # Refs GitHub issue #378
+    assert dates.format_time(datetime(2016, 4, 8, 12, 34, 56), locale='zh_TW') == u'\u4e0b\u534812:34:56'
+
+
 def test_format_current_moment(monkeypatch):
     import datetime as datetime_module
     frozen_instant = datetime.utcnow()

From 61856e6ab9017f3b91b1b1c9849d13922b80f7d5 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Fri, 8 Apr 2016 09:53:20 +0200
Subject: [PATCH 259/489] CHANGES: Update

---
 CHANGES | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGES b/CHANGES
index c2dcfe688..752376b22 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,21 @@
 Babel Changelog
 ===============
 
+Version 2.3.2
+-------------
+
+(Bugfix release, released on April 9th)
+
+Bugfixes
+~~~~~~~~
+
+* Dates: Period (am/pm) formatting was broken in certain locales (namely zh_TW). Thanks to @jun66j5 for the bug report. (https://github.com/python-babel/babel/issues/378, https://github.com/python-babel/babel/issues/379)
+
+Version 2.3.1
+-------------
+
+(Bugfix release because of deployment problems, released on April 8th)
+
 Version 2.3
 -----------
 

From 41b75544a7ec2a062052211018494e64cb303780 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Fri, 8 Apr 2016 09:55:02 +0200
Subject: [PATCH 260/489] VERSION: Release 2.3.2

---
 babel/__init__.py | 2 +-
 docs/conf.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index 2aaf23131..d8f5c7ed7 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.3.1'
+__version__ = '2.3.2'
diff --git a/docs/conf.py b/docs/conf.py
index cba9264c5..1ade98b46 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '2.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.3.1'
+release = '2.3.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From ce47004faf87f1fe3a0a6f99647a5b8686ca27f5 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Fri, 8 Apr 2016 10:03:27 +0200
Subject: [PATCH 261/489] AppVeyor: Remove unneeded builds

Related to https://github.com/python-babel/babel/issues/377
---
 .ci/appveyor.yml | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index e7b13f20b..e0db91381 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -8,30 +8,6 @@ environment:
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\.ci\\run_with_env.cmd"
 
   matrix:
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.x"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27-x64"
-      PYTHON_VERSION: "2.7.x"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python33"
-      PYTHON_VERSION: "3.3.x"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python33-x64"
-      PYTHON_VERSION: "3.3.x"
-      PYTHON_ARCH: "64"
-
-    - PYTHON: "C:\\Python34"
-      PYTHON_VERSION: "3.4.x"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python34-x64"
-      PYTHON_VERSION: "3.4.x"
-      PYTHON_ARCH: "64"
-
     - PYTHON: "C:\\Python35"
       PYTHON_VERSION: "3.5.x"
       PYTHON_ARCH: "32"

From b50b4590246cebf021d14cad945018ddb7505691 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Fri, 8 Apr 2016 10:05:21 +0200
Subject: [PATCH 262/489] travis: Don't build on mac for all versions

That's pretty redundant.

Fixes https://github.com/python-babel/babel/issues/377
---
 .travis.yml | 44 --------------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a5f75c1f..978d377c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,50 +33,6 @@ matrix:
       python: 3.4
     - os: linux
       python: 3.5
-    - os: osx
-      language: generic
-      env:
-      - PYTHON_VERSION=2.6.6
-      - PYENV_ROOT=~/.pyenv
-      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
-    - os: osx
-      language: generic
-      env:
-      - PYTHON_VERSION=2.6.6
-      - PYENV_ROOT=~/.pyenv
-      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
-      - CDECIMAL=m3-cdecimal
-    - os: osx
-      language: generic
-      env:
-      - PYTHON_VERSION=2.7.10
-      - PYENV_ROOT=~/.pyenv
-      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
-    - os: osx
-      language: generic
-      env:
-      - PYTHON_VERSION=2.7.10
-      - PYENV_ROOT=~/.pyenv
-      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
-      - CDECIMAL=m3-cdecimal
-    - os: osx
-      language: generic
-      env:
-      - PYTHON_VERSION=pypy-2.6.0
-      - PYENV_ROOT=~/.pyenv
-      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
-    - os: osx
-      language: generic
-      env:
-      - PYTHON_VERSION=3.3.6
-      - PYENV_ROOT=~/.pyenv
-      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
-    - os: osx
-      language: generic
-      env:
-      - PYTHON_VERSION=3.4.3
-      - PYENV_ROOT=~/.pyenv
-      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
     - os: osx
       language: generic
       env:

From 1c091157ba02f3ea18f93bbfe962746ba788ba11 Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Fri, 8 Apr 2016 10:07:44 +0200
Subject: [PATCH 263/489] README: Rename to rst

Converted with pandoc. This way it should be shown on PyPI correctly
too.

Fixes https://github.com/python-babel/babel/issues/376
---
 README.md => README.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename README.md => README.rst (60%)

diff --git a/README.md b/README.rst
similarity index 60%
rename from README.md
rename to README.rst
index 98ea01467..c708f9da6 100644
--- a/README.md
+++ b/README.rst
@@ -5,11 +5,11 @@ Babel is a Python library that provides an integrated collection of
 utilities that assist with internationalizing and localizing Python
 applications (in particular web-based applications.)
 
-Details can be found in the HTML files in the `docs` folder.
+Details can be found in the HTML files in the ``docs`` folder.
 
 For more information please visit the Babel web site:
 
-  <http://babel.pocoo.org/>
+http://babel.pocoo.org/
 
 Join the chat at https://gitter.im/python-babel/babel
 
@@ -17,8 +17,8 @@ Contributing to Babel
 =====================
 
 If you want to contribute code to Babel, please take a look at our
-[CONTRIBUTING.md](https://github.com/python-babel/babel/blob/master/CONTRIBUTING.md).
+`CONTRIBUTING.md <https://github.com/python-babel/babel/blob/master/CONTRIBUTING.md>`__.
 
-If you know your way around Babels codebase a bit and like to help further, we
-would appreciate any help in reviewing pull requests. Please contact us at
-<https://gitter.im/python-babel/babel> if you're interested!
+If you know your way around Babels codebase a bit and like to help
+further, we would appreciate any help in reviewing pull requests. Please
+contact us at https://gitter.im/python-babel/babel if you're interested!

From 58e62320f56400040e0aaa4a3522a50508104b19 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 11 Apr 2016 13:28:37 +0300
Subject: [PATCH 264/489] Make the command-line frontend easier to test

---
 babel/messages/frontend.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 3cacec9d3..acf4a5fef 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -720,6 +720,8 @@ class CommandLineInterface(object):
         'update': update_catalog,
     }
 
+    log = None  # Replaced on instance level
+
     def run(self, argv=None):
         """Main entry point of the command-line interface.
 
@@ -768,7 +770,8 @@ def run(self, argv=None):
         if cmdname not in self.commands:
             self.parser.error('unknown command "%s"' % cmdname)
 
-        return self._dispatch(cmdname, args[1:])
+        cmdinst = self._configure_command(cmdname, args[1:])
+        return cmdinst.run()
 
     def _configure_logging(self, loglevel):
         self.log = logging.getLogger('babel')
@@ -794,14 +797,15 @@ def _help(self):
         for name, description in commands:
             print(format % (name, description))
 
-    def _dispatch(self, cmdname, argv):
+    def _configure_command(self, cmdname, argv):
         """
         :type cmdname: str
         :type argv: list[str]
         """
         cmdclass = self.command_classes[cmdname]
         cmdinst = cmdclass()
-        cmdinst.log = self.log  # Use our logger, not distutils'.
+        if self.log:
+            cmdinst.log = self.log  # Use our logger, not distutils'.
         assert isinstance(cmdinst, Command)
         cmdinst.initialize_options()
 
@@ -837,7 +841,7 @@ def _dispatch(self, cmdname, argv):
         except DistutilsOptionError as err:
             parser.error(str(err))
 
-        cmdinst.run()
+        return cmdinst
 
 
 def main():

From bfe4ab84287e30621ffcdd6bd9263040a21ce284 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 11 Apr 2016 13:35:49 +0300
Subject: [PATCH 265/489] Make the CLI extraction command support multiple
 `-k`s again

Fixes #384 (https://github.com/python-babel/babel/issues/384)

Thanks to @ajaeger for the bug report.
---
 babel/messages/frontend.py      | 31 +++++++++++--------
 tests/messages/test_frontend.py | 55 ++++++++++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index acf4a5fef..ddddc02e7 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -218,7 +218,7 @@ class extract_messages(Command):
          'charset to use in the output file (default "utf-8")'),
         ('keywords=', 'k',
          'space-separated list of keywords to look for in addition to the '
-         'defaults'),
+         'defaults (may be repeated multiple times)'),
         ('no-default-keywords', None,
          'do not include the default keywords'),
         ('mapping-file=', 'F',
@@ -248,12 +248,12 @@ class extract_messages(Command):
          'set project version in output'),
         ('add-comments=', 'c',
          'place comment block with TAG (or those preceding keyword lines) in '
-         'output file. Separate multiple TAGs with commas(,)'),
+         'output file. Separate multiple TAGs with commas(,)'),  # TODO: Support repetition of this argument
         ('strip-comments', None,
          'strip the comment TAGs from the comments.'),
         ('input-paths=', None,
          'files or directories that should be scanned for messages. Separate multiple '
-         'files or directories with commas(,)'),
+         'files or directories with commas(,)'),  # TODO: Support repetition of this argument
         ('input-dirs=', None,  # TODO (3.x): Remove me.
          'alias for input-paths (does allow files as well as directories).'),
     ]
@@ -262,12 +262,11 @@ class extract_messages(Command):
         'sort-output', 'sort-by-file', 'strip-comments'
     ]
     as_args = 'input-paths'
-    multiple_value_options = ('add-comments',)
+    multiple_value_options = ('add-comments', 'keywords')
 
     def initialize_options(self):
         self.charset = 'utf-8'
-        self.keywords = ''
-        self._keywords = DEFAULT_KEYWORDS.copy()
+        self.keywords = None
         self.no_default_keywords = False
         self.mapping_file = None
         self.no_location = False
@@ -295,13 +294,19 @@ def finalize_options(self):
                     'input-dirs and input-paths are mutually exclusive'
                 )
 
-        if self.no_default_keywords and not self.keywords:
+        if self.no_default_keywords:
+            keywords = {}
+        else:
+            keywords = DEFAULT_KEYWORDS.copy()
+
+        for kwarg in (self.keywords or ()):
+            keywords.update(parse_keywords(kwarg.split()))
+
+        self.keywords = keywords
+
+        if not self.keywords:
             raise DistutilsOptionError('you must specify new keywords if you '
                                        'disable the default ones')
-        if self.no_default_keywords:
-            self._keywords = {}
-        if self.keywords:
-            self._keywords.update(parse_keywords(self.keywords.split()))
 
         if not self.output_file:
             raise DistutilsOptionError('no output file specified')
@@ -378,13 +383,13 @@ def callback(filename, method, options):
                     current_dir = os.getcwd()
                     extracted = check_and_call_extract_file(
                         path, method_map, options_map,
-                        callback, self._keywords, self.add_comments,
+                        callback, self.keywords, self.add_comments,
                         self.strip_comments, current_dir
                     )
                 else:
                     extracted = extract_from_dir(
                         path, method_map, options_map,
-                        keywords=self._keywords,
+                        keywords=self.keywords,
                         comment_tags=self.add_comments,
                         callback=callback,
                         strip_comment_tags=self.strip_comments
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index df4803332..4c3c4a5a1 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -10,7 +10,7 @@
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
-
+import shlex
 from datetime import datetime
 from distutils.dist import Distribution
 from distutils.errors import DistutilsOptionError
@@ -22,9 +22,12 @@
 import time
 import unittest
 
+import pytest
+
 from babel import __version__ as VERSION
 from babel.dates import format_datetime
 from babel.messages import frontend, Catalog
+from babel.messages.frontend import CommandLineInterface, extract_messages
 from babel.util import LOCALTZ
 from babel.messages.pofile import read_po, write_po
 from babel._compat import StringIO
@@ -1227,3 +1230,53 @@ def test_parse_keywords():
         'dngettext': (2, 3),
         'pgettext': ((1, 'c'), 2),
     }
+
+
+@pytest.mark.parametrize("split", (False, True))
+def test_extract_keyword_args_384(split):
+    # This is a regression test for https://github.com/python-babel/babel/issues/384
+
+    kwarg_specs = [
+        "gettext_noop",
+        "gettext_lazy",
+        "ngettext_lazy:1,2",
+        "ugettext_noop",
+        "ugettext_lazy",
+        "ungettext_lazy:1,2",
+        "pgettext_lazy:1c,2",
+        "npgettext_lazy:1c,2,3",
+    ]
+
+    if split:  # Generate a command line with multiple -ks
+        kwarg_text = " ".join("-k %s" % kwarg_spec for kwarg_spec in kwarg_specs)
+    else:  # Generate a single space-separated -k
+        kwarg_text = "-k \"%s\"" % " ".join(kwarg_specs)
+
+    # (Both of those invocation styles should be equivalent, so there is no parametrization from here on out)
+
+    cmdline = "extract -F babel-django.cfg --add-comments Translators: -o django232.pot %s ." % kwarg_text
+
+    args = shlex.split(cmdline)
+    cli = CommandLineInterface()
+    cmdinst = cli._configure_command(cmdname=args[0], argv=args[1:])
+    assert isinstance(cmdinst, extract_messages)
+    assert set(cmdinst.keywords.keys()) == set((
+        '_',
+        'dgettext',
+        'dngettext',
+        'gettext',
+        'gettext_lazy',
+        'gettext_noop',
+        'N_',
+        'ngettext',
+        'ngettext_lazy',
+        'npgettext',
+        'npgettext_lazy',
+        'pgettext',
+        'pgettext_lazy',
+        'ugettext',
+        'ugettext_lazy',
+        'ugettext_noop',
+        'ungettext',
+        'ungettext_lazy',
+    ))

From 3e67c9998dfb4b901a20182a3a5b1301b34831a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Diemer?= <sebastien.diemer@polyconseil.fr>
Date: Fri, 8 Apr 2016 16:46:48 +0200
Subject: [PATCH 266/489] fix typos in messages frontend

The 'no-wrap', 'ignore-obsolete', 'no-fuzzy-matching', 'previous' and
'update-header-comment' were not correctly parsed in the update_catalog
command.
---
 babel/messages/frontend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index ddddc02e7..62e7c03e9 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -597,7 +597,7 @@ class update_catalog(Command):
         ('previous', None,
          'keep previous msgids of translated messages')
     ]
-    boolean_options = ['ignore_obsolete', 'no_fuzzy_matching', 'previous', 'update_header_comment']
+    boolean_options = ['no-wrap', 'ignore-obsolete', 'no-fuzzy-matching', 'previous', 'update-header-comment']
 
     def initialize_options(self):
         self.domain = 'messages'

From fbc1648756e025558e1e9a7987e92f13af097f80 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 11 Apr 2016 13:44:39 +0300
Subject: [PATCH 267/489] Refactor out `configure_cli_command`

---
 tests/messages/test_frontend.py | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 4c3c4a5a1..e0c9a8eb3 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1232,6 +1232,19 @@ def test_parse_keywords():
     }
 
 
+def configure_cli_command(cmdline):
+    """
+    Helper to configure a command class, but not run it just yet.
+
+    :param cmdline: The command line (sans the executable name)
+    :return: Command instance
+    """
+    args = shlex.split(cmdline)
+    cli = CommandLineInterface()
+    cmdinst = cli._configure_command(cmdname=args[0], argv=args[1:])
+    return cmdinst
+
+
 @pytest.mark.parametrize("split", (False, True))
 def test_extract_keyword_args_384(split):
     # This is a regression test for https://github.com/python-babel/babel/issues/384
@@ -1254,11 +1267,9 @@ def test_extract_keyword_args_384(split):
 
     # (Both of those invocation styles should be equivalent, so there is no parametrization from here on out)
 
-    cmdline = "extract -F babel-django.cfg --add-comments Translators: -o django232.pot %s ." % kwarg_text
-
-    args = shlex.split(cmdline)
-    cli = CommandLineInterface()
-    cmdinst = cli._configure_command(cmdname=args[0], argv=args[1:])
+    cmdinst = configure_cli_command(
+        "extract -F babel-django.cfg --add-comments Translators: -o django232.pot %s ." % kwarg_text
+    )
     assert isinstance(cmdinst, extract_messages)
     assert set(cmdinst.keywords.keys()) == set((
         '_',

From 4795c868770163fafbde525e913b8806f71b7c0c Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 11 Apr 2016 13:45:59 +0300
Subject: [PATCH 268/489] Test that `update` actually accepts those boolean
 parameters

---
 tests/messages/test_frontend.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index e0c9a8eb3..049fc2997 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -27,7 +27,7 @@
 from babel import __version__ as VERSION
 from babel.dates import format_datetime
 from babel.messages import frontend, Catalog
-from babel.messages.frontend import CommandLineInterface, extract_messages
+from babel.messages.frontend import CommandLineInterface, extract_messages, update_catalog
 from babel.util import LOCALTZ
 from babel.messages.pofile import read_po, write_po
 from babel._compat import StringIO
@@ -1291,3 +1291,12 @@ def test_extract_keyword_args_384(split):
         'ungettext',
         'ungettext_lazy',
     ))
+
+
+def test_update_catalog_boolean_args():
+    cmdinst = configure_cli_command("update --no-wrap -N --ignore-obsolete --previous -i foo -o foo -l en")
+    assert isinstance(cmdinst, update_catalog)
+    assert cmdinst.no_wrap is True
+    assert cmdinst.no_fuzzy_matching is True
+    assert cmdinst.ignore_obsolete is True
+    assert cmdinst.previous is False  # Mutually exclusive with no_fuzzy_matching

From 6f8f44cd03cc22fb24b228e2dae7a8eb397e587f Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 11 Apr 2016 13:28:37 +0300
Subject: [PATCH 269/489] Make the command-line frontend easier to test

---
 babel/messages/frontend.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 3cacec9d3..acf4a5fef 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -720,6 +720,8 @@ class CommandLineInterface(object):
         'update': update_catalog,
     }
 
+    log = None  # Replaced on instance level
+
     def run(self, argv=None):
         """Main entry point of the command-line interface.
 
@@ -768,7 +770,8 @@ def run(self, argv=None):
         if cmdname not in self.commands:
             self.parser.error('unknown command "%s"' % cmdname)
 
-        return self._dispatch(cmdname, args[1:])
+        cmdinst = self._configure_command(cmdname, args[1:])
+        return cmdinst.run()
 
     def _configure_logging(self, loglevel):
         self.log = logging.getLogger('babel')
@@ -794,14 +797,15 @@ def _help(self):
         for name, description in commands:
             print(format % (name, description))
 
-    def _dispatch(self, cmdname, argv):
+    def _configure_command(self, cmdname, argv):
         """
         :type cmdname: str
         :type argv: list[str]
         """
         cmdclass = self.command_classes[cmdname]
         cmdinst = cmdclass()
-        cmdinst.log = self.log  # Use our logger, not distutils'.
+        if self.log:
+            cmdinst.log = self.log  # Use our logger, not distutils'.
         assert isinstance(cmdinst, Command)
         cmdinst.initialize_options()
 
@@ -837,7 +841,7 @@ def _dispatch(self, cmdname, argv):
         except DistutilsOptionError as err:
             parser.error(str(err))
 
-        cmdinst.run()
+        return cmdinst
 
 
 def main():

From ca27df0f09b9df68ba707510f959a475ba2810d6 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 11 Apr 2016 13:35:49 +0300
Subject: [PATCH 270/489] Make the CLI extraction command support multiple
 `-k`s again

Fixes #384 (https://github.com/python-babel/babel/issues/384)

Thanks to @ajaeger for the bug report.
---
 babel/messages/frontend.py      | 31 +++++++++++--------
 tests/messages/test_frontend.py | 55 ++++++++++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index acf4a5fef..ddddc02e7 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -218,7 +218,7 @@ class extract_messages(Command):
          'charset to use in the output file (default "utf-8")'),
         ('keywords=', 'k',
          'space-separated list of keywords to look for in addition to the '
-         'defaults'),
+         'defaults (may be repeated multiple times)'),
         ('no-default-keywords', None,
          'do not include the default keywords'),
         ('mapping-file=', 'F',
@@ -248,12 +248,12 @@ class extract_messages(Command):
          'set project version in output'),
         ('add-comments=', 'c',
          'place comment block with TAG (or those preceding keyword lines) in '
-         'output file. Separate multiple TAGs with commas(,)'),
+         'output file. Separate multiple TAGs with commas(,)'),  # TODO: Support repetition of this argument
         ('strip-comments', None,
          'strip the comment TAGs from the comments.'),
         ('input-paths=', None,
          'files or directories that should be scanned for messages. Separate multiple '
-         'files or directories with commas(,)'),
+         'files or directories with commas(,)'),  # TODO: Support repetition of this argument
         ('input-dirs=', None,  # TODO (3.x): Remove me.
          'alias for input-paths (does allow files as well as directories).'),
     ]
@@ -262,12 +262,11 @@ class extract_messages(Command):
         'sort-output', 'sort-by-file', 'strip-comments'
     ]
     as_args = 'input-paths'
-    multiple_value_options = ('add-comments',)
+    multiple_value_options = ('add-comments', 'keywords')
 
     def initialize_options(self):
         self.charset = 'utf-8'
-        self.keywords = ''
-        self._keywords = DEFAULT_KEYWORDS.copy()
+        self.keywords = None
         self.no_default_keywords = False
         self.mapping_file = None
         self.no_location = False
@@ -295,13 +294,19 @@ def finalize_options(self):
                     'input-dirs and input-paths are mutually exclusive'
                 )
 
-        if self.no_default_keywords and not self.keywords:
+        if self.no_default_keywords:
+            keywords = {}
+        else:
+            keywords = DEFAULT_KEYWORDS.copy()
+
+        for kwarg in (self.keywords or ()):
+            keywords.update(parse_keywords(kwarg.split()))
+
+        self.keywords = keywords
+
+        if not self.keywords:
             raise DistutilsOptionError('you must specify new keywords if you '
                                        'disable the default ones')
-        if self.no_default_keywords:
-            self._keywords = {}
-        if self.keywords:
-            self._keywords.update(parse_keywords(self.keywords.split()))
 
         if not self.output_file:
             raise DistutilsOptionError('no output file specified')
@@ -378,13 +383,13 @@ def callback(filename, method, options):
                     current_dir = os.getcwd()
                     extracted = check_and_call_extract_file(
                         path, method_map, options_map,
-                        callback, self._keywords, self.add_comments,
+                        callback, self.keywords, self.add_comments,
                         self.strip_comments, current_dir
                     )
                 else:
                     extracted = extract_from_dir(
                         path, method_map, options_map,
-                        keywords=self._keywords,
+                        keywords=self.keywords,
                         comment_tags=self.add_comments,
                         callback=callback,
                         strip_comment_tags=self.strip_comments
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index df4803332..4c3c4a5a1 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -10,7 +10,7 @@
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
-
+import shlex
 from datetime import datetime
 from distutils.dist import Distribution
 from distutils.errors import DistutilsOptionError
@@ -22,9 +22,12 @@
 import time
 import unittest
 
+import pytest
+
 from babel import __version__ as VERSION
 from babel.dates import format_datetime
 from babel.messages import frontend, Catalog
+from babel.messages.frontend import CommandLineInterface, extract_messages
 from babel.util import LOCALTZ
 from babel.messages.pofile import read_po, write_po
 from babel._compat import StringIO
@@ -1227,3 +1230,53 @@ def test_parse_keywords():
         'dngettext': (2, 3),
         'pgettext': ((1, 'c'), 2),
     }
+
+
+@pytest.mark.parametrize("split", (False, True))
+def test_extract_keyword_args_384(split):
+    # This is a regression test for https://github.com/python-babel/babel/issues/384
+
+    kwarg_specs = [
+        "gettext_noop",
+        "gettext_lazy",
+        "ngettext_lazy:1,2",
+        "ugettext_noop",
+        "ugettext_lazy",
+        "ungettext_lazy:1,2",
+        "pgettext_lazy:1c,2",
+        "npgettext_lazy:1c,2,3",
+    ]
+
+    if split:  # Generate a command line with multiple -ks
+        kwarg_text = " ".join("-k %s" % kwarg_spec for kwarg_spec in kwarg_specs)
+    else:  # Generate a single space-separated -k
+        kwarg_text = "-k \"%s\"" % " ".join(kwarg_specs)
+
+    # (Both of those invocation styles should be equivalent, so there is no parametrization from here on out)
+
+    cmdline = "extract -F babel-django.cfg --add-comments Translators: -o django232.pot %s ." % kwarg_text
+
+    args = shlex.split(cmdline)
+    cli = CommandLineInterface()
+    cmdinst = cli._configure_command(cmdname=args[0], argv=args[1:])
+    assert isinstance(cmdinst, extract_messages)
+    assert set(cmdinst.keywords.keys()) == set((
+        '_',
+        'dgettext',
+        'dngettext',
+        'gettext',
+        'gettext_lazy',
+        'gettext_noop',
+        'N_',
+        'ngettext',
+        'ngettext_lazy',
+        'npgettext',
+        'npgettext_lazy',
+        'pgettext',
+        'pgettext_lazy',
+        'ugettext',
+        'ugettext_lazy',
+        'ugettext_noop',
+        'ungettext',
+        'ungettext_lazy',
+    ))

From d02af113f7d03e535d61a43519f15f751c4e0b8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Diemer?= <sebastien.diemer@polyconseil.fr>
Date: Fri, 8 Apr 2016 16:46:48 +0200
Subject: [PATCH 271/489] fix typos in messages frontend

The 'no-wrap', 'ignore-obsolete', 'no-fuzzy-matching', 'previous' and
'update-header-comment' were not correctly parsed in the update_catalog
command.
---
 babel/messages/frontend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index ddddc02e7..62e7c03e9 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -597,7 +597,7 @@ class update_catalog(Command):
         ('previous', None,
          'keep previous msgids of translated messages')
     ]
-    boolean_options = ['ignore_obsolete', 'no_fuzzy_matching', 'previous', 'update_header_comment']
+    boolean_options = ['no-wrap', 'ignore-obsolete', 'no-fuzzy-matching', 'previous', 'update-header-comment']
 
     def initialize_options(self):
         self.domain = 'messages'

From d587b88fc3bbc58bd9a4254cd638cede4de31eba Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 12 Apr 2016 09:44:25 +0300
Subject: [PATCH 272/489] Bump to 2.3.3

---
 CHANGES           | 10 ++++++++++
 babel/__init__.py |  2 +-
 docs/conf.py      |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 752376b22..396710b9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,16 @@
 Babel Changelog
 ===============
 
+Version 2.3.3
+-------------
+
+(Bugfix release, released on April 12th)
+
+Bugfixes
+~~~~~~~~
+
+* CLI: Usage regressions that had snuck in between 2.2 and 2.3 should be no more. (https://github.com/python-babel/babel/pull/386) Thanks to @ajaeger, @sebdiem and @jcristovao for bug reports and patches.
+
 Version 2.3.2
 -------------
 
diff --git a/babel/__init__.py b/babel/__init__.py
index d8f5c7ed7..7f810c745 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.3.2'
+__version__ = '2.3.3'
diff --git a/docs/conf.py b/docs/conf.py
index 1ade98b46..fc0530f1e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '2.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.3.2'
+release = '2.3.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 572f75a3e90ee3ee608a65b01de0886395fd2331 Mon Sep 17 00:00:00 2001
From: "KO. Mattsson" <karloskar@ponty.se>
Date: Mon, 18 Apr 2016 18:33:11 +0200
Subject: [PATCH 273/489] jslexer.py: Change jsx_tag regex

A less greedy jsx_tag regex. Can handle translatable strings both as
children or as props to a component.
---
 babel/messages/jslexer.py      |  2 +-
 tests/messages/test_jslexer.py | 60 ++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index aed39f334..665a86fb1 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -45,7 +45,7 @@
         ([eE][-+]?\d+)? |
         (0x[a-fA-F0-9]+)
     )''')),
-    ('jsx_tag', re.compile(r'<(?:/?)\w+.+?>', re.I)),  # May be mangled in `get_rules`
+    ('jsx_tag', re.compile(r'</?[^> ]+', re.I)),  # May be mangled in `get_rules`
     ('operator', re.compile(r'(%s)' % '|'.join(map(re.escape, operators)))),
     ('template_string', re.compile(r'''`(?:[^`\\]*(?:\\.[^`\\]*)*)`''', re.UNICODE)),
     ('string', re.compile(r'''(?xs)(
diff --git a/tests/messages/test_jslexer.py b/tests/messages/test_jslexer.py
index 84221a1d2..e125fec7a 100644
--- a/tests/messages/test_jslexer.py
+++ b/tests/messages/test_jslexer.py
@@ -32,3 +32,63 @@ def test_template_string():
         ('name', 'gettext', 1),
         ('template_string', '`foo"bar"p`', 1)
     ]
+
+
+def test_jsx():
+    assert list(jslexer.tokenize("""
+         <option value="val1">{ i18n._('String1') }</option>
+         <option value="val2">{ i18n._('String 2') }</option>
+         <option value="val3">{ i18n._('String 3') }</option>
+         <component value={i18n._('String 4')} />
+    """, jsx=True)) == [
+         ('jsx_tag', '<option', 2),
+         ('name', 'value', 2),
+         ('operator', '=', 2),
+         ('string', '"val1"', 2),
+         ('operator', '>', 2),
+         ('operator', '{', 2),
+         ('name', 'i18n._', 2),
+         ('operator', '(', 2),
+         ('string', "'String1'", 2),
+         ('operator', ')', 2),
+         ('operator', '}', 2),
+         ('jsx_tag', '</option', 2),
+         ('operator', '>', 2),
+         ('jsx_tag', '<option', 3),
+         ('name', 'value', 3),
+         ('operator', '=', 3),
+         ('string', '"val2"', 3),
+         ('operator', '>', 3),
+         ('operator', '{', 3),
+         ('name', 'i18n._', 3),
+         ('operator', '(', 3),
+         ('string', "'String 2'", 3),
+         ('operator', ')', 3),
+         ('operator', '}', 3),
+         ('jsx_tag', '</option', 3),
+         ('operator', '>', 3),
+         ('jsx_tag', '<option', 4),
+         ('name', 'value', 4),
+         ('operator', '=', 4),
+         ('string', '"val3"', 4),
+         ('operator', '>', 4),
+         ('operator', '{', 4),
+         ('name', 'i18n._', 4),
+         ('operator', '(', 4),
+         ('string', "'String 3'", 4),
+         ('operator', ')', 4),
+         ('operator', '}', 4),
+         ('jsx_tag', '</option', 4),
+         ('operator', '>', 4),
+         ('jsx_tag', '<component', 5),
+         ('name', 'value', 5),
+         ('operator', '=', 5),
+         ('operator', '{', 5),
+         ('name', 'i18n._', 5),
+         ('operator', '(', 5),
+         ('string', "'String 4'", 5),
+         ('operator', ')', 5),
+         ('operator', '}', 5),
+         ('operator', '/', 5),
+         ('operator', '>', 5)
+     ]

From 670a84e31da9d0cb814ac4ba4e09c356f183e5c4 Mon Sep 17 00:00:00 2001
From: Jennifer Wang <jtwang@yelp.com>
Date: Mon, 18 Apr 2016 15:30:54 -0700
Subject: [PATCH 274/489] Revert "import_cldr: if lxml is installed, use it"

This reverts commit 9b5c7f3678167f03ec39fd1c25f98d0e0d41621f.
---
 scripts/import_cldr.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index f684de343..8de704360 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -18,12 +18,9 @@
 import sys
 
 try:
-    import lxml.etree as ElementTree
+    from xml.etree import cElementTree as ElementTree
 except ImportError:
-    try:
-        from xml.etree import cElementTree as ElementTree
-    except ImportError:
-        from xml.etree import ElementTree
+    from xml.etree import ElementTree
 
 # Make sure we're using Babel source, and not some previously installed version
 CHECKOUT_ROOT = os.path.abspath(os.path.join(

From 414aec5864053a28f873d098412017be24ce0626 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 14 Apr 2016 11:23:01 +0300
Subject: [PATCH 275/489] Harmonize extraction keyword parsing between
 distutils and standalone CLI

Fixes #388

Refs #384

Refs #311
---
 babel/messages/frontend.py      | 65 +++++++++++++++++++++++++++------
 tests/messages/test_frontend.py | 43 ++++++++++++++++++++++
 2 files changed, 97 insertions(+), 11 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 62e7c03e9..b975ff38b 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -22,7 +22,7 @@
 
 from babel import __version__ as VERSION
 from babel import Locale, localedata
-from babel._compat import StringIO, string_types
+from babel._compat import StringIO, string_types, text_type
 from babel.core import UnknownLocaleError
 from babel.messages.catalog import Catalog
 from babel.messages.extract import DEFAULT_KEYWORDS, DEFAULT_MAPPING, check_and_call_extract_file, extract_from_dir
@@ -39,6 +39,48 @@
     from configparser import RawConfigParser
 
 
+def listify_value(arg, split=None):
+    """
+    Make a list out of an argument.
+
+    Values from `distutils` argument parsing are always single strings;
+    values from `optparse` parsing may be lists of strings that may need
+    to be further split.
+
+    No matter the input, this function returns a flat list of whitespace-trimmed
+    strings, with `None` values filtered out.
+
+    >>> listify_value("foo bar")
+    ['foo', 'bar']
+    >>> listify_value(["foo bar"])
+    ['foo', 'bar']
+    >>> listify_value([["foo"], "bar"])
+    ['foo', 'bar']
+    >>> listify_value([["foo"], ["bar", None, "foo"]])
+    ['foo', 'bar', 'foo']
+    >>> listify_value("foo, bar, quux", ",")
+    ['foo', 'bar', 'quux']
+
+    :param arg: A string or a list of strings
+    :param split: The argument to pass to `str.split()`.
+    :return:
+    """
+    out = []
+
+    if not isinstance(arg, (list, tuple)):
+        arg = [arg]
+
+    for val in arg:
+        if val is None:
+            continue
+        if isinstance(val, (list, tuple)):
+            out.extend(listify_value(val, split=split))
+            continue
+        out.extend(s.strip() for s in text_type(val).split(split))
+    assert all(isinstance(val, string_types) for val in out)
+    return out
+
+
 class Command(_Command):
     # This class is a small shim between Distutils commands and
     # optparse option parsing in the frontend command line.
@@ -47,8 +89,15 @@ class Command(_Command):
     as_args = None
 
     #: Options which allow multiple values.
+    #: This is used by the `optparse` transmogrification code.
     multiple_value_options = ()
 
+    #: Options which are booleans.
+    #: This is used by the `optparse` transmogrification code.
+    # (This is actually used by distutils code too, but is never
+    # declared in the base class.)
+    boolean_options = ()
+
     #: Log object. To allow replacement in the script command line runner.
     log = distutils_log
 
@@ -110,6 +159,7 @@ def initialize_options(self):
         self.statistics = False
 
     def finalize_options(self):
+        self.domain = listify_value(self.domain)
         if not self.input_file and not self.directory:
             raise DistutilsOptionError('you must specify either the input file '
                                        'or the base directory')
@@ -118,9 +168,7 @@ def finalize_options(self):
                                        'or the base directory')
 
     def run(self):
-        domains = self.domain.split()
-
-        for domain in domains:
+        for domain in self.domain:
             self._run_domain(domain)
 
     def _run_domain(self, domain):
@@ -299,8 +347,7 @@ def finalize_options(self):
         else:
             keywords = DEFAULT_KEYWORDS.copy()
 
-        for kwarg in (self.keywords or ()):
-            keywords.update(parse_keywords(kwarg.split()))
+        keywords.update(parse_keywords(listify_value(self.keywords)))
 
         self.keywords = keywords
 
@@ -338,11 +385,7 @@ def finalize_options(self):
             if not os.path.exists(path):
                 raise DistutilsOptionError("Input path: %s does not exist" % path)
 
-        if self.add_comments:
-            if isinstance(self.add_comments, string_types):
-                self.add_comments = self.add_comments.split(',')
-        else:
-            self.add_comments = []
+        self.add_comments = listify_value(self.add_comments or (), ",")
 
         if self.distribution:
             if not self.project:
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 049fc2997..118d3f29b 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1245,6 +1245,27 @@ def configure_cli_command(cmdline):
     return cmdinst
 
 
+def configure_distutils_command(cmdline):
+    """
+    Helper to configure a command class, but not run it just yet.
+
+    This will have strange side effects if you pass in things
+    `distutils` deals with internally.
+
+    :param cmdline: The command line (sans the executable name)
+    :return: Command instance
+    """
+    d = Distribution(attrs={
+        "cmdclass": vars(frontend),
+        "script_args": shlex.split(cmdline),
+    })
+    d.parse_command_line()
+    assert len(d.commands) == 1
+    cmdinst = d.get_command_obj(d.commands[0])
+    cmdinst.ensure_finalized()
+    return cmdinst
+
+
 @pytest.mark.parametrize("split", (False, True))
 def test_extract_keyword_args_384(split):
     # This is a regression test for https://github.com/python-babel/babel/issues/384
@@ -1293,6 +1314,28 @@ def test_extract_keyword_args_384(split):
     ))
 
 
+@pytest.mark.parametrize("kwarg,expected", [
+    ("LW_", ("LW_",)),
+    ("LW_ QQ Q", ("LW_", "QQ", "Q")),
+    ("yiy         aia", ("yiy", "aia")),
+])
+def test_extract_distutils_keyword_arg_388(kwarg, expected):
+    # This is a regression test for https://github.com/python-babel/babel/issues/388
+
+    # Note that distutils-based commands only support a single repetition of the same argument;
+    # hence `--keyword ignored` will actually never end up in the output.
+
+    cmdinst = configure_distutils_command(
+        "extract_messages --no-default-keywords --keyword ignored --keyword '%s' "
+        "--input-dirs . --output-file django233.pot --add-comments Bar,Foo" % kwarg
+    )
+    assert isinstance(cmdinst, extract_messages)
+    assert set(cmdinst.keywords.keys()) == set(expected)
+
+    # Test the comma-separated comment argument while we're at it:
+    assert set(cmdinst.add_comments) == set(("Bar", "Foo"))
+
+
 def test_update_catalog_boolean_args():
     cmdinst = configure_cli_command("update --no-wrap -N --ignore-obsolete --previous -i foo -o foo -l en")
     assert isinstance(cmdinst, update_catalog)

From 72e97c1734e8bf7b6ff7d8c4c010f895a25034ed Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 14 Apr 2016 11:41:27 +0300
Subject: [PATCH 276/489] frontend: don't use unicode-variant %r for logging

Now that arguments are more likely to be unicode than bytestrings, %r is not a good idea between Python versions.
---
 babel/messages/frontend.py      | 10 +++++-----
 tests/messages/test_frontend.py | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index b975ff38b..76cf1718d 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -222,12 +222,12 @@ def _run_domain(self, domain):
                 if len(catalog):
                     percentage = translated * 100 // len(catalog)
                 self.log.info(
-                    '%d of %d messages (%d%%) translated in %r',
+                    '%d of %d messages (%d%%) translated in %s',
                     translated, len(catalog), percentage, po_file
                 )
 
             if catalog.fuzzy and not self.use_fuzzy:
-                self.log.info('catalog %r is marked as fuzzy, skipping', po_file)
+                self.log.info('catalog %s is marked as fuzzy, skipping', po_file)
                 continue
 
             for message, errors in catalog.check():
@@ -236,7 +236,7 @@ def _run_domain(self, domain):
                         'error: %s:%d: %s', po_file, message.lineno, error
                     )
 
-            self.log.info('compiling catalog %r to %r', po_file, mo_file)
+            self.log.info('compiling catalog %s to %s', po_file, mo_file)
 
             outfile = open(mo_file, 'wb')
             try:
@@ -574,7 +574,7 @@ def finalize_options(self):
 
     def run(self):
         self.log.info(
-            'creating catalog %r based on %r', self.output_file, self.input_file
+            'creating catalog %s based on %s', self.output_file, self.input_file
         )
 
         infile = open(self.input_file, 'rb')
@@ -705,7 +705,7 @@ def run(self):
             raise DistutilsOptionError('no message catalogs found')
 
         for locale, filename in po_files:
-            self.log.info('updating catalog %r based on %r', filename, self.input_file)
+            self.log.info('updating catalog %s based on %s', filename, self.input_file)
             infile = open(filename, 'rb')
             try:
                 catalog = read_po(infile, locale=locale, domain=domain)
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 118d3f29b..ad938ace8 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1092,7 +1092,7 @@ def test_compile_catalog(self):
                                  '-d', self._i18n_dir()])
         assert not os.path.isfile(mo_file), 'Expected no file at %r' % mo_file
         self.assertEqual("""\
-catalog %r is marked as fuzzy, skipping
+catalog %s is marked as fuzzy, skipping
 """ % (po_file), sys.stderr.getvalue())
 
     def test_compile_fuzzy_catalog(self):
@@ -1104,7 +1104,7 @@ def test_compile_fuzzy_catalog(self):
                                      '-d', self._i18n_dir()])
             assert os.path.isfile(mo_file)
             self.assertEqual("""\
-compiling catalog %r to %r
+compiling catalog %s to %s
 """ % (po_file, mo_file), sys.stderr.getvalue())
         finally:
             if os.path.isfile(mo_file):
@@ -1123,7 +1123,7 @@ def test_compile_catalog_with_more_than_2_plural_forms(self):
                                      '-d', self._i18n_dir()])
             assert os.path.isfile(mo_file)
             self.assertEqual("""\
-compiling catalog %r to %r
+compiling catalog %s to %s
 """ % (po_file, mo_file), sys.stderr.getvalue())
         finally:
             if os.path.isfile(mo_file):
@@ -1143,8 +1143,8 @@ def test_compile_catalog_multidomain(self):
             for mo_file in [mo_foo, mo_bar]:
                 assert os.path.isfile(mo_file)
             self.assertEqual("""\
-compiling catalog %r to %r
-compiling catalog %r to %r
+compiling catalog %s to %s
+compiling catalog %s to %s
 """ % (po_foo, mo_foo, po_bar, mo_bar), sys.stderr.getvalue())
 
         finally:

From ad2057a9f20c8d90b708b8dfa8509dca8b4f4847 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 17 Apr 2016 18:16:01 +0300
Subject: [PATCH 277/489] extract: don't die badly when no input paths are
 specified in optparse mode

---
 babel/messages/frontend.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 76cf1718d..2a4f1846f 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -372,11 +372,13 @@ def finalize_options(self):
         if self.input_paths:
             if isinstance(self.input_paths, string_types):
                 self.input_paths = re.split(',\s*', self.input_paths)
-        else:
+        elif self.distribution is not None:
             self.input_paths = dict.fromkeys([
                 k.split('.', 1)[0]
                 for k in (self.distribution.packages or ())
             ]).keys()
+        else:
+            self.input_paths = []
 
         if not self.input_paths:
             raise DistutilsOptionError("no input files or directories specified")

From bb06614d16b2fd8154ec69370d905177d99c16fa Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 17 Apr 2016 18:06:03 +0300
Subject: [PATCH 278/489] Remind the optparse CLI about `extract -s` (a
 shorthand for `--strip-comments`)

Fixes #390
---
 babel/messages/frontend.py      | 2 +-
 tests/messages/test_frontend.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 2a4f1846f..ee1e1855e 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -297,7 +297,7 @@ class extract_messages(Command):
         ('add-comments=', 'c',
          'place comment block with TAG (or those preceding keyword lines) in '
          'output file. Separate multiple TAGs with commas(,)'),  # TODO: Support repetition of this argument
-        ('strip-comments', None,
+        ('strip-comments', 's',
          'strip the comment TAGs from the comments.'),
         ('input-paths=', None,
          'files or directories that should be scanned for messages. Separate multiple '
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index ad938ace8..26f6cce19 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1343,3 +1343,10 @@ def test_update_catalog_boolean_args():
     assert cmdinst.no_fuzzy_matching is True
     assert cmdinst.ignore_obsolete is True
     assert cmdinst.previous is False  # Mutually exclusive with no_fuzzy_matching
+
+
+def test_extract_cli_knows_dash_s():
+    # This is a regression test for https://github.com/python-babel/babel/issues/390
+    cmdinst = configure_cli_command("extract -s -o foo babel")
+    assert isinstance(cmdinst, extract_messages)
+    assert cmdinst.strip_comments

From ee8abd6c5c59ce2dad8f2f0f78b44fe2e10ab5d9 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 17 Apr 2016 18:20:10 +0300
Subject: [PATCH 279/489] Teach the optparse CLI about the parameter aliases it
 had forgotten in #311

Vaguely refs #390
---
 babel/messages/frontend.py      | 13 +++++++++++++
 tests/messages/test_frontend.py | 10 +++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index ee1e1855e..d190a2c07 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -98,6 +98,12 @@ class Command(_Command):
     # declared in the base class.)
     boolean_options = ()
 
+    #: Option aliases, to retain standalone command compatibility.
+    #: Distutils does not support option aliases, but optparse does.
+    #: This maps the distutils argument name to an iterable of aliases
+    #: that are usable with optparse.
+    option_aliases = {}
+
     #: Log object. To allow replacement in the script command line runner.
     log = distutils_log
 
@@ -311,6 +317,12 @@ class extract_messages(Command):
     ]
     as_args = 'input-paths'
     multiple_value_options = ('add-comments', 'keywords')
+    option_aliases = {
+        'keywords': ('--keyword',),
+        'mapping-file': ('--mapping',),
+        'output-file': ('--output',),
+        'strip-comments': ('--strip-comment-tags',),
+    }
 
     def initialize_options(self):
         self.charset = 'utf-8'
@@ -870,6 +882,7 @@ def _configure_command(self, cmdname, argv):
             strs = ["--%s" % name]
             if short:
                 strs.append("-%s" % short)
+            strs.extend(cmdclass.option_aliases.get(name, ()))
             if name == as_args:
                 parser.usage += "<%s>" % name
             elif name in cmdclass.boolean_options:
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 26f6cce19..7488bcc57 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1267,8 +1267,12 @@ def configure_distutils_command(cmdline):
 
 
 @pytest.mark.parametrize("split", (False, True))
-def test_extract_keyword_args_384(split):
+@pytest.mark.parametrize("arg_name", ("-k", "--keyword", "--keywords"))
+def test_extract_keyword_args_384(split, arg_name):
     # This is a regression test for https://github.com/python-babel/babel/issues/384
+    # and it also tests that the rest of the forgotten aliases/shorthands implied by
+    # https://github.com/python-babel/babel/issues/390 are re-remembered (or rather
+    # that the mechanism for remembering them again works).
 
     kwarg_specs = [
         "gettext_noop",
@@ -1282,9 +1286,9 @@ def test_extract_keyword_args_384(split):
     ]
 
     if split:  # Generate a command line with multiple -ks
-        kwarg_text = " ".join("-k %s" % kwarg_spec for kwarg_spec in kwarg_specs)
+        kwarg_text = " ".join("%s %s" % (arg_name, kwarg_spec) for kwarg_spec in kwarg_specs)
     else:  # Generate a single space-separated -k
-        kwarg_text = "-k \"%s\"" % " ".join(kwarg_specs)
+        kwarg_text = "%s \"%s\"" % (arg_name, " ".join(kwarg_specs))
 
     # (Both of those invocation styles should be equivalent, so there is no parametrization from here on out)
 

From b4d95cd14876882b4c80fc8db4dda88b09eecd4d Mon Sep 17 00:00:00 2001
From: Jennifer Wang <jtwang@yelp.com>
Date: Mon, 18 Apr 2016 15:30:54 -0700
Subject: [PATCH 280/489] Revert "import_cldr: if lxml is installed, use it"

This reverts commit 9b5c7f3678167f03ec39fd1c25f98d0e0d41621f.

Refs https://github.com/python-babel/babel/issues/391
---
 scripts/import_cldr.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index f684de343..8de704360 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -18,12 +18,9 @@
 import sys
 
 try:
-    import lxml.etree as ElementTree
+    from xml.etree import cElementTree as ElementTree
 except ImportError:
-    try:
-        from xml.etree import cElementTree as ElementTree
-    except ImportError:
-        from xml.etree import ElementTree
+    from xml.etree import ElementTree
 
 # Make sure we're using Babel source, and not some previously installed version
 CHECKOUT_ROOT = os.path.abspath(os.path.join(

From fe2e6e4ec4b1e1a73683062d26fb0c8fc36e93b2 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 22 Apr 2016 09:49:32 +0300
Subject: [PATCH 281/489] Fix CLI regressions (see below for details)

This is a combination of the test suite improvement fbc1648 and the frontend changes in 414aec5..ee8abd6.

* Harmonize extraction keyword parsing between distutils and standalone CLI (#388, #384, #311)
* Don't use unicode-variant %r for logging
* extract: don't die badly when no input paths are specified in optparse mode
* Remind the optparse CLI about `extract -s` (a shorthand for `--strip-comments`) (#390)
* Teach the optparse CLI about the parameter aliases it had forgotten in #311 (#390)
---
 babel/messages/frontend.py      |  94 +++++++++++++++++++++++------
 tests/messages/test_frontend.py | 102 +++++++++++++++++++++++++++-----
 2 files changed, 164 insertions(+), 32 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 62e7c03e9..d190a2c07 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -22,7 +22,7 @@
 
 from babel import __version__ as VERSION
 from babel import Locale, localedata
-from babel._compat import StringIO, string_types
+from babel._compat import StringIO, string_types, text_type
 from babel.core import UnknownLocaleError
 from babel.messages.catalog import Catalog
 from babel.messages.extract import DEFAULT_KEYWORDS, DEFAULT_MAPPING, check_and_call_extract_file, extract_from_dir
@@ -39,6 +39,48 @@
     from configparser import RawConfigParser
 
 
+def listify_value(arg, split=None):
+    """
+    Make a list out of an argument.
+
+    Values from `distutils` argument parsing are always single strings;
+    values from `optparse` parsing may be lists of strings that may need
+    to be further split.
+
+    No matter the input, this function returns a flat list of whitespace-trimmed
+    strings, with `None` values filtered out.
+
+    >>> listify_value("foo bar")
+    ['foo', 'bar']
+    >>> listify_value(["foo bar"])
+    ['foo', 'bar']
+    >>> listify_value([["foo"], "bar"])
+    ['foo', 'bar']
+    >>> listify_value([["foo"], ["bar", None, "foo"]])
+    ['foo', 'bar', 'foo']
+    >>> listify_value("foo, bar, quux", ",")
+    ['foo', 'bar', 'quux']
+
+    :param arg: A string or a list of strings
+    :param split: The argument to pass to `str.split()`.
+    :return:
+    """
+    out = []
+
+    if not isinstance(arg, (list, tuple)):
+        arg = [arg]
+
+    for val in arg:
+        if val is None:
+            continue
+        if isinstance(val, (list, tuple)):
+            out.extend(listify_value(val, split=split))
+            continue
+        out.extend(s.strip() for s in text_type(val).split(split))
+    assert all(isinstance(val, string_types) for val in out)
+    return out
+
+
 class Command(_Command):
     # This class is a small shim between Distutils commands and
     # optparse option parsing in the frontend command line.
@@ -47,8 +89,21 @@ class Command(_Command):
     as_args = None
 
     #: Options which allow multiple values.
+    #: This is used by the `optparse` transmogrification code.
     multiple_value_options = ()
 
+    #: Options which are booleans.
+    #: This is used by the `optparse` transmogrification code.
+    # (This is actually used by distutils code too, but is never
+    # declared in the base class.)
+    boolean_options = ()
+
+    #: Option aliases, to retain standalone command compatibility.
+    #: Distutils does not support option aliases, but optparse does.
+    #: This maps the distutils argument name to an iterable of aliases
+    #: that are usable with optparse.
+    option_aliases = {}
+
     #: Log object. To allow replacement in the script command line runner.
     log = distutils_log
 
@@ -110,6 +165,7 @@ def initialize_options(self):
         self.statistics = False
 
     def finalize_options(self):
+        self.domain = listify_value(self.domain)
         if not self.input_file and not self.directory:
             raise DistutilsOptionError('you must specify either the input file '
                                        'or the base directory')
@@ -118,9 +174,7 @@ def finalize_options(self):
                                        'or the base directory')
 
     def run(self):
-        domains = self.domain.split()
-
-        for domain in domains:
+        for domain in self.domain:
             self._run_domain(domain)
 
     def _run_domain(self, domain):
@@ -174,12 +228,12 @@ def _run_domain(self, domain):
                 if len(catalog):
                     percentage = translated * 100 // len(catalog)
                 self.log.info(
-                    '%d of %d messages (%d%%) translated in %r',
+                    '%d of %d messages (%d%%) translated in %s',
                     translated, len(catalog), percentage, po_file
                 )
 
             if catalog.fuzzy and not self.use_fuzzy:
-                self.log.info('catalog %r is marked as fuzzy, skipping', po_file)
+                self.log.info('catalog %s is marked as fuzzy, skipping', po_file)
                 continue
 
             for message, errors in catalog.check():
@@ -188,7 +242,7 @@ def _run_domain(self, domain):
                         'error: %s:%d: %s', po_file, message.lineno, error
                     )
 
-            self.log.info('compiling catalog %r to %r', po_file, mo_file)
+            self.log.info('compiling catalog %s to %s', po_file, mo_file)
 
             outfile = open(mo_file, 'wb')
             try:
@@ -249,7 +303,7 @@ class extract_messages(Command):
         ('add-comments=', 'c',
          'place comment block with TAG (or those preceding keyword lines) in '
          'output file. Separate multiple TAGs with commas(,)'),  # TODO: Support repetition of this argument
-        ('strip-comments', None,
+        ('strip-comments', 's',
          'strip the comment TAGs from the comments.'),
         ('input-paths=', None,
          'files or directories that should be scanned for messages. Separate multiple '
@@ -263,6 +317,12 @@ class extract_messages(Command):
     ]
     as_args = 'input-paths'
     multiple_value_options = ('add-comments', 'keywords')
+    option_aliases = {
+        'keywords': ('--keyword',),
+        'mapping-file': ('--mapping',),
+        'output-file': ('--output',),
+        'strip-comments': ('--strip-comment-tags',),
+    }
 
     def initialize_options(self):
         self.charset = 'utf-8'
@@ -299,8 +359,7 @@ def finalize_options(self):
         else:
             keywords = DEFAULT_KEYWORDS.copy()
 
-        for kwarg in (self.keywords or ()):
-            keywords.update(parse_keywords(kwarg.split()))
+        keywords.update(parse_keywords(listify_value(self.keywords)))
 
         self.keywords = keywords
 
@@ -325,11 +384,13 @@ def finalize_options(self):
         if self.input_paths:
             if isinstance(self.input_paths, string_types):
                 self.input_paths = re.split(',\s*', self.input_paths)
-        else:
+        elif self.distribution is not None:
             self.input_paths = dict.fromkeys([
                 k.split('.', 1)[0]
                 for k in (self.distribution.packages or ())
             ]).keys()
+        else:
+            self.input_paths = []
 
         if not self.input_paths:
             raise DistutilsOptionError("no input files or directories specified")
@@ -338,11 +399,7 @@ def finalize_options(self):
             if not os.path.exists(path):
                 raise DistutilsOptionError("Input path: %s does not exist" % path)
 
-        if self.add_comments:
-            if isinstance(self.add_comments, string_types):
-                self.add_comments = self.add_comments.split(',')
-        else:
-            self.add_comments = []
+        self.add_comments = listify_value(self.add_comments or (), ",")
 
         if self.distribution:
             if not self.project:
@@ -531,7 +588,7 @@ def finalize_options(self):
 
     def run(self):
         self.log.info(
-            'creating catalog %r based on %r', self.output_file, self.input_file
+            'creating catalog %s based on %s', self.output_file, self.input_file
         )
 
         infile = open(self.input_file, 'rb')
@@ -662,7 +719,7 @@ def run(self):
             raise DistutilsOptionError('no message catalogs found')
 
         for locale, filename in po_files:
-            self.log.info('updating catalog %r based on %r', filename, self.input_file)
+            self.log.info('updating catalog %s based on %s', filename, self.input_file)
             infile = open(filename, 'rb')
             try:
                 catalog = read_po(infile, locale=locale, domain=domain)
@@ -825,6 +882,7 @@ def _configure_command(self, cmdname, argv):
             strs = ["--%s" % name]
             if short:
                 strs.append("-%s" % short)
+            strs.extend(cmdclass.option_aliases.get(name, ()))
             if name == as_args:
                 parser.usage += "<%s>" % name
             elif name in cmdclass.boolean_options:
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 4c3c4a5a1..7488bcc57 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -27,7 +27,7 @@
 from babel import __version__ as VERSION
 from babel.dates import format_datetime
 from babel.messages import frontend, Catalog
-from babel.messages.frontend import CommandLineInterface, extract_messages
+from babel.messages.frontend import CommandLineInterface, extract_messages, update_catalog
 from babel.util import LOCALTZ
 from babel.messages.pofile import read_po, write_po
 from babel._compat import StringIO
@@ -1092,7 +1092,7 @@ def test_compile_catalog(self):
                                  '-d', self._i18n_dir()])
         assert not os.path.isfile(mo_file), 'Expected no file at %r' % mo_file
         self.assertEqual("""\
-catalog %r is marked as fuzzy, skipping
+catalog %s is marked as fuzzy, skipping
 """ % (po_file), sys.stderr.getvalue())
 
     def test_compile_fuzzy_catalog(self):
@@ -1104,7 +1104,7 @@ def test_compile_fuzzy_catalog(self):
                                      '-d', self._i18n_dir()])
             assert os.path.isfile(mo_file)
             self.assertEqual("""\
-compiling catalog %r to %r
+compiling catalog %s to %s
 """ % (po_file, mo_file), sys.stderr.getvalue())
         finally:
             if os.path.isfile(mo_file):
@@ -1123,7 +1123,7 @@ def test_compile_catalog_with_more_than_2_plural_forms(self):
                                      '-d', self._i18n_dir()])
             assert os.path.isfile(mo_file)
             self.assertEqual("""\
-compiling catalog %r to %r
+compiling catalog %s to %s
 """ % (po_file, mo_file), sys.stderr.getvalue())
         finally:
             if os.path.isfile(mo_file):
@@ -1143,8 +1143,8 @@ def test_compile_catalog_multidomain(self):
             for mo_file in [mo_foo, mo_bar]:
                 assert os.path.isfile(mo_file)
             self.assertEqual("""\
-compiling catalog %r to %r
-compiling catalog %r to %r
+compiling catalog %s to %s
+compiling catalog %s to %s
 """ % (po_foo, mo_foo, po_bar, mo_bar), sys.stderr.getvalue())
 
         finally:
@@ -1232,9 +1232,47 @@ def test_parse_keywords():
     }
 
 
+def configure_cli_command(cmdline):
+    """
+    Helper to configure a command class, but not run it just yet.
+
+    :param cmdline: The command line (sans the executable name)
+    :return: Command instance
+    """
+    args = shlex.split(cmdline)
+    cli = CommandLineInterface()
+    cmdinst = cli._configure_command(cmdname=args[0], argv=args[1:])
+    return cmdinst
+
+
+def configure_distutils_command(cmdline):
+    """
+    Helper to configure a command class, but not run it just yet.
+
+    This will have strange side effects if you pass in things
+    `distutils` deals with internally.
+
+    :param cmdline: The command line (sans the executable name)
+    :return: Command instance
+    """
+    d = Distribution(attrs={
+        "cmdclass": vars(frontend),
+        "script_args": shlex.split(cmdline),
+    })
+    d.parse_command_line()
+    assert len(d.commands) == 1
+    cmdinst = d.get_command_obj(d.commands[0])
+    cmdinst.ensure_finalized()
+    return cmdinst
+
+
 @pytest.mark.parametrize("split", (False, True))
-def test_extract_keyword_args_384(split):
+@pytest.mark.parametrize("arg_name", ("-k", "--keyword", "--keywords"))
+def test_extract_keyword_args_384(split, arg_name):
     # This is a regression test for https://github.com/python-babel/babel/issues/384
+    # and it also tests that the rest of the forgotten aliases/shorthands implied by
+    # https://github.com/python-babel/babel/issues/390 are re-remembered (or rather
+    # that the mechanism for remembering them again works).
 
     kwarg_specs = [
         "gettext_noop",
@@ -1248,17 +1286,15 @@ def test_extract_keyword_args_384(split):
     ]
 
     if split:  # Generate a command line with multiple -ks
-        kwarg_text = " ".join("-k %s" % kwarg_spec for kwarg_spec in kwarg_specs)
+        kwarg_text = " ".join("%s %s" % (arg_name, kwarg_spec) for kwarg_spec in kwarg_specs)
     else:  # Generate a single space-separated -k
-        kwarg_text = "-k \"%s\"" % " ".join(kwarg_specs)
+        kwarg_text = "%s \"%s\"" % (arg_name, " ".join(kwarg_specs))
 
     # (Both of those invocation styles should be equivalent, so there is no parametrization from here on out)
 
-    cmdline = "extract -F babel-django.cfg --add-comments Translators: -o django232.pot %s ." % kwarg_text
-
-    args = shlex.split(cmdline)
-    cli = CommandLineInterface()
-    cmdinst = cli._configure_command(cmdname=args[0], argv=args[1:])
+    cmdinst = configure_cli_command(
+        "extract -F babel-django.cfg --add-comments Translators: -o django232.pot %s ." % kwarg_text
+    )
     assert isinstance(cmdinst, extract_messages)
     assert set(cmdinst.keywords.keys()) == set((
         '_',
@@ -1280,3 +1316,41 @@ def test_extract_keyword_args_384(split):
         'ungettext',
         'ungettext_lazy',
     ))
+
+
+@pytest.mark.parametrize("kwarg,expected", [
+    ("LW_", ("LW_",)),
+    ("LW_ QQ Q", ("LW_", "QQ", "Q")),
+    ("yiy         aia", ("yiy", "aia")),
+])
+def test_extract_distutils_keyword_arg_388(kwarg, expected):
+    # This is a regression test for https://github.com/python-babel/babel/issues/388
+
+    # Note that distutils-based commands only support a single repetition of the same argument;
+    # hence `--keyword ignored` will actually never end up in the output.
+
+    cmdinst = configure_distutils_command(
+        "extract_messages --no-default-keywords --keyword ignored --keyword '%s' "
+        "--input-dirs . --output-file django233.pot --add-comments Bar,Foo" % kwarg
+    )
+    assert isinstance(cmdinst, extract_messages)
+    assert set(cmdinst.keywords.keys()) == set(expected)
+
+    # Test the comma-separated comment argument while we're at it:
+    assert set(cmdinst.add_comments) == set(("Bar", "Foo"))
+
+
+def test_update_catalog_boolean_args():
+    cmdinst = configure_cli_command("update --no-wrap -N --ignore-obsolete --previous -i foo -o foo -l en")
+    assert isinstance(cmdinst, update_catalog)
+    assert cmdinst.no_wrap is True
+    assert cmdinst.no_fuzzy_matching is True
+    assert cmdinst.ignore_obsolete is True
+    assert cmdinst.previous is False  # Mutually exclusive with no_fuzzy_matching
+
+
+def test_extract_cli_knows_dash_s():
+    # This is a regression test for https://github.com/python-babel/babel/issues/390
+    cmdinst = configure_cli_command("extract -s -o foo babel")
+    assert isinstance(cmdinst, extract_messages)
+    assert cmdinst.strip_comments

From 915236c61b95541a97a42532bbc41249049b77ef Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 22 Apr 2016 09:57:16 +0300
Subject: [PATCH 282/489] Bump to 2.3.4

---
 CHANGES           | 11 +++++++++++
 babel/__init__.py |  2 +-
 docs/conf.py      |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 396710b9d..d4c01325c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,17 @@
 Babel Changelog
 ===============
 
+Version 2.3.4
+-------------
+
+(Bugfix release, released on April 22th)
+
+Bugfixes
+~~~~~~~~
+
+* CLDR: The lxml library is no longer used for CLDR importing, so it should not cause strange failures either. Thanks to @aronbierbaum for the bug report and @jtwang for the fix. (https://github.com/python-babel/babel/pull/393)
+* CLI: Every last single CLI usage regression should now be gone, and both distutils and stand-alone CLIs should work as they have in the past. Thanks to @paxswill and @ajaeger for bug reports. (https://github.com/python-babel/babel/pull/389)
+
 Version 2.3.3
 -------------
 
diff --git a/babel/__init__.py b/babel/__init__.py
index 7f810c745..ecc405913 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.3.3'
+__version__ = '2.3.4'
diff --git a/docs/conf.py b/docs/conf.py
index fc0530f1e..b27a04c2d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '2.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.3.3'
+release = '2.3.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 33a8fc40d417b401162e2d20021fcbebcc4ab7db Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Wed, 27 Apr 2016 12:26:29 -0700
Subject: [PATCH 283/489] Default to UTF-8 source encoding (PEP8: python3)

---
 babel/messages/extract.py      |  2 +-
 tests/messages/test_extract.py | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 716262706..4dc56a454 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -398,7 +398,7 @@ def extract_python(fileobj, keywords, comment_tags, options):
     in_def = in_translator_comments = False
     comment_tag = None
 
-    encoding = parse_encoding(fileobj) or options.get('encoding', 'iso-8859-1')
+    encoding = parse_encoding(fileobj) or options.get('encoding', 'UTF-8')
 
     if PY2:
         next_line = fileobj.readline
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index db03af2e8..9d78d923b 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -50,6 +50,21 @@ def test_nested_calls(self):
             (10, 'dngettext', (None, u'Page', u'Pages', None), [])],
             messages)
 
+    def test_extract_default_encoding_ascii(self):
+        buf = BytesIO(b'_("a")')
+        messages = list(extract.extract_python(
+            buf, list(extract.DEFAULT_KEYWORDS), [], {},
+        ))
+        # Should work great in both py2 and py3
+        self.assertEqual([(1, '_', 'a', [])], messages)
+
+    def test_extract_default_encoding_utf8(self):
+        buf = BytesIO(u'_("☃")'.encode('UTF-8'))
+        messages = list(extract.extract_python(
+            buf, list(extract.DEFAULT_KEYWORDS), [], {},
+        ))
+        self.assertEqual([(1, '_', u'☃', [])], messages)
+
     def test_nested_comments(self):
         buf = BytesIO(b"""\
 msg = ngettext('pylon',  # TRANSLATORS: shouldn't be

From b422dd3a239aac8413523053d088e0e1aefa3471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Fievet?= <_@sebastien-fievet.fr>
Date: Fri, 20 May 2016 14:58:24 +0200
Subject: [PATCH 284/489] Typo

---
 babel/messages/catalog.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 8c807f8fc..aeb9a9e40 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -83,7 +83,7 @@ def __init__(self, id, string=u'', locations=(), flags=(), auto_comments=(),
                    pluralizable messages
         :param string: the translated message string, or a
                        ``(singular, plural)`` tuple for pluralizable messages
-        :param locations: a sequence of ``(filenname, lineno)`` tuples
+        :param locations: a sequence of ``(filename, lineno)`` tuples
         :param flags: a set or sequence of flags
         :param auto_comments: a sequence of automatic comments for the message
         :param user_comments: a sequence of user comments for the message
@@ -625,7 +625,7 @@ def add(self, id, string=None, locations=(), flags=(), auto_comments=(),
                    pluralizable messages
         :param string: the translated message string, or a
                        ``(singular, plural)`` tuple for pluralizable messages
-        :param locations: a sequence of ``(filenname, lineno)`` tuples
+        :param locations: a sequence of ``(filename, lineno)`` tuples
         :param flags: a set or sequence of flags
         :param auto_comments: a sequence of automatic comments
         :param user_comments: a sequence of user comments

From 6238f6620c54d0343e923ef92130b35f2bd117d0 Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Sat, 28 May 2016 23:00:24 +0200
Subject: [PATCH 285/489] Remove explicit enforcement from Decimal rounding

Allow the rounding mode to be controlled from the currently active decimal
context.  This gives the caller the ability to control rounding mode, precision,
exponent range and all attributes that affect decimal operations.

Fixes #90
---
 babel/_compat.py | 8 ++------
 babel/numbers.py | 6 +++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/babel/_compat.py b/babel/_compat.py
index 75abf9eb1..ae290f42c 100644
--- a/babel/_compat.py
+++ b/babel/_compat.py
@@ -61,16 +61,12 @@
 # Use cdecimal when available
 #
 from decimal import (Decimal as _dec,
-                     InvalidOperation as _invop,
-                     ROUND_HALF_EVEN as _RHE)
+                     InvalidOperation as _invop)
 try:
     from cdecimal import (Decimal as _cdec,
-                          InvalidOperation as _cinvop,
-                          ROUND_HALF_EVEN as _CRHE)
+                          InvalidOperation as _cinvop)
     Decimal = _cdec
     InvalidOperation = (_invop, _cinvop)
-    ROUND_HALF_EVEN = _CRHE
 except ImportError:
     Decimal = _dec
     InvalidOperation = _invop
-    ROUND_HALF_EVEN = _RHE
diff --git a/babel/numbers.py b/babel/numbers.py
index 3ab366ccc..67881ae56 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -22,7 +22,7 @@
 from datetime import date as date_, datetime as datetime_
 
 from babel.core import default_locale, Locale, get_global
-from babel._compat import Decimal, InvalidOperation, ROUND_HALF_EVEN
+from babel._compat import Decimal, InvalidOperation
 
 
 LC_NUMERIC = default_locale('LC_NUMERIC')
@@ -604,7 +604,7 @@ def apply(self, value, locale, currency=None, force_frac=None):
                 number += get_decimal_symbol(locale) + b
         else:  # A normal number pattern
             precision = Decimal('1.' + '1' * frac_prec[1])
-            rounded = value.quantize(precision, ROUND_HALF_EVEN)
+            rounded = value.quantize(precision)
             a, sep, b = str(abs(rounded)).partition(".")
             number = (self._format_int(a, self.int_prec[0],
                                        self.int_prec[1], locale) +
@@ -641,7 +641,7 @@ def apply(self, value, locale, currency=None, force_frac=None):
     def _format_significant(self, value, minimum, maximum):
         exp = value.adjusted()
         scale = maximum - 1 - exp
-        digits = str(value.scaleb(scale).quantize(Decimal(1), ROUND_HALF_EVEN))
+        digits = str(value.scaleb(scale).quantize(Decimal(1)))
         if scale <= 0:
             result = digits + '0' * -scale
         else:

From 8341064c151b50135ac083b33117420efeda4d96 Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Sun, 29 May 2016 09:40:24 +0200
Subject: [PATCH 286/489] Simplify the selection of decimal implementation

Instead of selecting individual symbols, expose only the chosen decimal module
through babel._compat.  This forces Babel to always use "decimal." prefix.
Howver, it will simplify the code for users that need to manipulate the decimal
context.
---
 babel/_compat.py      | 20 +++++++++-----------
 babel/numbers.py      | 16 ++++++++--------
 babel/plural.py       |  6 +++---
 babel/units.py        |  4 ++--
 tests/test_numbers.py | 22 +++++++++++-----------
 tests/test_plural.py  | 22 +++++++++++-----------
 tests/test_smoke.py   |  6 +++---
 7 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/babel/_compat.py b/babel/_compat.py
index ae290f42c..aea338938 100644
--- a/babel/_compat.py
+++ b/babel/_compat.py
@@ -58,15 +58,13 @@
 
 
 #
-# Use cdecimal when available
+# Since Python 3.3, a fast decimal implementation is already included in the
+# standard library.  Otherwise use cdecimal when available
 #
-from decimal import (Decimal as _dec,
-                     InvalidOperation as _invop)
-try:
-    from cdecimal import (Decimal as _cdec,
-                          InvalidOperation as _cinvop)
-    Decimal = _cdec
-    InvalidOperation = (_invop, _cinvop)
-except ImportError:
-    Decimal = _dec
-    InvalidOperation = _invop
+if sys.version_info[:2] >= (3, 3):
+    import decimal
+else:
+    try:
+        import cdecimal as decimal
+    except ImportError:
+        import decimal
diff --git a/babel/numbers.py b/babel/numbers.py
index 67881ae56..f9be88dd7 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -22,7 +22,7 @@
 from datetime import date as date_, datetime as datetime_
 
 from babel.core import default_locale, Locale, get_global
-from babel._compat import Decimal, InvalidOperation
+from babel._compat import decimal
 
 
 LC_NUMERIC = default_locale('LC_NUMERIC')
@@ -437,9 +437,9 @@ def parse_decimal(string, locale=LC_NUMERIC):
     """
     locale = Locale.parse(locale)
     try:
-        return Decimal(string.replace(get_group_symbol(locale), '')
-                       .replace(get_decimal_symbol(locale), '.'))
-    except InvalidOperation:
+        return decimal.Decimal(string.replace(get_group_symbol(locale), '')
+                               .replace(get_decimal_symbol(locale), '.'))
+    except decimal.InvalidOperation:
         raise NumberFormatError('%r is not a valid decimal number' % string)
 
 
@@ -566,8 +566,8 @@ def __repr__(self):
 
     def apply(self, value, locale, currency=None, force_frac=None):
         frac_prec = force_frac or self.frac_prec
-        if not isinstance(value, Decimal):
-            value = Decimal(str(value))
+        if not isinstance(value, decimal.Decimal):
+            value = decimal.Decimal(str(value))
         value = value.scaleb(self.scale)
         is_negative = int(value.is_signed())
         if self.exp_prec:  # Scientific notation
@@ -603,7 +603,7 @@ def apply(self, value, locale, currency=None, force_frac=None):
             if sep:
                 number += get_decimal_symbol(locale) + b
         else:  # A normal number pattern
-            precision = Decimal('1.' + '1' * frac_prec[1])
+            precision = decimal.Decimal('1.' + '1' * frac_prec[1])
             rounded = value.quantize(precision)
             a, sep, b = str(abs(rounded)).partition(".")
             number = (self._format_int(a, self.int_prec[0],
@@ -641,7 +641,7 @@ def apply(self, value, locale, currency=None, force_frac=None):
     def _format_significant(self, value, minimum, maximum):
         exp = value.adjusted()
         scale = maximum - 1 - exp
-        digits = str(value.scaleb(scale).quantize(Decimal(1)))
+        digits = str(value.scaleb(scale).quantize(decimal.Decimal(1)))
         if scale <= 0:
             result = digits + '0' * -scale
         else:
diff --git a/babel/plural.py b/babel/plural.py
index 980629dcc..0b8e425d5 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -11,7 +11,7 @@
 import re
 import sys
 
-from babel._compat import Decimal
+from babel._compat import decimal
 
 
 _plural_tags = ('zero', 'one', 'two', 'few', 'many', 'other')
@@ -33,9 +33,9 @@ def extract_operands(source):
             # 2.6's Decimal cannot convert from float directly
             if sys.version_info < (2, 7):
                 n = str(n)
-            n = Decimal(n)
+            n = decimal.Decimal(n)
 
-    if isinstance(n, Decimal):
+    if isinstance(n, decimal.Decimal):
         dec_tuple = n.as_tuple()
         exp = dec_tuple.exponent
         fraction_digits = dec_tuple.digits[exp:] if exp < 0 else ()
diff --git a/babel/units.py b/babel/units.py
index 798ade20a..1ea5b17cc 100644
--- a/babel/units.py
+++ b/babel/units.py
@@ -80,8 +80,8 @@ def format_unit(value, measurement_unit, length='long', format=None, locale=LC_N
 
     Number formats may be overridden with the ``format`` parameter.
 
-    >>> from babel._compat import Decimal
-    >>> format_unit(Decimal("-42.774"), 'temperature-celsius', 'short', format='#.0', locale='fr')
+    >>> from babel._compat import decimal
+    >>> format_unit(decimal.Decimal("-42.774"), 'temperature-celsius', 'short', format='#.0', locale='fr')
     u'-42,8 \\xb0C'
 
     The locale's usual pluralization rules are respected.
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 19f9bc76d..32a969d14 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -17,7 +17,7 @@
 from datetime import date
 
 from babel import numbers
-from babel._compat import Decimal
+from babel._compat import decimal
 
 
 class FormatDecimalTestCase(unittest.TestCase):
@@ -94,16 +94,16 @@ def test_significant_digits(self):
 
     def test_decimals(self):
         """Test significant digits patterns"""
-        self.assertEqual(numbers.format_decimal(Decimal('1.2345'),
+        self.assertEqual(numbers.format_decimal(decimal.Decimal('1.2345'),
                                                 '#.00', locale='en_US'),
                          '1.23')
-        self.assertEqual(numbers.format_decimal(Decimal('1.2345000'),
+        self.assertEqual(numbers.format_decimal(decimal.Decimal('1.2345000'),
                                                 '#.00', locale='en_US'),
                          '1.23')
-        self.assertEqual(numbers.format_decimal(Decimal('1.2345000'),
+        self.assertEqual(numbers.format_decimal(decimal.Decimal('1.2345000'),
                                                 '@@', locale='en_US'),
                          '1.2')
-        self.assertEqual(numbers.format_decimal(Decimal('12345678901234567890.12345'),
+        self.assertEqual(numbers.format_decimal(decimal.Decimal('12345678901234567890.12345'),
                                                 '#.00', locale='en_US'),
                          '12345678901234567890.12')
 
@@ -136,7 +136,7 @@ def test_scientific_notation(self):
         self.assertEqual(fmt, '1.23E02 m/s')
         fmt = numbers.format_scientific(0.012345, '#.##E00 m/s', locale='en_US')
         self.assertEqual(fmt, '1.23E-02 m/s')
-        fmt = numbers.format_scientific(Decimal('12345'), '#.##E+00 m/s',
+        fmt = numbers.format_scientific(decimal.Decimal('12345'), '#.##E+00 m/s',
                                         locale='en_US')
         self.assertEqual(fmt, '1.23E+04 m/s')
         # 0 (see ticket #99)
@@ -146,7 +146,7 @@ def test_scientific_notation(self):
     def test_formatting_of_very_small_decimals(self):
         # previously formatting very small decimals could lead to a type error
         # because the Decimal->string conversion was too simple (see #214)
-        number = Decimal("7E-7")
+        number = decimal.Decimal("7E-7")
         fmt = numbers.format_decimal(number, format="@@@", locale='en_US')
         self.assertEqual('0.000000700', fmt)
 
@@ -154,9 +154,9 @@ def test_formatting_of_very_small_decimals(self):
 class NumberParsingTestCase(unittest.TestCase):
 
     def test_can_parse_decimals(self):
-        self.assertEqual(Decimal('1099.98'),
+        self.assertEqual(decimal.Decimal('1099.98'),
                          numbers.parse_decimal('1,099.98', locale='en_US'))
-        self.assertEqual(Decimal('1099.98'),
+        self.assertEqual(decimal.Decimal('1099.98'),
                          numbers.parse_decimal('1.099,98', locale='de'))
         self.assertRaises(numbers.NumberFormatError,
                           lambda: numbers.parse_decimal('2,109,998', locale='de'))
@@ -302,8 +302,8 @@ def test_parse_number():
 
 def test_parse_decimal():
     assert (numbers.parse_decimal('1,099.98', locale='en_US')
-            == Decimal('1099.98'))
-    assert numbers.parse_decimal('1.099,98', locale='de') == Decimal('1099.98')
+            == decimal.Decimal('1099.98'))
+    assert numbers.parse_decimal('1.099,98', locale='de') == decimal.Decimal('1099.98')
 
     with pytest.raises(numbers.NumberFormatError) as excinfo:
         numbers.parse_decimal('2,109,998', locale='de')
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 60a2de4a1..6406af872 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -14,7 +14,7 @@
 import pytest
 
 from babel import plural, localedata
-from babel._compat import Decimal
+from babel._compat import decimal
 
 
 def test_plural_rule():
@@ -34,29 +34,29 @@ def test_plural_rule_operands_i():
 
 def test_plural_rule_operands_v():
     rule = plural.PluralRule({'one': 'v is 2'})
-    assert rule(Decimal('1.20')) == 'one'
-    assert rule(Decimal('1.2')) == 'other'
+    assert rule(decimal.Decimal('1.20')) == 'one'
+    assert rule(decimal.Decimal('1.2')) == 'other'
     assert rule(2) == 'other'
 
 
 def test_plural_rule_operands_w():
     rule = plural.PluralRule({'one': 'w is 2'})
-    assert rule(Decimal('1.23')) == 'one'
-    assert rule(Decimal('1.20')) == 'other'
+    assert rule(decimal.Decimal('1.23')) == 'one'
+    assert rule(decimal.Decimal('1.20')) == 'other'
     assert rule(1.2) == 'other'
 
 
 def test_plural_rule_operands_f():
     rule = plural.PluralRule({'one': 'f is 20'})
-    assert rule(Decimal('1.23')) == 'other'
-    assert rule(Decimal('1.20')) == 'one'
+    assert rule(decimal.Decimal('1.23')) == 'other'
+    assert rule(decimal.Decimal('1.20')) == 'one'
     assert rule(1.2) == 'other'
 
 
 def test_plural_rule_operands_t():
     rule = plural.PluralRule({'one': 't = 5'})
-    assert rule(Decimal('1.53')) == 'other'
-    assert rule(Decimal('1.50')) == 'one'
+    assert rule(decimal.Decimal('1.53')) == 'other'
+    assert rule(decimal.Decimal('1.50')) == 'one'
     assert rule(1.5) == 'one'
 
 
@@ -253,9 +253,9 @@ def test_or_and(self):
 
 @pytest.mark.parametrize('source,n,i,v,w,f,t', EXTRACT_OPERANDS_TESTS)
 def test_extract_operands(source, n, i, v, w, f, t):
-    source = Decimal(source) if isinstance(source, str) else source
+    source = decimal.Decimal(source) if isinstance(source, str) else source
     assert (plural.extract_operands(source) ==
-            Decimal(n), i, v, w, f, t)
+            decimal.Decimal(n), i, v, w, f, t)
 
 
 @pytest.mark.parametrize('locale', ('ru', 'pl'))
diff --git a/tests/test_smoke.py b/tests/test_smoke.py
index eda10ed34..3993f608c 100644
--- a/tests/test_smoke.py
+++ b/tests/test_smoke.py
@@ -11,7 +11,7 @@
 from babel import Locale
 from babel import dates
 from babel import numbers
-from babel._compat import Decimal
+from babel._compat import decimal
 
 
 @pytest.mark.all_locales
@@ -28,8 +28,8 @@ def test_smoke_dates(locale):
 def test_smoke_numbers(locale):
     locale = Locale.parse(locale)
     for number in (
-        Decimal("-33.76"),  # Negative Decimal
-        Decimal("13.37"),  # Positive Decimal
+        decimal.Decimal("-33.76"),  # Negative Decimal
+        decimal.Decimal("13.37"),  # Positive Decimal
         1.2 - 1.0,  # Inaccurate float
         10,  # Plain old integer
         0,  # Zero

From f12e975b5af270b8846e8e01df37e3b3ad2e3b57 Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Sun, 29 May 2016 10:26:07 +0200
Subject: [PATCH 287/489] Add a documentation section about number rounding

Explain how the user can control the behaviour of number rounding when
formatting numeric values or currencies.
---
 docs/numbers.rst | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/docs/numbers.rst b/docs/numbers.rst
index fbba1f3ed..1443b7cf5 100644
--- a/docs/numbers.rst
+++ b/docs/numbers.rst
@@ -86,6 +86,58 @@ the specification. The following table is just a relatively brief overview.
   +----------+-----------------------------------------------------------------+
 
 
+Rounding Modes
+==============
+
+Since Babel makes full use of Python's `Decimal`_ type to perform number
+rounding before formatting, users have the chance to control the rounding mode
+and other configurable parameters through the active `Context`_ instance.
+
+By default, Python rounding mode is ``ROUND_HALF_EVEN`` which complies with
+`UTS #35 section 3.3`_.  Yet, the caller has the opportunity to tweak the
+current context before formatting a number or currency:
+
+.. code-block:: pycon
+
+    >>> from babel.numbers import decimal, format_decimal
+    >>> with decimal.localcontext(decimal.Context(rounding=decimal.ROUND_DOWN)):
+    >>>    txt = format_decimal(123.99, format='#', locale='en_US')
+    >>> txt
+    u'123'
+
+It is also possible to use ``decimal.setcontext`` or directly modifying the
+instance returned by ``decimal.getcontext``.  However, using a context manager
+is always more convenient due to the automatic restoration and the ability to
+nest them.
+
+Whatever mechanism is chosen, always make use of the ``decimal`` module imported
+from ``babel.numbers``.  For efficiency reasons, Babel uses the fastest decimal
+implementation available, such as `cdecimal`_.  These various implementation
+offer an identical API, but their types and instances do **not** interoperate
+with each other.
+
+For example, the previous example can be slightly modified to generate
+unexpected results on Python 2.7, with the `cdecimal`_ module installed:
+
+.. code-block:: pycon
+
+    >>> from decimal import localcontext, Context, ROUND_DOWN
+    >>> from babel.numbers import format_decimal
+    >>> with localcontext(Context(rounding=ROUND_DOWN)):
+    >>>    txt = format_decimal(123.99, format='#', locale='en_US')
+    >>> txt
+    u'124'
+
+Changing other parameters such as the precision may also alter the results of
+the number formatting functions.  Remember to test your code to make sure it
+behaves as desired.
+
+.. _Decimal: https://docs.python.org/3/library/decimal.html#decimal-objects
+.. _Context: https://docs.python.org/3/library/decimal.html#context-objects
+.. _`UTS #35 section 3.3`: http://www.unicode.org/reports/tr35/tr35-numbers.html#Formatting
+.. _cdecimal: https://pypi.python.org/pypi/cdecimal
+
+
 Parsing Numbers
 ===============
 

From 476515c2418039e471656f47efbfc43e5230c1fd Mon Sep 17 00:00:00 2001
From: Isaac Jurado <diptongo@gmail.com>
Date: Sun, 29 May 2016 10:50:42 +0200
Subject: [PATCH 288/489] Fix the way local time is constructed in tests

In summer time zones, the test for "get_timezone_name" failed because the
construct used to obtain a local time did not deal properly with DST offsets.
As recommended by pytz, it is better to convert to local time from UTC.
---
 tests/test_dates.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_dates.py b/tests/test_dates.py
index 3bb9e8b22..b0d093ec2 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -624,8 +624,9 @@ def test_get_timezone_name():
     assert dates.get_timezone_name(tz, locale='en', width='long',
                                    zone_variant='daylight') == u'Pacific Daylight Time'
 
+    localnow = datetime.utcnow().replace(tzinfo=timezone('UTC')).astimezone(dates.LOCALTZ)
     assert (dates.get_timezone_name(None, locale='en_US') ==
-            dates.get_timezone_name(datetime.now().replace(tzinfo=dates.LOCALTZ), locale='en_US'))
+            dates.get_timezone_name(localnow, locale='en_US'))
 
     assert (dates.get_timezone_name('Europe/Berlin', locale='en_US') == "Central European Time")
 

From f74213e7fad8f785db12c825d9840e6984a2caf1 Mon Sep 17 00:00:00 2001
From: Adam Chainz <adam@adamj.eu>
Date: Sun, 29 May 2016 14:50:32 +0100
Subject: [PATCH 289/489] Convert readthedocs link for their .org -> .io
 migration for hosted projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As per their email ‘Changes to project subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
---
 CONTRIBUTING.md                | 2 +-
 tests/messages/test_plurals.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 497627303..c72ec2573 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -51,5 +51,5 @@ shall be amended so the history is not cluttered by "fixup commits".
 ## Writing Good Commits
 
 Please see
-http://coala.readthedocs.org/en/latest/Getting_Involved/Writing_Good_Commits.html
+https://coala.readthedocs.io/en/latest/Getting_Involved/Writing_Good_Commits.html
 for guidelines on how to write good commits and proper commit messages.
diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py
index 975e931f6..1a50139f4 100644
--- a/tests/messages/test_plurals.py
+++ b/tests/messages/test_plurals.py
@@ -38,7 +38,7 @@ def test_get_plural_falls_back_to_default():
 
 
 def test_get_plural():
-    # See http://localization-guide.readthedocs.org/en/latest/l10n/pluralforms.html for more details.
+    # See https://localization-guide.readthedocs.io/en/latest/l10n/pluralforms.html for more details.
     assert plurals.get_plural(locale='en') == (2, '(n != 1)')
     assert plurals.get_plural(locale='ga') == (3, '(n==1 ? 0 : n==2 ? 1 : 2)')
 

From 0d1c77498307af875c2e015c7b73d00b52d83831 Mon Sep 17 00:00:00 2001
From: Jennifer Wang <jtwang@yelp.com>
Date: Thu, 2 Jun 2016 12:30:46 -0700
Subject: [PATCH 290/489] parse_pattern now passes original pattern string to
 NumberPattern

---
 babel/core.py         |  2 +-
 babel/numbers.py      |  8 +++++---
 tests/test_core.py    |  2 +-
 tests/test_numbers.py | 46 +++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 4e00ebfb5..e6f432c28 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -577,7 +577,7 @@ def currency_formats(self):
         >>> Locale('en', 'US').currency_formats['standard']
         <NumberPattern u'\\xa4#,##0.00'>
         >>> Locale('en', 'US').currency_formats['accounting']
-        <NumberPattern u'\\xa4#,##0.00'>
+        <NumberPattern u'\\xa4#,##0.00;(\\xa4#,##0.00)'>
         """
         return self._data['currency_formats']
 
diff --git a/babel/numbers.py b/babel/numbers.py
index 3ab366ccc..899fabb3b 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -487,13 +487,15 @@ def _match_number(pattern):
             raise ValueError('Invalid number pattern %r' % pattern)
         return rv.groups()
 
+    pos_pattern = pattern
+
     # Do we have a negative subpattern?
     if ';' in pattern:
-        pattern, neg_pattern = pattern.split(';', 1)
-        pos_prefix, number, pos_suffix = _match_number(pattern)
+        pos_pattern, neg_pattern = pattern.split(';', 1)
+        pos_prefix, number, pos_suffix = _match_number(pos_pattern)
         neg_prefix, _, neg_suffix = _match_number(neg_pattern)
     else:
-        pos_prefix, number, pos_suffix = _match_number(pattern)
+        pos_prefix, number, pos_suffix = _match_number(pos_pattern)
         neg_prefix = '-' + pos_prefix
         neg_suffix = pos_suffix
     if 'E' in number:
diff --git a/tests/test_core.py b/tests/test_core.py
index 29081f079..e3d8faffa 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -172,7 +172,7 @@ def test_currency_formats_property(self):
         assert (Locale('en', 'US').currency_formats['standard'].pattern ==
                 u'\xa4#,##0.00')
         assert (Locale('en', 'US').currency_formats['accounting'].pattern ==
-                u'\xa4#,##0.00')
+                u'\xa4#,##0.00;(\xa4#,##0.00)')
 
     def test_percent_formats_property(self):
         assert Locale('en', 'US').percent_formats[None].pattern == '#,##0%'
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 19f9bc76d..24b274cb7 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -317,5 +317,47 @@ def test_parse_grouping():
 
 
 def test_parse_pattern():
-    assert numbers.parse_pattern(u'¤#,##0.00;(¤#,##0.00)').suffix == (u'', u')')
-    assert numbers.parse_pattern(u'¤ #,##0.00;¤ #,##0.00-').suffix == (u'', u'-')
+
+    # Original pattern is preserved
+    np = numbers.parse_pattern(u'¤#,##0.00')
+    assert np.pattern == u'¤#,##0.00'
+
+    np = numbers.parse_pattern(u'¤#,##0.00;(¤#,##0.00)')
+    assert np.pattern == u'¤#,##0.00;(¤#,##0.00)'
+
+    # Given a NumberPattern object, we don't return a new instance.
+    # However, we don't cache NumberPattern objects, so calling
+    # parse_pattern with the same format string will create new
+    # instances
+    np1 = numbers.parse_pattern(u'¤ #,##0.00')
+    np2 = numbers.parse_pattern(u'¤ #,##0.00')
+    assert np1 is not np2
+    assert np1 is numbers.parse_pattern(np1)
+
+
+def test_parse_pattern_negative():
+
+    # No negative format specified
+    np = numbers.parse_pattern(u'¤#,##0.00')
+    assert np.prefix == (u'¤', u'-¤')
+    assert np.suffix == (u'', u'')
+
+    # Negative format is specified
+    np = numbers.parse_pattern(u'¤#,##0.00;(¤#,##0.00)')
+    assert np.prefix == (u'¤', u'(¤')
+    assert np.suffix == (u'', u')')
+
+    # Negative sign is a suffix
+    np = numbers.parse_pattern(u'¤ #,##0.00;¤ #,##0.00-')
+    assert np.prefix == (u'¤ ', u'¤ ')
+    assert np.suffix == (u'', u'-')
+
+
+def test_numberpattern_repr():
+    """repr() outputs the pattern string"""
+
+    # This implementation looks a bit funny, but that's cause strings are
+    # repr'd differently in Python 2 vs 3 and this test runs under both.
+    format = u'¤#,##0.00;(¤#,##0.00)'
+    np = numbers.parse_pattern(format)
+    assert repr(format) in repr(np)

From 08b9c5e76e19ae610f28759a5cf37621ac2fb734 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Thu, 16 Jun 2016 23:11:56 -0700
Subject: [PATCH 291/489] Read locale from .po if it has Language header

When a .po file was written out it would write the "Language"
header, but it wouldn't subsequently read that header back in. This
change makes that symmetric so you can write out a file and get back the
same Catalog by reading it in again.

Additionally other values like charset get overridden when the header is
read, so codify the behavior that the read "Language" header gets set as
the locale of the Catalog object.
---
 babel/messages/catalog.py     |  2 ++
 tests/messages/test_pofile.py | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index aeb9a9e40..84cee432f 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -402,6 +402,8 @@ def _set_mime_headers(self, headers):
                 self.msgid_bugs_address = value
             elif name == 'last-translator':
                 self.last_translator = value
+            elif name == 'language':
+                self.locale = Locale.parse(value)
             elif name == 'language-team':
                 self.language_team = value
             elif name == 'content-type':
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 1bac3603c..b45307664 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -29,6 +29,14 @@ def test_preserve_locale(self):
         catalog = pofile.read_po(buf, locale='en_US')
         self.assertEqual(Locale('en', 'US'), catalog.locale)
 
+    def test_locale_gets_overridden_by_file(self):
+        buf = StringIO(r'''
+msgid ""
+msgstr ""
+"Language: en_US\n"''')
+        catalog = pofile.read_po(buf, locale='de')
+        self.assertEqual(Locale('en', 'US'), catalog.locale)
+
     def test_preserve_domain(self):
         buf = StringIO(r'''msgid "foo"
 msgstr "Voh"''')
@@ -112,6 +120,7 @@ def test_header_entry(self):
 "POT-Creation-Date: 2007-09-27 11:19+0700\n"
 "PO-Revision-Date: 2007-09-27 21:42-0700\n"
 "Last-Translator: John <cleese@bavaria.de>\n"
+"Language: de\n"
 "Language-Team: German Lang <de@babel.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -128,6 +137,7 @@ def test_header_entry(self):
                                   tzinfo=FixedOffsetTimezone(7 * 60)),
                          catalog.creation_date)
         self.assertEqual(u'John <cleese@bavaria.de>', catalog.last_translator)
+        self.assertEqual(Locale('de'), catalog.locale)
         self.assertEqual(u'German Lang <de@babel.org>', catalog.language_team)
         self.assertEqual(u'iso-8859-2', catalog.charset)
         self.assertEqual(True, list(catalog)[0].fuzzy)

From cf1e50648c4840c405dfffa874801e5ff70b1a48 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 17 May 2016 08:55:30 +0300
Subject: [PATCH 292/489] Download CLDR 29 instead of 28

---
 scripts/download_import_cldr.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index 4da342349..bfcab5f8b 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -12,9 +12,9 @@
     from urllib import urlretrieve
 
 
-URL = 'http://unicode.org/Public/cldr/28/core.zip'
-FILENAME = 'core-28.zip'
-FILESUM = 'bc545b4c831e1987ea931b04094d7b9fc59ec3d8'
+URL = 'http://unicode.org/Public/cldr/29/core.zip'
+FILENAME = 'core-29.zip'
+FILESUM = '44d117e6e591a8f9655602ff0abdee105df3cabe'
 BLKSIZE = 131072
 
 

From 34c92cb220a6eeac40f1cb5b60241ddffca6c3ff Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 17 May 2016 09:21:46 +0300
Subject: [PATCH 293/489] Fix day periods to work with CLDR 29 data

---
 babel/dates.py         | 12 ++++++++----
 scripts/import_cldr.py |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 4a0bbd3e0..523e4562d 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1080,12 +1080,16 @@ def get_period_id(time, tzinfo=None, type=None, locale=LC_TIME):
     locale = Locale.parse(locale)
 
     # The LDML rules state that the rules may not overlap, so iterating in arbitrary
-    # order should be alright.
-    for rule_id, rules in locale.day_period_rules.get(type, {}).items():
+    # order should be alright, though `at` periods should be preferred.
+    rulesets = locale.day_period_rules.get(type, {}).items()
+
+    for rule_id, rules in rulesets:
         for rule in rules:
             if "at" in rule and rule["at"] == seconds_past_midnight:
                 return rule_id
 
+    for rule_id, rules in rulesets:
+        for rule in rules:
             start_ok = end_ok = False
 
             if "from" in rule and seconds_past_midnight >= rule["from"]:
@@ -1096,8 +1100,8 @@ def get_period_id(time, tzinfo=None, type=None, locale=LC_TIME):
                 end_ok = True
             if "before" in rule and seconds_past_midnight < rule["before"]:
                 end_ok = True
-            if "after" in rule and seconds_past_midnight > rule["after"]:
-                start_ok = True
+            if "after" in rule:
+                raise NotImplementedError("'after' is deprecated as of CLDR 29.")
 
             if start_ok and end_ok:
                 return rule_id
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 8de704360..b8041193f 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -845,6 +845,8 @@ def parse_day_period_rules(tree):
             locales = rules.attrib["locales"].split()
             for rule in rules.findall("dayPeriodRule"):
                 type = rule.attrib["type"]
+                if type in ("am", "pm"):  # These fixed periods are handled separately by `get_period_id`
+                    continue
                 rule = _compact_dict(dict(
                     (key, _time_to_seconds_past_midnight(rule.attrib.get(key)))
                     for key in ("after", "at", "before", "from", "to")

From d0dfcdb36ec9eda26e7647b9796d5a2ce27f4c26 Mon Sep 17 00:00:00 2001
From: Nicolas Grilly <nicolas@gardentechno.com>
Date: Fri, 24 Jun 2016 21:49:06 +0200
Subject: [PATCH 294/489] Fix extraction order

Before Babel 2.3, the input directories were always extracted
in the order specified by the command line arguments.

For example, `pybabel extract dir_a dir_b dir_c` would process
`dir_a` first, then `dir_b`, and finally `dir_c`.

Since Babel 2.3, the inputs are stored in a Python dictionary,
and we loop over items in the dictionary using items().
This makes the order unspecified, not matching the order
specified on the command line anymore.
---
 babel/messages/frontend.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index d190a2c07..d99101334 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -416,7 +416,7 @@ def run(self):
                               copyright_holder=self.copyright_holder,
                               charset=self.charset)
 
-            for path, (method_map, options_map) in mappings.items():
+            for path, method_map, options_map in mappings:
                 def callback(filename, method, options):
                     if method == 'ignore':
                         return
@@ -468,14 +468,14 @@ def callback(filename, method, options):
                      sort_by_file=self.sort_by_file)
 
     def _get_mappings(self):
-        mappings = {}
+        mappings = []
 
         if self.mapping_file:
             fileobj = open(self.mapping_file, 'U')
             try:
                 method_map, options_map = parse_mapping(fileobj)
                 for path in self.input_paths:
-                    mappings[path] = method_map, options_map
+                    mappings.append((path, method_map, options_map))
             finally:
                 fileobj.close()
 
@@ -489,11 +489,11 @@ def _get_mappings(self):
                     for pattern, method, options in mapping:
                         method_map.append((pattern, method))
                         options_map[pattern] = options or {}
-                mappings[path] = method_map, options_map
+                mappings.append((path, method_map, options_map))
 
         else:
             for path in self.input_paths:
-                mappings[path] = DEFAULT_MAPPING, {}
+                mappings.append((path, DEFAULT_MAPPING, {}))
 
         return mappings
 

From 27a40c249a636cfdad52938610582eee84555616 Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@starleaf.com>
Date: Fri, 8 Jul 2016 14:10:28 +0100
Subject: [PATCH 295/489] Refactor read_po to use a class for state

This means we don't need to do tricks like have local variables which
are length 1 arrays to hold booleans
---
 babel/messages/pofile.py | 278 ++++++++++++++++++++-------------------
 1 file changed, 143 insertions(+), 135 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index a775ec049..194e96197 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -73,6 +73,146 @@ def denormalize(string):
         return unescape(string)
 
 
+class _PoFileParser(object):
+
+    def __init__(self, locale=None, domain=None, ignore_obsolete=False, charset=None):
+        self.ignore_obsolete = ignore_obsolete
+        self.catalog = Catalog(locale=locale, domain=domain, charset=charset)
+        self.counter = 0
+        self.offset = 0
+        self.messages = []
+        self.translations = []
+        self.locations = []
+        self.flags = []
+        self.user_comments = []
+        self.auto_comments = []
+        self.obsolete = False
+        self.context = []
+        self.in_msgid = False
+        self.in_msgstr = False
+        self.in_msgctxt = False
+
+    def _add_message(self):
+        self.translations.sort()
+        if len(self.messages) > 1:
+            msgid = tuple([denormalize(m) for m in self.messages])
+        else:
+            msgid = denormalize(self.messages[0])
+        if isinstance(msgid, (list, tuple)):
+            string = []
+            for idx in range(self.catalog.num_plurals):
+                try:
+                    string.append(self.translations[idx])
+                except IndexError:
+                    string.append((idx, ''))
+            string = tuple([denormalize(t[1]) for t in string])
+        else:
+            string = denormalize(self.translations[0][1])
+        if self.context:
+            msgctxt = denormalize('\n'.join(self.context))
+        else:
+            msgctxt = None
+        message = Message(msgid, string, list(self.locations), set(self.flags),
+                          self.auto_comments, self.user_comments, lineno=self.offset + 1,
+                          context=msgctxt)
+        if self.obsolete:
+            if not self.ignore_obsolete:
+                self.catalog.obsolete[msgid] = message
+        else:
+            self.catalog[msgid] = message
+        del self.messages[:]
+        del self.translations[:]
+        del self.context[:]
+        del self.locations[:]
+        del self.flags[:]
+        del self.auto_comments[:]
+        del self.user_comments[:]
+        self.obsolete = False
+        self.counter += 1
+
+    def _process_message_line(self, lineno, line):
+        if line.startswith('msgid_plural'):
+            self.in_msgid = True
+            msg = line[12:].lstrip()
+            self.messages.append(msg)
+        elif line.startswith('msgid'):
+            self.in_msgid = True
+            self.offset = lineno
+            txt = line[5:].lstrip()
+            if self.messages:
+                self._add_message()
+            self.messages.append(txt)
+        elif line.startswith('msgstr'):
+            self.in_msgid = False
+            self.in_msgstr = True
+            msg = line[6:].lstrip()
+            if msg.startswith('['):
+                idx, msg = msg[1:].split(']', 1)
+                self.translations.append([int(idx), msg.lstrip()])
+            else:
+                self.translations.append([0, msg])
+        elif line.startswith('msgctxt'):
+            if self.messages:
+                self._add_message()
+            self.in_msgid = self.in_msgstr = False
+            self.context.append(line[7:].lstrip())
+        elif line.startswith('"'):
+            if self.in_msgid:
+                self.messages[-1] += u'\n' + line.rstrip()
+            elif self.in_msgstr:
+                self.translations[-1][1] += u'\n' + line.rstrip()
+            elif self.in_msgctxt:
+                self.context.append(line.rstrip())
+
+    def parse(self, fileobj):
+
+        for lineno, line in enumerate(fileobj.readlines()):
+            line = line.strip()
+            if not isinstance(line, text_type):
+                line = line.decode(self.catalog.charset)
+            if line.startswith('#'):
+                self.in_msgid = self.in_msgstr = False
+                if self.messages and self.translations:
+                    self._add_message()
+                if line[1:].startswith(':'):
+                    for location in line[2:].lstrip().split():
+                        pos = location.rfind(':')
+                        if pos >= 0:
+                            try:
+                                lineno = int(location[pos + 1:])
+                            except ValueError:
+                                continue
+                            self.locations.append((location[:pos], lineno))
+                        else:
+                            self.locations.append((location, None))
+                elif line[1:].startswith(','):
+                    for flag in line[2:].lstrip().split(','):
+                        self.flags.append(flag.strip())
+                elif line[1:].startswith('~'):
+                    self.obsolete = True
+                    self._process_message_line(lineno, line[2:].lstrip())
+                elif line[1:].startswith('.'):
+                    # These are called auto-comments
+                    comment = line[2:].strip()
+                    if comment:  # Just check that we're not adding empty comments
+                        self.auto_comments.append(comment)
+                else:
+                    # These are called user comments
+                    self.user_comments.append(line[1:].strip())
+            else:
+                self._process_message_line(lineno, line)
+
+        if self.messages:
+            self._add_message()
+
+        # No actual messages found, but there was some info in comments, from which
+        # we'll construct an empty header message
+        elif not self.counter and (self.flags or self.user_comments or self.auto_comments):
+            self.messages.append(u'')
+            self.translations.append([0, u''])
+            self._add_message()
+
+
 def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=None):
     """Read messages from a ``gettext`` PO (portable object) file from the given
     file-like object and return a `Catalog`.
@@ -119,141 +259,9 @@ def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=No
     :param ignore_obsolete: whether to ignore obsolete messages in the input
     :param charset: the character set of the catalog.
     """
-    catalog = Catalog(locale=locale, domain=domain, charset=charset)
-
-    counter = [0]
-    offset = [0]
-    messages = []
-    translations = []
-    locations = []
-    flags = []
-    user_comments = []
-    auto_comments = []
-    obsolete = [False]
-    context = []
-    in_msgid = [False]
-    in_msgstr = [False]
-    in_msgctxt = [False]
-
-    def _add_message():
-        translations.sort()
-        if len(messages) > 1:
-            msgid = tuple([denormalize(m) for m in messages])
-        else:
-            msgid = denormalize(messages[0])
-        if isinstance(msgid, (list, tuple)):
-            string = []
-            for idx in range(catalog.num_plurals):
-                try:
-                    string.append(translations[idx])
-                except IndexError:
-                    string.append((idx, ''))
-            string = tuple([denormalize(t[1]) for t in string])
-        else:
-            string = denormalize(translations[0][1])
-        if context:
-            msgctxt = denormalize('\n'.join(context))
-        else:
-            msgctxt = None
-        message = Message(msgid, string, list(locations), set(flags),
-                          auto_comments, user_comments, lineno=offset[0] + 1,
-                          context=msgctxt)
-        if obsolete[0]:
-            if not ignore_obsolete:
-                catalog.obsolete[msgid] = message
-        else:
-            catalog[msgid] = message
-        del messages[:]
-        del translations[:]
-        del context[:]
-        del locations[:]
-        del flags[:]
-        del auto_comments[:]
-        del user_comments[:]
-        obsolete[0] = False
-        counter[0] += 1
-
-    def _process_message_line(lineno, line):
-        if line.startswith('msgid_plural'):
-            in_msgid[0] = True
-            msg = line[12:].lstrip()
-            messages.append(msg)
-        elif line.startswith('msgid'):
-            in_msgid[0] = True
-            offset[0] = lineno
-            txt = line[5:].lstrip()
-            if messages:
-                _add_message()
-            messages.append(txt)
-        elif line.startswith('msgstr'):
-            in_msgid[0] = False
-            in_msgstr[0] = True
-            msg = line[6:].lstrip()
-            if msg.startswith('['):
-                idx, msg = msg[1:].split(']', 1)
-                translations.append([int(idx), msg.lstrip()])
-            else:
-                translations.append([0, msg])
-        elif line.startswith('msgctxt'):
-            if messages:
-                _add_message()
-            in_msgid[0] = in_msgstr[0] = False
-            context.append(line[7:].lstrip())
-        elif line.startswith('"'):
-            if in_msgid[0]:
-                messages[-1] += u'\n' + line.rstrip()
-            elif in_msgstr[0]:
-                translations[-1][1] += u'\n' + line.rstrip()
-            elif in_msgctxt[0]:
-                context.append(line.rstrip())
-
-    for lineno, line in enumerate(fileobj.readlines()):
-        line = line.strip()
-        if not isinstance(line, text_type):
-            line = line.decode(catalog.charset)
-        if line.startswith('#'):
-            in_msgid[0] = in_msgstr[0] = False
-            if messages and translations:
-                _add_message()
-            if line[1:].startswith(':'):
-                for location in line[2:].lstrip().split():
-                    pos = location.rfind(':')
-                    if pos >= 0:
-                        try:
-                            lineno = int(location[pos + 1:])
-                        except ValueError:
-                            continue
-                        locations.append((location[:pos], lineno))
-                    else:
-                        locations.append((location, None))
-            elif line[1:].startswith(','):
-                for flag in line[2:].lstrip().split(','):
-                    flags.append(flag.strip())
-            elif line[1:].startswith('~'):
-                obsolete[0] = True
-                _process_message_line(lineno, line[2:].lstrip())
-            elif line[1:].startswith('.'):
-                # These are called auto-comments
-                comment = line[2:].strip()
-                if comment:  # Just check that we're not adding empty comments
-                    auto_comments.append(comment)
-            else:
-                # These are called user comments
-                user_comments.append(line[1:].strip())
-        else:
-            _process_message_line(lineno, line)
-
-    if messages:
-        _add_message()
-
-    # No actual messages found, but there was some info in comments, from which
-    # we'll construct an empty header message
-    elif not counter[0] and (flags or user_comments or auto_comments):
-        messages.append(u'')
-        translations.append([0, u''])
-        _add_message()
-
-    return catalog
+    parser = _PoFileParser(locale, domain, ignore_obsolete, charset)
+    parser.parse(fileobj)
+    return parser.catalog
 
 
 WORD_SEP = re.compile('('

From 832e58ab0c564aa50ff93b7680c12f524c5948bc Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@starleaf.com>
Date: Fri, 8 Jul 2016 14:33:12 +0100
Subject: [PATCH 296/489] read_po: Support multiline obsolete units

---
 babel/messages/pofile.py      | 55 +++++++++++++++++++----------------
 tests/messages/test_pofile.py | 42 ++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 194e96197..bb07b4bbd 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -164,6 +164,34 @@ def _process_message_line(self, lineno, line):
             elif self.in_msgctxt:
                 self.context.append(line.rstrip())
 
+    def _process_comment(self, line):
+
+        self.in_msgid = self.in_msgstr = False
+        if self.messages and self.translations:
+            self._add_message()
+        if line[1:].startswith(':'):
+            for location in line[2:].lstrip().split():
+                pos = location.rfind(':')
+                if pos >= 0:
+                    try:
+                        lineno = int(location[pos + 1:])
+                    except ValueError:
+                        continue
+                    self.locations.append((location[:pos], lineno))
+                else:
+                    self.locations.append((location, None))
+        elif line[1:].startswith(','):
+            for flag in line[2:].lstrip().split(','):
+                self.flags.append(flag.strip())
+        elif line[1:].startswith('.'):
+            # These are called auto-comments
+            comment = line[2:].strip()
+            if comment:  # Just check that we're not adding empty comments
+                self.auto_comments.append(comment)
+        else:
+            # These are called user comments
+            self.user_comments.append(line[1:].strip())
+
     def parse(self, fileobj):
 
         for lineno, line in enumerate(fileobj.readlines()):
@@ -171,34 +199,11 @@ def parse(self, fileobj):
             if not isinstance(line, text_type):
                 line = line.decode(self.catalog.charset)
             if line.startswith('#'):
-                self.in_msgid = self.in_msgstr = False
-                if self.messages and self.translations:
-                    self._add_message()
-                if line[1:].startswith(':'):
-                    for location in line[2:].lstrip().split():
-                        pos = location.rfind(':')
-                        if pos >= 0:
-                            try:
-                                lineno = int(location[pos + 1:])
-                            except ValueError:
-                                continue
-                            self.locations.append((location[:pos], lineno))
-                        else:
-                            self.locations.append((location, None))
-                elif line[1:].startswith(','):
-                    for flag in line[2:].lstrip().split(','):
-                        self.flags.append(flag.strip())
-                elif line[1:].startswith('~'):
+                if line[1:].startswith('~'):
                     self.obsolete = True
                     self._process_message_line(lineno, line[2:].lstrip())
-                elif line[1:].startswith('.'):
-                    # These are called auto-comments
-                    comment = line[2:].strip()
-                    if comment:  # Just check that we're not adding empty comments
-                        self.auto_comments.append(comment)
                 else:
-                    # These are called user comments
-                    self.user_comments.append(line[1:].strip())
+                    self._process_comment(line)
             else:
                 self._process_message_line(lineno, line)
 
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 1bac3603c..a271a8469 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -164,6 +164,48 @@ def test_obsolete_message_ignored(self):
         self.assertEqual(1, len(catalog))
         self.assertEqual(0, len(catalog.obsolete))
 
+    def test_multi_line_obsolete_message(self):
+        buf = StringIO(r'''# This is an obsolete message
+#~ msgid ""
+#~ "foo"
+#~ "foo"
+#~ msgstr ""
+#~ "Voh"
+#~ "Vooooh"
+
+# This message is not obsolete
+#: main.py:1
+msgid "bar"
+msgstr "Bahr"
+''')
+        catalog = pofile.read_po(buf)
+        self.assertEqual(1, len(catalog.obsolete))
+        message = catalog.obsolete[u'foofoo']
+        self.assertEqual(u'foofoo', message.id)
+        self.assertEqual(u'VohVooooh', message.string)
+        self.assertEqual(['This is an obsolete message'], message.user_comments)
+
+    def test_unit_following_multi_line_obsolete_message(self):
+        buf = StringIO(r'''# This is an obsolete message
+#~ msgid ""
+#~ "foo"
+#~ "fooooooo"
+#~ msgstr ""
+#~ "Voh"
+#~ "Vooooh"
+
+# This message is not obsolete
+#: main.py:1
+msgid "bar"
+msgstr "Bahr"
+''')
+        catalog = pofile.read_po(buf)
+        self.assertEqual(1, len(catalog))
+        message = catalog[u'bar']
+        self.assertEqual(u'bar', message.id)
+        self.assertEqual(u'Bahr', message.string)
+        self.assertEqual(['This message is not obsolete'], message.user_comments)
+
     def test_with_context(self):
         buf = BytesIO(b'''# Some string in the menu
 #: main.py:1

From 651f9bd6ecb46d27b381ecbfdae1a99d14fa48f0 Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@starleaf.com>
Date: Fri, 8 Jul 2016 16:24:09 +0100
Subject: [PATCH 297/489] Remove osx build from travis.

Something in pyenv appears broken
---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 978d377c0..08ac545df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,12 +33,6 @@ matrix:
       python: 3.4
     - os: linux
       python: 3.5
-    - os: osx
-      language: generic
-      env:
-      - PYTHON_VERSION=3.5.1
-      - PYENV_ROOT=~/.pyenv
-      - PATH=$PYENV_ROOT/shims:$PATH:$PYENV_ROOT/bin
 
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh

From 38a67790931ba3272fc395b8470e2d062d02961b Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@starleaf.com>
Date: Fri, 8 Jul 2016 18:08:48 +0100
Subject: [PATCH 298/489] Accept catalog argument to PoFileParser

Also make it not private and document it a bit.
---
 babel/messages/pofile.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index bb07b4bbd..f3ba2fa30 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -73,11 +73,16 @@ def denormalize(string):
         return unescape(string)
 
 
-class _PoFileParser(object):
+class PoFileParser(object):
+    """Support class to  read messages from a ``gettext`` PO (portable object) file
+    and add them to a `Catalog`
 
-    def __init__(self, locale=None, domain=None, ignore_obsolete=False, charset=None):
+    See `read_po` for simple cases.
+    """
+
+    def __init__(self, catalog, ignore_obsolete=False):
+        self.catalog = catalog
         self.ignore_obsolete = ignore_obsolete
-        self.catalog = Catalog(locale=locale, domain=domain, charset=charset)
         self.counter = 0
         self.offset = 0
         self.messages = []
@@ -93,6 +98,10 @@ def __init__(self, locale=None, domain=None, ignore_obsolete=False, charset=None
         self.in_msgctxt = False
 
     def _add_message(self):
+        """
+        Add a message to the catalog based on the current parser state and
+        clear the state ready to process the next message.
+        """
         self.translations.sort()
         if len(self.messages) > 1:
             msgid = tuple([denormalize(m) for m in self.messages])
@@ -193,6 +202,10 @@ def _process_comment(self, line):
             self.user_comments.append(line[1:].strip())
 
     def parse(self, fileobj):
+        """
+        Reads from the file-like object `fileobj` and adds any po file
+        units found in it to the `Catalog` supplied to the constructor.
+        """
 
         for lineno, line in enumerate(fileobj.readlines()):
             line = line.strip()
@@ -264,9 +277,10 @@ def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=No
     :param ignore_obsolete: whether to ignore obsolete messages in the input
     :param charset: the character set of the catalog.
     """
-    parser = _PoFileParser(locale, domain, ignore_obsolete, charset)
+    catalog = Catalog(locale=locale, domain=domain, charset=charset)
+    parser = PoFileParser(catalog, ignore_obsolete)
     parser.parse(fileobj)
-    return parser.catalog
+    return catalog
 
 
 WORD_SEP = re.compile('('

From 60d13b090a3a6a6989e520e08bcf86fb70073c72 Mon Sep 17 00:00:00 2001
From: Heungsub Lee <sub@subl.ee>
Date: Fri, 1 Jul 2016 19:50:34 +0900
Subject: [PATCH 299/489] Fix #426

Parse compiler flags based on __future__ imports in Python codes.
Evaluate a string literal with the parsed compiler flags.
---
 babel/messages/extract.py      |  8 +++++---
 babel/util.py                  | 23 +++++++++++++++++++++++
 tests/messages/test_extract.py | 10 ++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 4dc56a454..db1784896 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -22,7 +22,7 @@
 import sys
 from tokenize import generate_tokens, COMMENT, NAME, OP, STRING
 
-from babel.util import parse_encoding, pathmatch
+from babel.util import parse_encoding, parse_future_flags, pathmatch
 from babel._compat import PY2, text_type
 from textwrap import dedent
 
@@ -399,6 +399,7 @@ def extract_python(fileobj, keywords, comment_tags, options):
     comment_tag = None
 
     encoding = parse_encoding(fileobj) or options.get('encoding', 'UTF-8')
+    future_flags = parse_future_flags(fileobj, encoding)
 
     if PY2:
         next_line = fileobj.readline
@@ -470,8 +471,9 @@ def extract_python(fileobj, keywords, comment_tags, options):
                 # encoding
                 # https://sourceforge.net/tracker/?func=detail&atid=355470&
                 # aid=617979&group_id=5470
-                value = eval('# coding=%s\n%s' % (str(encoding), value),
-                             {'__builtins__': {}}, {})
+                code = compile('# coding=%s\n%s' % (str(encoding), value),
+                               '<string>', 'eval', future_flags)
+                value = eval(code, {'__builtins__': {}}, {})
                 if PY2 and not isinstance(value, text_type):
                     value = value.decode(encoding)
                 buf.append(value)
diff --git a/babel/util.py b/babel/util.py
index aeb9a5fab..996f902b2 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -95,6 +95,29 @@ def parse_encoding(fp):
         fp.seek(pos)
 
 
+PYTHON_FUTURE_IMPORT_re = re.compile(
+    r'from\s+__future__\s+import\s+\(*(.+)\)*')
+
+
+def parse_future_flags(fp, encoding='latin-1'):
+    """Parse the compiler flags by :mod:`__future__` from the given Python
+    code.
+    """
+    import __future__
+    pos = fp.tell()
+    fp.seek(0)
+    flags = 0
+    try:
+        body = fp.read().decode(encoding)
+        for m in PYTHON_FUTURE_IMPORT_re.finditer(body):
+            names = [x.strip() for x in m.group(1).split(',')]
+            for name in names:
+                flags |= getattr(__future__, name).compiler_flag
+    finally:
+        fp.seek(pos)
+    return flags
+
+
 def pathmatch(pattern, filename):
     """Extended pathname pattern matching.
 
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 9d78d923b..22ea1cd6c 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -498,3 +498,13 @@ def arbitrary_extractor(fileobj, keywords, comment_tags, options):
             return [(1, None, (), ())]
         for x in extract.extract(arbitrary_extractor, BytesIO(b"")):
             assert x[0] == 1
+
+    def test_future(self):
+        buf = BytesIO(br"""
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+nbsp = _('\xa0')
+""")
+        messages = list(extract.extract('python', buf,
+                                        extract.DEFAULT_KEYWORDS, [], {}))
+        assert messages[0][1] == u'\xa0'

From 38556ee3dfb23d22604ec726fef5e9bf1e58973a Mon Sep 17 00:00:00 2001
From: Max Shenfield <shenfieldmax@gmail.com>
Date: Mon, 11 Jul 2016 10:17:15 -0500
Subject: [PATCH 300/489] Updated plurals.py to match Mozilla and CLDR
 references
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit updates the plural rules, and in some cases the plural
number, for languages based on review of
https://developer.mozilla.org/en-US/docs/Mozilla/Localization/Localization_and_Plurals,
and
http://www.unicode.org/cldr/charts/29/supplemental/language_plural_rules.html.

I changed the interface (either the number of plurals, or the meaning
of each index), for the following languages:
• Arabic (ar): numplurals same, semantics differ per Mozilla's "Plural rule #12". 3 has been made more accurate, 4 has been switched with 5, and the meaning of both has been refined to match the rule.
• Belarusian (ar): numplurals updated to 3, using Mozilla's "Plural
rule #7". Previously the default, where anything except one is plural.
• Breton (br): numplurals updated to 6, using Mozilla's "Plural rule
• Bosnian (bs): numplurals updated to 3, using Mozilla's "Plural rule
• Irish Gaelic (ga): numplurals update from 3 to 5, using Mozilla's
"Plural rule #11". Cases have been added for n between 3 and 6, and n
between 7 and 10.
• Icelandic (is): same numplurals (2), semantics updated using
Mozilla's "Plural rule #15". 0 now means that n ends in 1, and is not
11, instead of just the number 1.
• Maltese (mt): same numplurals, same rule. Fixed rule, index 1 now
includes numbers ending in 1 (except the number 1)

I'm ignoring these two rules listed on the Mozilla resource
• Hungarian - listed as `(n != 1)`. It is not required to pluralize a
noun if a qualitative or quantitative amount precedes it
http://www.hungarianreference.com/plurals.aspx.
• Vietnamese - listed as `(n != 1)`. It only seems to have one plural
according to this lesson:
http://yourvietnamese.com/vietnamese-grammar/nouns-in-vietnamese/.

There are some additional languages listed in the Mozilla reference
that are not in the plurals document, and could be added:
• Lower Sorbian (dsb) (4, '(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 ||
n%100==4 ? 2 : 3)')
• Upper Sorbian (hsb) (4, '(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 ||
n%100==4 ? 2 : 3)')
• Scottish Gaelic (gd)  (4, '(n==1 || n==11 ? 0 : n==2 || n==12 ? 1 :
(n>=3 && n<=10) || (n>=13 && n<=19) ? 2 : 3)')
• Faroese (fo) (2, '(n != 1)')
• Frisian (fy) (2, '(n != 1)')
• Macedonian (mk) (3, '(n%10==1 ? 0 : n%10==2 ? 1 : 2)')

Closes https://github.com/python-babel/babel/issues/430
---
 babel/messages/catalog.py      |  4 ++--
 babel/messages/plurals.py      | 21 +++++++++++++--------
 tests/messages/test_catalog.py |  4 ++--
 tests/messages/test_plurals.py |  4 ++--
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 84cee432f..9a474a845 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -479,7 +479,7 @@ def num_plurals(self):
         >>> Catalog(locale='en').num_plurals
         2
         >>> Catalog(locale='ga').num_plurals
-        3
+        5
 
         :type: `int`"""
         if self._num_plurals is None:
@@ -496,7 +496,7 @@ def plural_expr(self):
         >>> Catalog(locale='en').plural_expr
         '(n != 1)'
         >>> Catalog(locale='ga').plural_expr
-        '(n==1 ? 0 : n==2 ? 1 : 2)'
+        '(n==1 ? 0 : n==2 ? 1 : n>=3 && n<=6 ? 2 : n>=7 && n<=10 ? 3 : 4)'
 
         :type: `string_types`"""
         if self._plural_expr is None:
diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
index 38c04ca44..92cefa79a 100644
--- a/babel/messages/plurals.py
+++ b/babel/messages/plurals.py
@@ -35,7 +35,7 @@
     # Aragonese
     # 'an': (),
     # Arabic - From Pootle's PO's
-    'ar': (6, '(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5)'),
+    'ar': (6, '(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=0 && n%100<=2 ? 4 : 5)'),
     # Assamese
     # 'as': (),
     # Avaric
@@ -47,7 +47,7 @@
     # Bashkir
     # 'ba': (),
     # Belarusian
-    # 'be': (),
+    'be': (3, '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)'),
     # Bulgarian - From Pootle's PO's
     'bg': (2, '(n != 1)'),
     # Bihari
@@ -61,9 +61,14 @@
     # Tibetan - as discussed in private with Andrew West
     'bo': (1, '0'),
     # Breton
-    # 'br': (),
+    'br': (
+        6,
+        '(n==1 ? 0 : n%10==1 && n%100!=11 && n%100!=71 && n%100!=91 ? 1 : n%10==2 && n%100!=12 && n%100!=72 && '
+        'n%100!=92 ? 2 : (n%10==3 || n%10==4 || n%10==9) && n%100!=13 && n%100!=14 && n%100!=19 && n%100!=73 && '
+        'n%100!=74 && n%100!=79 && n%100!=93 && n%100!=94 && n%100!=99 ? 3 : n%1000000==0 ? 4 : 5)'
+    ),
     # Bosnian
-    # 'bs': (),
+    'bs': (3, '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)'),
     # Catalan - From Pootle's PO's
     'ca': (2, '(n != 1)'),
     # Chechen
@@ -111,7 +116,7 @@
     # Friulian - From Pootle's PO's
     'fur': (2, '(n > 1)'),
     # Irish
-    'ga': (3, '(n==1 ? 0 : n==2 ? 1 : 2)'),
+    'ga': (5, '(n==1 ? 0 : n==2 ? 1 : n>=3 && n<=6 ? 2 : n>=7 && n<=10 ? 3 : 4)'),
     # Galician - From Pootle's PO's
     'gl': (2, '(n != 1)'),
     # Hausa - From Pootle's PO's
@@ -127,7 +132,7 @@
     # Armenian - From Pootle's PO's
     'hy': (1, '0'),
     # Icelandic - From Pootle's PO's
-    'is': (2, '(n != 1)'),
+    'is': (2, '(n%10==1 && n%100!=11 ? 0 : 1)'),
     # Italian
     'it': (2, '(n != 1)'),
     # Japanese
@@ -149,7 +154,7 @@
     # Latvian
     'lv': (3, '(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)'),
     # Maltese - From Pootle's PO's
-    'mt': (4, '(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3)'),
+    'mt': (4, '(n==1 ? 0 : n==0 || ( n%100=>1 && n%100<=10) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3)'),
     # Norwegian Bokmål
     'nb': (2, '(n != 1)'),
     # Dutch
@@ -223,7 +228,7 @@ def get_plural(locale=LC_CTYPE):
     >>> get_plural(locale='en')
     (2, '(n != 1)')
     >>> get_plural(locale='ga')
-    (3, '(n==1 ? 0 : n==2 ? 1 : 2)')
+    (5, '(n==1 ? 0 : n==2 ? 1 : n>=3 && n<=6 ? 2 : n>=7 && n<=10 ? 3 : 4)')
 
     The object returned is a special tuple with additional members:
 
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index f16a4dcb7..a6b9f512e 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -395,13 +395,13 @@ def test_catalog_mime_headers_set_locale():
 
 def test_catalog_num_plurals():
     assert catalog.Catalog(locale='en').num_plurals == 2
-    assert catalog.Catalog(locale='ga').num_plurals == 3
+    assert catalog.Catalog(locale='ga').num_plurals == 5
 
 
 def test_catalog_plural_expr():
     assert catalog.Catalog(locale='en').plural_expr == '(n != 1)'
     assert (catalog.Catalog(locale='ga').plural_expr
-            == '(n==1 ? 0 : n==2 ? 1 : 2)')
+            == '(n==1 ? 0 : n==2 ? 1 : n>=3 && n<=6 ? 2 : n>=7 && n<=10 ? 3 : 4)')
 
 
 def test_catalog_plural_forms():
diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py
index 1a50139f4..2e7553c16 100644
--- a/tests/messages/test_plurals.py
+++ b/tests/messages/test_plurals.py
@@ -30,7 +30,7 @@ def test_get_plural_selection(locale, num_plurals, plural_expr):
 
 
 def test_get_plural_accpets_strings():
-    assert plurals.get_plural(locale='ga') == (3, '(n==1 ? 0 : n==2 ? 1 : 2)')
+    assert plurals.get_plural(locale='ga') == (5, '(n==1 ? 0 : n==2 ? 1 : n>=3 && n<=6 ? 2 : n>=7 && n<=10 ? 3 : 4)')
 
 
 def test_get_plural_falls_back_to_default():
@@ -40,7 +40,7 @@ def test_get_plural_falls_back_to_default():
 def test_get_plural():
     # See https://localization-guide.readthedocs.io/en/latest/l10n/pluralforms.html for more details.
     assert plurals.get_plural(locale='en') == (2, '(n != 1)')
-    assert plurals.get_plural(locale='ga') == (3, '(n==1 ? 0 : n==2 ? 1 : 2)')
+    assert plurals.get_plural(locale='ga') == (5, '(n==1 ? 0 : n==2 ? 1 : n>=3 && n<=6 ? 2 : n>=7 && n<=10 ? 3 : 4)')
 
     plural_ja = plurals.get_plural("ja")
     assert str(plural_ja) == 'nplurals=1; plural=0;'

From bece010dd32fbb5f4bbcd6a667800bdab662ddf6 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 15 Jul 2016 14:13:09 +0300
Subject: [PATCH 301/489] Properly fall back to `long` metazone names when
 short forms are no-inherit

Thanks to @stringtheory for the bug report!

Fixes #428
---
 babel/dates.py      | 19 +++++++++++++++++--
 tests/test_dates.py | 22 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 523e4562d..c84ca4865 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -30,6 +30,16 @@
 from babel._compat import string_types, integer_types, number_types
 
 
+# "If a given short metazone form is known NOT to be understood in a given
+#  locale and the parent locale has this value such that it would normally
+#  be inherited, the inheritance of this value can be explicitly disabled by
+#  use of the 'no inheritance marker' as the value, which is 3 simultaneous [sic]
+#  empty set characters ( U+2205 )."
+#  - http://www.unicode.org/reports/tr35/tr35-dates.html#Metazone_Names
+
+NO_INHERITANCE_MARKER = u'\u2205\u2205\u2205'
+
+
 LC_TIME = default_locale('LC_TIME')
 
 # Aliases for use in scopes where the modules are shadowed by local variables
@@ -642,8 +652,13 @@ def get_timezone_name(dt_or_tzinfo=None, width='long', uncommon=False,
     if metazone:
         metazone_info = locale.meta_zones.get(metazone, {})
         if width in metazone_info:
-            if zone_variant in metazone_info[width]:
-                return metazone_info[width][zone_variant]
+            name = metazone_info[width].get(zone_variant)
+            if width == 'short' and name == NO_INHERITANCE_MARKER:
+                # If the short form is marked no-inheritance,
+                # try to fall back to the long name instead.
+                name = metazone_info.get('long', {}).get(zone_variant)
+            if name:
+                return name
 
     # If we have a concrete datetime, we assume that the result can't be
     # independent of daylight savings time, so we return the GMT offset
diff --git a/tests/test_dates.py b/tests/test_dates.py
index b0d093ec2..f74cd396d 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -15,9 +15,12 @@
 from datetime import date, datetime, time, timedelta
 import unittest
 
+import pytest
+import pytz
 from pytz import timezone
 
 from babel import dates, Locale
+from babel.dates import NO_INHERITANCE_MARKER
 from babel.util import FixedOffsetTimezone
 
 
@@ -761,3 +764,22 @@ def utcnow(cls):
     # Freeze time! Well, some of it anyway.
     monkeypatch.setattr(datetime_module, "datetime", frozen_datetime)
     assert dates.format_datetime(locale="en_US") == dates.format_datetime(frozen_instant, locale="en_US")
+
+
+@pytest.mark.all_locales
+def test_no_inherit_metazone_marker_never_in_output(locale):
+    # See: https://github.com/python-babel/babel/issues/428
+    tz = pytz.timezone('America/Los_Angeles')
+    t = tz.localize(datetime(2016, 1, 6, 7))
+    assert NO_INHERITANCE_MARKER not in dates.format_time(t, format='long', locale=locale)
+    assert NO_INHERITANCE_MARKER not in dates.get_timezone_name(t, width='short', locale=locale)
+
+
+def test_no_inherit_metazone_formatting():
+    # See: https://github.com/python-babel/babel/issues/428
+    tz = pytz.timezone('America/Los_Angeles')
+    t = tz.localize(datetime(2016, 1, 6, 7))
+    assert dates.format_time(t, format='long', locale='en_US') == "7:00:00 AM PST"
+    assert dates.format_time(t, format='long', locale='en_GB') == "07:00:00 Pacific Standard Time"
+    assert dates.get_timezone_name(t, width='short', locale='en_US') == "PST"
+    assert dates.get_timezone_name(t, width='short', locale='en_GB') == "Pacific Standard Time"

From f516d404ad22c5c598fef1d47510c47a3926c74f Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 15 Jul 2016 15:23:51 +0300
Subject: [PATCH 302/489] Straighten up lying extraction docstrings

Fixes #403
---
 babel/messages/extract.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index db1784896..030c3f588 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -167,6 +167,8 @@ def check_and_call_extract_file(filepath, method_map, options_map,
     So, given an absolute path to a file `filepath`, we want to check using
     just the relative path from `dirpath` to `filepath`.
 
+    Yields 5-tuples (filename, lineno, messages, comments, context).
+
     :param filepath: An absolute path to a file that exists.
     :param method_map: a list of ``(pattern, method)`` tuples that maps of
                        extraction method names to extended glob patterns
@@ -185,6 +187,8 @@ def check_and_call_extract_file(filepath, method_map, options_map,
     :param strip_comment_tags: a flag that if set to `True` causes all comment
                                tags to be removed from the collected comments.
     :param dirpath: the path to the directory to extract messages from.
+    :return: iterable of 5-tuples (filename, lineno, messages, comments, context)
+    :rtype: Iterable[tuple[str, int, str|tuple[str], list[str], str|None]
     """
     # filename is the relative path from dirpath to the actual file
     filename = relpath(filepath, dirpath)
@@ -215,8 +219,7 @@ def extract_from_file(method, filename, keywords=DEFAULT_KEYWORDS,
                       comment_tags=(), options=None, strip_comment_tags=False):
     """Extract messages from a specific file.
 
-    This function returns a list of tuples of the form ``(lineno, funcname,
-    message)``.
+    This function returns a list of tuples of the form ``(lineno, message, comments, context)``.
 
     :param filename: the path to the file to extract messages from
     :param method: a string specifying the extraction method (.e.g. "python")
@@ -229,6 +232,8 @@ def extract_from_file(method, filename, keywords=DEFAULT_KEYWORDS,
     :param strip_comment_tags: a flag that if set to `True` causes all comment
                                tags to be removed from the collected comments.
     :param options: a dictionary of additional options (optional)
+    :returns: list of tuples of the form ``(lineno, message, comments, context)``
+    :rtype: list[tuple[int, str|tuple[str], list[str], str|None]
     """
     fileobj = open(filename, 'rb')
     try:
@@ -243,7 +248,7 @@ def extract(method, fileobj, keywords=DEFAULT_KEYWORDS, comment_tags=(),
     """Extract messages from the given file-like object using the specified
     extraction method.
 
-    This function returns tuples of the form ``(lineno, message, comments)``.
+    This function returns tuples of the form ``(lineno, message, comments, context)``.
 
     The implementation dispatches the actual extraction to plugins, based on the
     value of the ``method`` parameter.
@@ -276,6 +281,8 @@ def extract(method, fileobj, keywords=DEFAULT_KEYWORDS, comment_tags=(),
     :param strip_comment_tags: a flag that if set to `True` causes all comment
                                tags to be removed from the collected comments.
     :raise ValueError: if the extraction method is not registered
+    :returns: iterable of tuples of the form ``(lineno, message, comments, context)``
+    :rtype: Iterable[tuple[int, str|tuple[str], list[str], str|None]
     """
     func = None
     if callable(method):

From 913886f880a508dbe619ad2ec14d2bcd5ca74977 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 15 Jul 2016 15:11:06 +0300
Subject: [PATCH 303/489] Fix float conversion in `extract_operands` (and the
 relevant test)

Fixes #421
---
 babel/plural.py      | 37 ++++++++++++++++++++++++++++++-------
 tests/test_plural.py | 24 +++++++++++++++---------
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/babel/plural.py b/babel/plural.py
index 0b8e425d5..99e9a6506 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -9,7 +9,6 @@
     :license: BSD, see LICENSE for more details.
 """
 import re
-import sys
 
 from babel._compat import decimal
 
@@ -19,10 +18,27 @@
 
 
 def extract_operands(source):
-    """Extract operands from a decimal, a float or an int, according to
-    `CLDR rules`_.
+    """Extract operands from a decimal, a float or an int, according to `CLDR rules`_.
+
+    The result is a 6-tuple (n, i, v, w, f, t), where those symbols are as follows:
+
+    ====== ===============================================================
+    Symbol Value
+    ------ ---------------------------------------------------------------
+    n      absolute value of the source number (integer and decimals).
+    i      integer digits of n.
+    v      number of visible fraction digits in n, with trailing zeros.
+    w      number of visible fraction digits in n, without trailing zeros.
+    f      visible fractional digits in n, with trailing zeros.
+    t      visible fractional digits in n, without trailing zeros.
+    ====== ===============================================================
 
     .. _`CLDR rules`: http://www.unicode.org/reports/tr35/tr35-33/tr35-numbers.html#Operands
+
+    :param source: A real number
+    :type source: int|float|decimal.Decimal
+    :return: A n-i-v-w-f-t tuple
+    :rtype: tuple[decimal.Decimal, int, int, int, int, int]
     """
     n = abs(source)
     i = int(n)
@@ -30,10 +46,17 @@ def extract_operands(source):
         if i == n:
             n = i
         else:
-            # 2.6's Decimal cannot convert from float directly
-            if sys.version_info < (2, 7):
-                n = str(n)
-            n = decimal.Decimal(n)
+            # Cast the `float` to a number via the string representation.
+            # This is required for Python 2.6 anyway (it will straight out fail to
+            # do the conversion otherwise), and it's highly unlikely that the user
+            # actually wants the lossless conversion behavior (quoting the Python
+            # documentation):
+            # > If value is a float, the binary floating point value is losslessly
+            # > converted to its exact decimal equivalent.
+            # > This conversion can often require 53 or more digits of precision.
+            # Should the user want that behavior, they can simply pass in a pre-
+            # converted `Decimal` instance of desired accuracy.
+            n = decimal.Decimal(str(n))
 
     if isinstance(n, decimal.Decimal):
         dec_tuple = n.as_tuple()
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 6406af872..be7414994 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -16,6 +16,8 @@
 from babel import plural, localedata
 from babel._compat import decimal
 
+EPSILON = decimal.Decimal("0.0001")
+
 
 def test_plural_rule():
     rule = plural.PluralRule({'one': 'n is 1'})
@@ -240,12 +242,12 @@ def test_or_and(self):
 
 EXTRACT_OPERANDS_TESTS = (
     (1, 1, 1, 0, 0, 0, 0),
-    ('1.0', '1.0', 1, 1, 0, 0, 0),
-    ('1.00', '1.00', 1, 2, 0, 0, 0),
-    ('1.3', '1.3', 1, 1, 1, 3, 3),
-    ('1.30', '1.30', 1, 2, 1, 30, 3),
-    ('1.03', '1.03', 1, 2, 2, 3, 3),
-    ('1.230', '1.230', 1, 3, 2, 230, 23),
+    (decimal.Decimal('1.0'), '1.0', 1, 1, 0, 0, 0),
+    (decimal.Decimal('1.00'), '1.00', 1, 2, 0, 0, 0),
+    (decimal.Decimal('1.3'), '1.3', 1, 1, 1, 3, 3),
+    (decimal.Decimal('1.30'), '1.30', 1, 2, 1, 30, 3),
+    (decimal.Decimal('1.03'), '1.03', 1, 2, 2, 3, 3),
+    (decimal.Decimal('1.230'), '1.230', 1, 3, 2, 230, 23),
     (-1, 1, 1, 0, 0, 0, 0),
     (1.3, '1.3', 1, 1, 1, 3, 3),
 )
@@ -253,9 +255,13 @@ def test_or_and(self):
 
 @pytest.mark.parametrize('source,n,i,v,w,f,t', EXTRACT_OPERANDS_TESTS)
 def test_extract_operands(source, n, i, v, w, f, t):
-    source = decimal.Decimal(source) if isinstance(source, str) else source
-    assert (plural.extract_operands(source) ==
-            decimal.Decimal(n), i, v, w, f, t)
+    e_n, e_i, e_v, e_w, e_f, e_t = plural.extract_operands(source)
+    assert abs(e_n - decimal.Decimal(n)) <= EPSILON  # float-decimal conversion inaccuracy
+    assert e_i == i
+    assert e_v == v
+    assert e_w == w
+    assert e_f == f
+    assert e_t == t
 
 
 @pytest.mark.parametrize('locale', ('ru', 'pl'))

From c82a43a662d437df66a93b536c8f89abdcd4626f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 26 Jul 2016 23:23:56 +0300
Subject: [PATCH 304/489] Use assertEqual instead of deprecated assertEquals

---
 tests/messages/test_catalog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index a6b9f512e..2d2880c38 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -62,7 +62,7 @@ class CatalogTestCase(unittest.TestCase):
     def test_add_returns_message_instance(self):
         cat = catalog.Catalog()
         message = cat.add('foo')
-        self.assertEquals('foo', message.id)
+        self.assertEqual('foo', message.id)
 
     def test_two_messages_with_same_singular(self):
         cat = catalog.Catalog()

From 14bcfc4b48f99bfe7e1bb92d69a1ee5dad81c4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 26 Jul 2016 23:24:19 +0300
Subject: [PATCH 305/489] Let logging format messages on demand

---
 babel/messages/frontend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index d99101334..89a7b54ab 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -460,7 +460,7 @@ def callback(filename, method, options):
                     catalog.add(message, None, [(filepath, lineno)],
                                 auto_comments=comments, context=context)
 
-            self.log.info('writing PO template file to %s' % self.output_file)
+            self.log.info('writing PO template file to %s', self.output_file)
             write_po(outfile, catalog, width=self.width,
                      no_location=self.no_location,
                      omit_header=self.omit_header,

From 0127312630b31a00e3989c54d7e8188e1caa1c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 26 Jul 2016 23:28:10 +0300
Subject: [PATCH 306/489] Avoid reading files entirely into memory

---
 babel/localtime/_unix.py | 28 +++++++++++++---------------
 babel/messages/pofile.py |  2 +-
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/babel/localtime/_unix.py b/babel/localtime/_unix.py
index 378a90b43..91f03bc99 100644
--- a/babel/localtime/_unix.py
+++ b/babel/localtime/_unix.py
@@ -109,21 +109,19 @@ def _get_localzone(_root='/'):
         if not os.path.exists(tzpath):
             continue
         with open(tzpath, 'rt') as tzfile:
-            data = tzfile.readlines()
-
-        for line in data:
-            # Look for the ZONE= setting.
-            match = zone_re.match(line)
-            if match is None:
-                # No ZONE= setting. Look for the TIMEZONE= setting.
-                match = timezone_re.match(line)
-            if match is not None:
-                # Some setting existed
-                line = line[match.end():]
-                etctz = line[:end_re.search(line).start()]
-
-                # We found a timezone
-                return pytz.timezone(etctz.replace(' ', '_'))
+            for line in tzfile:
+                # Look for the ZONE= setting.
+                match = zone_re.match(line)
+                if match is None:
+                    # No ZONE= setting. Look for the TIMEZONE= setting.
+                    match = timezone_re.match(line)
+                if match is not None:
+                    # Some setting existed
+                    line = line[match.end():]
+                    etctz = line[:end_re.search(line).start()]
+
+                    # We found a timezone
+                    return pytz.timezone(etctz.replace(' ', '_'))
 
     # No explicit setting existed. Use localtime
     for filename in ('etc/localtime', 'usr/local/etc/localtime'):
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index f3ba2fa30..e431fcd7f 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -207,7 +207,7 @@ def parse(self, fileobj):
         units found in it to the `Catalog` supplied to the constructor.
         """
 
-        for lineno, line in enumerate(fileobj.readlines()):
+        for lineno, line in enumerate(fileobj):
             line = line.strip()
             if not isinstance(line, text_type):
                 line = line.decode(self.catalog.charset)

From 888f65545a2fa0841d7592f44463b09a7a28f6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 26 Jul 2016 23:30:06 +0300
Subject: [PATCH 307/489] Close files earlier

---
 babel/localedata.py        | 2 +-
 babel/messages/frontend.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel/localedata.py b/babel/localedata.py
index 9c6f9f2b9..87981fe2a 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -112,9 +112,9 @@ def load(name, merge_inherited=True):
                     merge(data, pickle.load(fileobj))
                 else:
                     data = pickle.load(fileobj)
-                _cache[name] = data
             finally:
                 fileobj.close()
+            _cache[name] = data
         return data
     finally:
         _cache_lock.release()
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 89a7b54ab..a4e9c2e57 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -474,10 +474,10 @@ def _get_mappings(self):
             fileobj = open(self.mapping_file, 'U')
             try:
                 method_map, options_map = parse_mapping(fileobj)
-                for path in self.input_paths:
-                    mappings.append((path, method_map, options_map))
             finally:
                 fileobj.close()
+            for path in self.input_paths:
+                mappings.append((path, method_map, options_map))
 
         elif getattr(self.distribution, 'message_extractors', None):
             message_extractors = self.distribution.message_extractors

From 2b37db836f0a7bc253fd2e4a8dd5437aa6dee44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 26 Jul 2016 23:31:43 +0300
Subject: [PATCH 308/489] Handle file open/close with "with"

---
 babel/core.py                   |  5 +----
 babel/localedata.py             |  5 +----
 babel/messages/extract.py       |  5 +----
 babel/messages/frontend.py      | 40 +++++++--------------------------
 scripts/download_import_cldr.py |  6 ++---
 scripts/dump_global.py          |  5 +----
 tests/messages/test_mofile.py   |  5 +----
 7 files changed, 16 insertions(+), 55 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index e6f432c28..0b7b4edd5 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -71,11 +71,8 @@ def get_global(key):
         filename = os.path.join(dirname, 'global.dat')
         if not os.path.isfile(filename):
             _raise_no_data_error()
-        fileobj = open(filename, 'rb')
-        try:
+        with open(filename, 'rb') as fileobj:
             _global_data = pickle.load(fileobj)
-        finally:
-            fileobj.close()
     return _global_data.get(key, {})
 
 
diff --git a/babel/localedata.py b/babel/localedata.py
index 87981fe2a..9e272a279 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -106,14 +106,11 @@ def load(name, merge_inherited=True):
                         parent = '_'.join(parts[:-1])
                 data = load(parent).copy()
             filename = os.path.join(_dirname, '%s.dat' % name)
-            fileobj = open(filename, 'rb')
-            try:
+            with open(filename, 'rb') as fileobj:
                 if name != 'root' and merge_inherited:
                     merge(data, pickle.load(fileobj))
                 else:
                     data = pickle.load(fileobj)
-            finally:
-                fileobj.close()
             _cache[name] = data
         return data
     finally:
diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index db1784896..1aade43f9 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -230,12 +230,9 @@ def extract_from_file(method, filename, keywords=DEFAULT_KEYWORDS,
                                tags to be removed from the collected comments.
     :param options: a dictionary of additional options (optional)
     """
-    fileobj = open(filename, 'rb')
-    try:
+    with open(filename, 'rb') as fileobj:
         return list(extract(method, fileobj, keywords, comment_tags, options,
                             strip_comment_tags))
-    finally:
-        fileobj.close()
 
 
 def extract(method, fileobj, keywords=DEFAULT_KEYWORDS, comment_tags=(),
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index a4e9c2e57..5a1c7417f 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -213,11 +213,8 @@ def _run_domain(self, domain):
 
         for idx, (locale, po_file) in enumerate(po_files):
             mo_file = mo_files[idx]
-            infile = open(po_file, 'rb')
-            try:
+            with open(po_file, 'rb') as infile:
                 catalog = read_po(infile, locale)
-            finally:
-                infile.close()
 
             if self.statistics:
                 translated = 0
@@ -244,11 +241,8 @@ def _run_domain(self, domain):
 
             self.log.info('compiling catalog %s to %s', po_file, mo_file)
 
-            outfile = open(mo_file, 'wb')
-            try:
+            with open(mo_file, 'wb') as outfile:
                 write_mo(outfile, catalog, use_fuzzy=self.use_fuzzy)
-            finally:
-                outfile.close()
 
 
 class extract_messages(Command):
@@ -471,11 +465,8 @@ def _get_mappings(self):
         mappings = []
 
         if self.mapping_file:
-            fileobj = open(self.mapping_file, 'U')
-            try:
+            with open(self.mapping_file, 'U') as fileobj:
                 method_map, options_map = parse_mapping(fileobj)
-            finally:
-                fileobj.close()
             for path in self.input_paths:
                 mappings.append((path, method_map, options_map))
 
@@ -591,23 +582,17 @@ def run(self):
             'creating catalog %s based on %s', self.output_file, self.input_file
         )
 
-        infile = open(self.input_file, 'rb')
-        try:
+        with open(self.input_file, 'rb') as infile:
             # Although reading from the catalog template, read_po must be fed
             # the locale in order to correctly calculate plurals
             catalog = read_po(infile, locale=self.locale)
-        finally:
-            infile.close()
 
         catalog.locale = self._locale
         catalog.revision_date = datetime.now(LOCALTZ)
         catalog.fuzzy = False
 
-        outfile = open(self.output_file, 'wb')
-        try:
+        with open(self.output_file, 'wb') as outfile:
             write_po(outfile, catalog, width=self.width)
-        finally:
-            outfile.close()
 
 
 class update_catalog(Command):
@@ -709,22 +694,16 @@ def run(self):
         if not domain:
             domain = os.path.splitext(os.path.basename(self.input_file))[0]
 
-        infile = open(self.input_file, 'rb')
-        try:
+        with open(self.input_file, 'rb') as infile:
             template = read_po(infile)
-        finally:
-            infile.close()
 
         if not po_files:
             raise DistutilsOptionError('no message catalogs found')
 
         for locale, filename in po_files:
             self.log.info('updating catalog %s based on %s', filename, self.input_file)
-            infile = open(filename, 'rb')
-            try:
+            with open(filename, 'rb') as infile:
                 catalog = read_po(infile, locale=locale, domain=domain)
-            finally:
-                infile.close()
 
             catalog.update(
                 template, self.no_fuzzy_matching,
@@ -734,14 +713,11 @@ def run(self):
             tmpname = os.path.join(os.path.dirname(filename),
                                    tempfile.gettempprefix() +
                                    os.path.basename(filename))
-            tmpfile = open(tmpname, 'wb')
             try:
-                try:
+                with open(tmpname, 'wb') as tmpfile:
                     write_po(tmpfile, catalog,
                              ignore_obsolete=self.ignore_obsolete,
                              include_previous=self.previous, width=self.width)
-                finally:
-                    tmpfile.close()
             except:
                 os.remove(tmpname)
                 raise
diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index bfcab5f8b..4cc6a4b9b 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import contextlib
 import os
 import sys
 import shutil
@@ -90,9 +91,8 @@ def main():
             shutil.rmtree(common_path)
 
         log('Extracting CLDR to \'%s\'', cldr_path)
-        z = zipfile.ZipFile(zip_path)
-        z.extractall(cldr_path)
-        z.close()
+        with contextlib.closing(zipfile.ZipFile(zip_path)) as z:
+            z.extractall(cldr_path)
 
     subprocess.check_call([
         sys.executable,
diff --git a/scripts/dump_global.py b/scripts/dump_global.py
index ad6c15edd..2970bc2ba 100755
--- a/scripts/dump_global.py
+++ b/scripts/dump_global.py
@@ -21,11 +21,8 @@
 
 dirname = os.path.join(os.path.dirname(babel.__file__))
 filename = os.path.join(dirname, 'global.dat')
-fileobj = open(filename, 'rb')
-try:
+with open(filename, 'rb') as fileobj:
     data = pickle.load(fileobj)
-finally:
-    fileobj.close()
 
 if len(sys.argv) > 1:
     pprint(data.get(sys.argv[1]))
diff --git a/tests/messages/test_mofile.py b/tests/messages/test_mofile.py
index d257c5d73..5fedc600a 100644
--- a/tests/messages/test_mofile.py
+++ b/tests/messages/test_mofile.py
@@ -27,8 +27,7 @@ def setUp(self):
     def test_basics(self):
         mo_path = os.path.join(self.datadir, 'project', 'i18n', 'de',
                                'LC_MESSAGES', 'messages.mo')
-        mo_file = open(mo_path, 'rb')
-        try:
+        with open(mo_path, 'rb') as mo_file:
             catalog = mofile.read_mo(mo_file)
             self.assertEqual(2, len(catalog))
             self.assertEqual('TestProject', catalog.project)
@@ -36,8 +35,6 @@ def test_basics(self):
             self.assertEqual('Stange', catalog['bar'].string)
             self.assertEqual(['Fuhstange', 'Fuhstangen'],
                              catalog['foobar'].string)
-        finally:
-            mo_file.close()
 
 
 class WriteMoTestCase(unittest.TestCase):

From 8fe8312872898fe970f3117cf46c7ed202e17482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 26 Jul 2016 23:33:52 +0300
Subject: [PATCH 309/489] Abort catalog update earlier if there are no message
 catalogs

---
 babel/messages/frontend.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 5a1c7417f..3c94bf3f3 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -690,6 +690,9 @@ def run(self):
         else:
             po_files.append((self.locale, self.output_file))
 
+        if not po_files:
+            raise DistutilsOptionError('no message catalogs found')
+
         domain = self.domain
         if not domain:
             domain = os.path.splitext(os.path.basename(self.input_file))[0]
@@ -697,9 +700,6 @@ def run(self):
         with open(self.input_file, 'rb') as infile:
             template = read_po(infile)
 
-        if not po_files:
-            raise DistutilsOptionError('no message catalogs found')
-
         for locale, filename in po_files:
             self.log.info('updating catalog %s based on %s', filename, self.input_file)
             with open(filename, 'rb') as infile:

From 2ff0f4843d427102260fe88ddab67ce6d95903bd Mon Sep 17 00:00:00 2001
From: Roman Rader <roman.rader@gmail.com>
Date: Tue, 9 Aug 2016 11:29:12 +0300
Subject: [PATCH 310/489] Add option 'add_location' for location line
 formatting

Support of add_location option added, can be either 'full', 'file'
or 'never'. 'full' includes both file and line number; 'file' includes
only the file name without line number; 'never' doesn't include the
location comment at all (same as --no-location).
---
 babel/messages/frontend.py      | 27 ++++++++++++++++--
 babel/messages/pofile.py        |  5 ++--
 tests/messages/test_frontend.py | 50 +++++++++++++++++++++++++++++++++
 tests/messages/test_pofile.py   | 20 +++++++++++++
 4 files changed, 97 insertions(+), 5 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 3c94bf3f3..da4323cb8 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -104,6 +104,10 @@ class Command(_Command):
     #: that are usable with optparse.
     option_aliases = {}
 
+    #: Choices for options that needed to be restricted to specific
+    #: list of choices.
+    option_choices = {}
+
     #: Log object. To allow replacement in the script command line runner.
     log = distutils_log
 
@@ -273,6 +277,11 @@ class extract_messages(Command):
          'path to the mapping configuration file'),
         ('no-location', None,
          'do not include location comments with filename and line number'),
+        ('add-location', None,
+         'location lines format. If it is not given or "full", it generates '
+         'the lines with both file name and line number. If it is "file", '
+         'the line number part is omitted. If it is "never", it completely '
+         'suppresses the lines (same as --no-location).'),
         ('omit-header', None,
          'do not include msgid "" entry in header'),
         ('output-file=', 'o',
@@ -317,6 +326,9 @@ class extract_messages(Command):
         'output-file': ('--output',),
         'strip-comments': ('--strip-comment-tags',),
     }
+    option_choices = {
+        'add-location': ('full', 'file', 'never',),
+    }
 
     def initialize_options(self):
         self.charset = 'utf-8'
@@ -324,6 +336,7 @@ def initialize_options(self):
         self.no_default_keywords = False
         self.mapping_file = None
         self.no_location = False
+        self.add_location = None
         self.omit_header = False
         self.output_file = None
         self.input_dirs = None
@@ -338,6 +351,7 @@ def initialize_options(self):
         self.version = None
         self.add_comments = None
         self.strip_comments = False
+        self.include_lineno = True
 
     def finalize_options(self):
         if self.input_dirs:
@@ -401,6 +415,11 @@ def finalize_options(self):
             if not self.version:
                 self.version = self.distribution.get_version()
 
+        if self.add_location == 'never':
+            self.no_location = True
+        elif self.add_location == 'file':
+            self.include_lineno = False
+
     def run(self):
         mappings = self._get_mappings()
         with open(self.output_file, 'wb') as outfile:
@@ -459,7 +478,8 @@ def callback(filename, method, options):
                      no_location=self.no_location,
                      omit_header=self.omit_header,
                      sort_output=self.sort_output,
-                     sort_by_file=self.sort_by_file)
+                     sort_by_file=self.sort_by_file,
+                     include_lineno=self.include_lineno)
 
     def _get_mappings(self):
         mappings = []
@@ -859,14 +879,15 @@ def _configure_command(self, cmdname, argv):
             if short:
                 strs.append("-%s" % short)
             strs.extend(cmdclass.option_aliases.get(name, ()))
+            choices = cmdclass.option_choices.get(name, None)
             if name == as_args:
                 parser.usage += "<%s>" % name
             elif name in cmdclass.boolean_options:
                 parser.add_option(*strs, action="store_true", help=help)
             elif name in cmdclass.multiple_value_options:
-                parser.add_option(*strs, action="append", help=help)
+                parser.add_option(*strs, action="append", help=help, choices=choices)
             else:
-                parser.add_option(*strs, help=help, default=default)
+                parser.add_option(*strs, help=help, default=default, choices=choices)
         options, args = parser.parse_args(argv)
 
         if as_args:
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index e431fcd7f..741e25f9f 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -371,7 +371,7 @@ def normalize(string, prefix='', width=76):
 
 def write_po(fileobj, catalog, width=76, no_location=False, omit_header=False,
              sort_output=False, sort_by_file=False, ignore_obsolete=False,
-             include_previous=False):
+             include_previous=False, include_lineno=True):
     r"""Write a ``gettext`` PO (portable object) template file for a given
     message catalog to the provided file-like object.
 
@@ -413,6 +413,7 @@ def write_po(fileobj, catalog, width=76, no_location=False, omit_header=False,
                             comments
     :param include_previous: include the old msgid as a comment when
                              updating the catalog
+    :param include_lineno: include line number in the location comment
     """
     def _normalize(key, prefix=''):
         return normalize(key, prefix=prefix, width=width)
@@ -486,7 +487,7 @@ def _write_message(message, prefix=''):
         if not no_location:
             locs = []
             for filename, lineno in sorted(message.locations):
-                if lineno:
+                if lineno and include_lineno:
                     locs.append(u'%s:%d' % (filename.replace(os.sep, '/'), lineno))
                 else:
                     locs.append(u'%s' % filename.replace(os.sep, '/'))
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 7488bcc57..ef3c00b85 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -315,6 +315,37 @@ def test_extraction_with_mapping_dict(self):
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    def test_extraction_add_location_file(self):
+        self.dist.message_extractors = {
+            'project': [
+                ('**/ignored/**.*', 'ignore', None),
+                ('**.py', 'python', None),
+            ]
+        }
+        self.cmd.output_file = 'project/i18n/temp.pot'
+        self.cmd.add_location = 'file'
+        self.cmd.omit_header = True
+
+        self.cmd.finalize_options()
+        self.cmd.run()
+
+        self.assert_pot_file_exists()
+
+        expected_content = r"""#: project/file1.py
+msgid "bar"
+msgstr ""
+
+#: project/file2.py
+msgid "foobar"
+msgid_plural "foobars"
+msgstr[0] ""
+msgstr[1] ""
+
+"""
+        with open(self._pot_file(), 'U') as f:
+            actual_content = f.read()
+        self.assertEqual(expected_content, actual_content)
+
 
 class InitCatalogTestCase(unittest.TestCase):
 
@@ -1354,3 +1385,22 @@ def test_extract_cli_knows_dash_s():
     cmdinst = configure_cli_command("extract -s -o foo babel")
     assert isinstance(cmdinst, extract_messages)
     assert cmdinst.strip_comments
+
+
+def test_extract_add_location():
+    cmdinst = configure_cli_command("extract -o foo babel --add-location full")
+    assert isinstance(cmdinst, extract_messages)
+    assert cmdinst.add_location == 'full'
+    assert not cmdinst.no_location
+    assert cmdinst.include_lineno
+
+    cmdinst = configure_cli_command("extract -o foo babel --add-location file")
+    assert isinstance(cmdinst, extract_messages)
+    assert cmdinst.add_location == 'file'
+    assert not cmdinst.no_location
+    assert not cmdinst.include_lineno
+
+    cmdinst = configure_cli_command("extract -o foo babel --add-location never")
+    assert isinstance(cmdinst, extract_messages)
+    assert cmdinst.add_location == 'never'
+    assert cmdinst.no_location
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 4c525b5ec..d2a10dd05 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -602,6 +602,26 @@ def test_silent_location_fallback(self):
         self.assertEqual(catalog['missing line number'].locations, [(u'broken_file.py', None)])
         self.assertEqual(catalog['broken line number'].locations, [])
 
+    def test_include_lineno(self):
+        catalog = Catalog()
+        catalog.add(u'foo', locations=[('main.py', 1)])
+        catalog.add(u'foo', locations=[('utils.py', 3)])
+        buf = BytesIO()
+        pofile.write_po(buf, catalog, omit_header=True, include_lineno=True)
+        self.assertEqual(b'''#: main.py:1 utils.py:3
+msgid "foo"
+msgstr ""''', buf.getvalue().strip())
+
+    def test_no_include_lineno(self):
+        catalog = Catalog()
+        catalog.add(u'foo', locations=[('main.py', 1)])
+        catalog.add(u'foo', locations=[('utils.py', 3)])
+        buf = BytesIO()
+        pofile.write_po(buf, catalog, omit_header=True, include_lineno=False)
+        self.assertEqual(b'''#: main.py utils.py
+msgid "foo"
+msgstr ""''', buf.getvalue().strip())
+
 
 class PofileFunctionsTestCase(unittest.TestCase):
 

From 746779a546bab895ef3205dc5c0b1d90444168ed Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@jwilk.net>
Date: Sat, 20 Aug 2016 19:02:14 +0200
Subject: [PATCH 311/489] Fix typos

---
 CHANGES            | 4 ++--
 docs/api/dates.rst | 2 +-
 docs/dev.rst       | 4 ++--
 docs/messages.rst  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index c2dcfe688..8de00b0ec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -51,7 +51,7 @@ Bugfixes
 * General: localedata directory is now locale-data (#109) (2d1882e)
 * General: odict: Fix pop method (0a9e97e)
 * General: Removed uses of datetime.date class from *.dat files (#174) (94f6830)
-* Messages: Fix plural selection for chinese (531f666)
+* Messages: Fix plural selection for Chinese (531f666)
 * Messages: Fix typo and add semicolon in plural_forms (5784501)
 * Messages: Flatten NullTranslations.files into a list (ad11101)
 * Times: FixedOffsetTimezone: fix display of negative offsets (d816803)
@@ -275,7 +275,7 @@ Version 0.9.6
 Version 0.9.5
 -------------
 
-(relased on April 6th 2010)
+(released on April 6th 2010)
 
 - Fixed the case where messages containing square brackets would break with
   an unpack error.
diff --git a/docs/api/dates.rst b/docs/api/dates.rst
index 67ada4159..0fa9f1f32 100644
--- a/docs/api/dates.rst
+++ b/docs/api/dates.rst
@@ -4,7 +4,7 @@ Date and Time
 .. module:: babel.dates
 
 The date and time functionality provided by Babel lets you format standard
-Python `datetime`, `date` and `time` objects and and work with timezones.
+Python `datetime`, `date` and `time` objects and work with timezones.
 
 Date and Time Formatting
 ------------------------
diff --git a/docs/dev.rst b/docs/dev.rst
index b1fde576c..afc8b12d6 100644
--- a/docs/dev.rst
+++ b/docs/dev.rst
@@ -2,7 +2,7 @@ Babel Development
 =================
 
 Babel as a library has a long history that goes back to the Trac project.
-Since then it has evolved into a independently developed project that
+Since then it has evolved into an independently developed project that
 implements data access for the CLDR project.
 
 This document tries to explain as best as possible the general rules of
@@ -39,7 +39,7 @@ While PyPy does not currently support 3.3, it does support traditional
 unicode literals which simplifies the entire situation tremendously.
 
 Documentation must build on Python 2, Python 3 support for the
-documentation is an optional goal.  Code examples in the docs preferrably
+documentation is an optional goal.  Code examples in the docs preferably
 are written in a style that makes them work on both 2.x and 3.x with
 preference to the former.
 
diff --git a/docs/messages.rst b/docs/messages.rst
index 7c02ccf41..6814425c5 100644
--- a/docs/messages.rst
+++ b/docs/messages.rst
@@ -41,7 +41,7 @@ The general procedure for building message catalogs looks something like this:
    code base and write them to a POT (PO Template) file.
  * make a copy of the POT file for a specific locale (for example, "en_US")
    and start translating the messages
- * use a tool such as ``msgfmt`` to compile the locale PO file into an binary
+ * use a tool such as ``msgfmt`` to compile the locale PO file into a binary
    MO file
  * later, when code changes make it necessary to update the translations, you
    regenerate the POT file and merge the changes into the various

From 607abb2e227d5b91ca6f5d7f8fbe82be61239186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= <a@rodrigoramirez.com>
Date: Wed, 5 Oct 2016 15:56:33 -0300
Subject: [PATCH 312/489] Fix spelling word into Raise TypeError

---
 babel/core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/core.py b/babel/core.py
index 0b7b4edd5..79ce61999 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -262,7 +262,7 @@ def parse(cls, identifier, sep='_', resolve_likely_subtags=True):
         elif isinstance(identifier, Locale):
             return identifier
         elif not isinstance(identifier, string_types):
-            raise TypeError('Unxpected value for identifier: %r' % (identifier,))
+            raise TypeError('Unexpected value for identifier: %r' % (identifier,))
 
         parts = parse_locale(identifier, sep=sep)
         input_id = get_locale_identifier(parts)

From 41dcb1d13cb61b6e0816dd444c640a85059cc881 Mon Sep 17 00:00:00 2001
From: ldwoolley <ldwoolley@gmail.com>
Date: Fri, 7 Oct 2016 16:39:04 -0700
Subject: [PATCH 313/489] Improve Date Fields descriptions for issue #419

Described recommendation to use "Y" with "w" for consistent results in ISO year-week and indicated possible surprising results for year rollover and total number of weeks in a year.
---
 docs/dates.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/dates.rst b/docs/dates.rst
index 48fd58fd5..bb3398abb 100644
--- a/docs/dates.rst
+++ b/docs/dates.rst
@@ -140,7 +140,10 @@ Date Fields
   |          |        | the padding, but for two letters it also specifies the |
   |          |        | maximum length.                                        |
   |          +--------+--------------------------------------------------------+
-  |          | ``Y``  | Same as ``y`` but uses the ISO year-week calendar.     |
+  |          | ``Y``  | Same as ``y`` but uses the ISO year-week calendar. ISO |
+  |          |        | year-week increments after completing the last week of |
+  |          |        | the year. Therefore it may change a few days before or |
+  |          |        | after ``y``. Recommend use with the ``w`` Symbol.      |
   |          +--------+--------------------------------------------------------+
   |          | ``u``  | ??                                                     |
   +----------+--------+--------------------------------------------------------+
@@ -158,7 +161,9 @@ Date Fields
   |          |        | abbreviation, or four for the full name, or 5 for the  |
   |          |        | narrow name.                                           |
   +----------+--------+--------------------------------------------------------+
-  | Week     | ``w``  | Week of year.                                          |
+  | Week     | ``w``  | Week of year according to the ISO year-week calendar.  |
+  |          |        | This may have 52 or 53 weeks depending on the year.    |
+  |          |        | Recommend use with the ``Y`` symbol.                   |
   |          +--------+--------------------------------------------------------+
   |          | ``W``  | Week of month.                                         |
   +----------+--------+--------------------------------------------------------+

From be0d8cb340264c0f11f29efc67c5fb109b429e39 Mon Sep 17 00:00:00 2001
From: "KO. Mattsson" <karloskar@ponty.se>
Date: Mon, 25 Apr 2016 14:46:06 +0200
Subject: [PATCH 314/489] jslexer.py: Change jsx_tag regex again

We've had some syntactic variations that my previous PR, #392, did not
account for. One case had a component as a prop that tripped up the
regex.
---
 babel/messages/jslexer.py      |   2 +-
 tests/messages/test_jslexer.py | 133 ++++++++++++++++++++-------------
 2 files changed, 83 insertions(+), 52 deletions(-)

diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index 665a86fb1..a9bab2f2b 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -45,7 +45,7 @@
         ([eE][-+]?\d+)? |
         (0x[a-fA-F0-9]+)
     )''')),
-    ('jsx_tag', re.compile(r'</?[^> ]+', re.I)),  # May be mangled in `get_rules`
+    ('jsx_tag', re.compile(r'(?:</?[^>\s]+|/>)', re.I)),  # May be mangled in `get_rules`
     ('operator', re.compile(r'(%s)' % '|'.join(map(re.escape, operators)))),
     ('template_string', re.compile(r'''`(?:[^`\\]*(?:\\.[^`\\]*)*)`''', re.UNICODE)),
     ('string', re.compile(r'''(?xs)(
diff --git a/tests/messages/test_jslexer.py b/tests/messages/test_jslexer.py
index e125fec7a..b70621fc6 100644
--- a/tests/messages/test_jslexer.py
+++ b/tests/messages/test_jslexer.py
@@ -40,55 +40,86 @@ def test_jsx():
          <option value="val2">{ i18n._('String 2') }</option>
          <option value="val3">{ i18n._('String 3') }</option>
          <component value={i18n._('String 4')} />
+         <comp2 prop={<comp3 />} data={{active: true}}>
+             <btn text={ i18n._('String 5') } />
+         </comp2>
     """, jsx=True)) == [
-         ('jsx_tag', '<option', 2),
-         ('name', 'value', 2),
-         ('operator', '=', 2),
-         ('string', '"val1"', 2),
-         ('operator', '>', 2),
-         ('operator', '{', 2),
-         ('name', 'i18n._', 2),
-         ('operator', '(', 2),
-         ('string', "'String1'", 2),
-         ('operator', ')', 2),
-         ('operator', '}', 2),
-         ('jsx_tag', '</option', 2),
-         ('operator', '>', 2),
-         ('jsx_tag', '<option', 3),
-         ('name', 'value', 3),
-         ('operator', '=', 3),
-         ('string', '"val2"', 3),
-         ('operator', '>', 3),
-         ('operator', '{', 3),
-         ('name', 'i18n._', 3),
-         ('operator', '(', 3),
-         ('string', "'String 2'", 3),
-         ('operator', ')', 3),
-         ('operator', '}', 3),
-         ('jsx_tag', '</option', 3),
-         ('operator', '>', 3),
-         ('jsx_tag', '<option', 4),
-         ('name', 'value', 4),
-         ('operator', '=', 4),
-         ('string', '"val3"', 4),
-         ('operator', '>', 4),
-         ('operator', '{', 4),
-         ('name', 'i18n._', 4),
-         ('operator', '(', 4),
-         ('string', "'String 3'", 4),
-         ('operator', ')', 4),
-         ('operator', '}', 4),
-         ('jsx_tag', '</option', 4),
-         ('operator', '>', 4),
-         ('jsx_tag', '<component', 5),
-         ('name', 'value', 5),
-         ('operator', '=', 5),
-         ('operator', '{', 5),
-         ('name', 'i18n._', 5),
-         ('operator', '(', 5),
-         ('string', "'String 4'", 5),
-         ('operator', ')', 5),
-         ('operator', '}', 5),
-         ('operator', '/', 5),
-         ('operator', '>', 5)
-     ]
+        ('jsx_tag', '<option', 2),
+        ('name', 'value', 2),
+        ('operator', '=', 2),
+        ('string', '"val1"', 2),
+        ('operator', '>', 2),
+        ('operator', '{', 2),
+        ('name', 'i18n._', 2),
+        ('operator', '(', 2),
+        ('string', "'String1'", 2),
+        ('operator', ')', 2),
+        ('operator', '}', 2),
+        ('jsx_tag', '</option', 2),
+        ('operator', '>', 2),
+        ('jsx_tag', '<option', 3),
+        ('name', 'value', 3),
+        ('operator', '=', 3),
+        ('string', '"val2"', 3),
+        ('operator', '>', 3),
+        ('operator', '{', 3),
+        ('name', 'i18n._', 3),
+        ('operator', '(', 3),
+        ('string', "'String 2'", 3),
+        ('operator', ')', 3),
+        ('operator', '}', 3),
+        ('jsx_tag', '</option', 3),
+        ('operator', '>', 3),
+        ('jsx_tag', '<option', 4),
+        ('name', 'value', 4),
+        ('operator', '=', 4),
+        ('string', '"val3"', 4),
+        ('operator', '>', 4),
+        ('operator', '{', 4),
+        ('name', 'i18n._', 4),
+        ('operator', '(', 4),
+        ('string', "'String 3'", 4),
+        ('operator', ')', 4),
+        ('operator', '}', 4),
+        ('jsx_tag', '</option', 4),
+        ('operator', '>', 4),
+        ('jsx_tag', '<component', 5),
+        ('name', 'value', 5),
+        ('operator', '=', 5),
+        ('operator', '{', 5),
+        ('name', 'i18n._', 5),
+        ('operator', '(', 5),
+        ('string', "'String 4'", 5),
+        ('operator', ')', 5),
+        ('operator', '}', 5),
+        ('jsx_tag', '/>', 5),
+        ('jsx_tag', '<comp2', 6),
+        ('name', 'prop', 6),
+        ('operator', '=', 6),
+        ('operator', '{', 6),
+        ('jsx_tag', '<comp3', 6),
+        ('jsx_tag', '/>', 6),
+        ('operator', '}', 6),
+        ('name', 'data', 6),
+        ('operator', '=', 6),
+        ('operator', '{', 6),
+        ('operator', '{', 6),
+        ('name', 'active', 6),
+        ('operator', ':', 6),
+        ('name', 'true', 6),
+        ('operator', '}', 6),
+        ('operator', '}', 6),
+        ('operator', '>', 6),
+        ('jsx_tag', '<btn', 7),
+        ('name', 'text', 7),
+        ('operator', '=', 7),
+        ('operator', '{', 7),
+        ('name', 'i18n._', 7),
+        ('operator', '(', 7),
+        ('string', "'String 5'", 7),
+        ('operator', ')', 7),
+        ('operator', '}', 7),
+        ('jsx_tag', '/>', 7),
+        ('jsx_tag', '</comp2', 8),
+        ('operator', '>', 8)
+    ]

From fd351472cfbefaa5fd31331d277855b436f82ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georg=20Sch=C3=B6lly?= <git@gsch.ch>
Date: Sat, 25 Jun 2016 12:59:00 +0200
Subject: [PATCH 315/489] Increase coverage of JSX extraction tests

b5e0ad8 fixed a few bugs with jsx parsing but only added
tests for the lexer. This commit adds a test for the extraction
which did not work before:

    <tag>{ _"Text" }</tag>

This test case is not present yet in the suite, only tags with
attributes (<tag attr="value">) are, but they get extracted correctly
already.
---
 tests/messages/test_js_extract.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/messages/test_js_extract.py b/tests/messages/test_js_extract.py
index 35322ea16..d19c255fb 100644
--- a/tests/messages/test_js_extract.py
+++ b/tests/messages/test_js_extract.py
@@ -108,10 +108,12 @@ class Foo {
             <option value="val1">{ i18n._('String1') }</option>
             <option value="val2">{ i18n._('String 2') }</option>
             <option value="val3">{ i18n._('String 3') }</option>
+            <option value="val4">{ _('String 4') }</option>
+            <option>{ _('String 5') }</option>
         );
     }
 """
-EXPECTED_JSX_MESSAGES = ["hello", "String1", "String 2", "String 3"]
+EXPECTED_JSX_MESSAGES = ["hello", "String1", "String 2", "String 3", "String 4", "String 5"]
 
 
 @pytest.mark.parametrize("jsx_enabled", (False, True))

From 467bf955711e9224bb9f51a9620282d98e61f6c6 Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@starleaf.com>
Date: Wed, 12 Oct 2016 16:13:50 +0100
Subject: [PATCH 316/489] pofile parsing. Fix handling of obsolete + refactor

Fixes the handling of the unit before the obsolete unit.
Previously it would mark the unit before an obsolete unit as obsolete
also.

Some refactoring:
* the transition between finishing one unit and starting the next
is clearer
* separate the processing of keywords and continuation lines
* combine the reset and initialisation code
* Make the handling of strings consistent.
* Add some nascent error handling, removed some errors in test inputs
---
 babel/messages/pofile.py      | 152 ++++++++++++++++++++++------------
 tests/messages/test_pofile.py |  67 ++++++++++++++-
 2 files changed, 163 insertions(+), 56 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 741e25f9f..2d1854b1c 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -73,6 +73,23 @@ def denormalize(string):
         return unescape(string)
 
 
+class _NormalizedString(object):
+
+    def __init__(self, *args):
+        self._strs = []
+        for arg in args:
+            self.append(arg)
+
+    def append(self, s):
+        self._strs.append(s.strip())
+
+    def denormalize(self):
+        return ''.join(map(unescape, self._strs))
+
+    def __nonzero__(self):
+        return bool(self._strs)
+
+
 class PoFileParser(object):
     """Support class to  read messages from a ``gettext`` PO (portable object) file
     and add them to a `Catalog`
@@ -80,19 +97,29 @@ class PoFileParser(object):
     See `read_po` for simple cases.
     """
 
+    _keywords = [
+        'msgid',
+        'msgstr',
+        'msgctxt',
+        'msgid_plural',
+    ]
+
     def __init__(self, catalog, ignore_obsolete=False):
         self.catalog = catalog
         self.ignore_obsolete = ignore_obsolete
         self.counter = 0
         self.offset = 0
+        self._reset_message_state()
+
+    def _reset_message_state(self):
         self.messages = []
         self.translations = []
         self.locations = []
         self.flags = []
         self.user_comments = []
         self.auto_comments = []
+        self.context = None
         self.obsolete = False
-        self.context = []
         self.in_msgid = False
         self.in_msgstr = False
         self.in_msgctxt = False
@@ -104,9 +131,9 @@ def _add_message(self):
         """
         self.translations.sort()
         if len(self.messages) > 1:
-            msgid = tuple([denormalize(m) for m in self.messages])
+            msgid = tuple([m.denormalize() for m in self.messages])
         else:
-            msgid = denormalize(self.messages[0])
+            msgid = self.messages[0].denormalize()
         if isinstance(msgid, (list, tuple)):
             string = []
             for idx in range(self.catalog.num_plurals):
@@ -114,11 +141,11 @@ def _add_message(self):
                     string.append(self.translations[idx])
                 except IndexError:
                     string.append((idx, ''))
-            string = tuple([denormalize(t[1]) for t in string])
+            string = tuple([t[1].denormalize() for t in string])
         else:
-            string = denormalize(self.translations[0][1])
+            string = self.translations[0][1].denormalize()
         if self.context:
-            msgctxt = denormalize('\n'.join(self.context))
+            msgctxt = self.context.denormalize()
         else:
             msgctxt = None
         message = Message(msgid, string, list(self.locations), set(self.flags),
@@ -129,55 +156,70 @@ def _add_message(self):
                 self.catalog.obsolete[msgid] = message
         else:
             self.catalog[msgid] = message
-        del self.messages[:]
-        del self.translations[:]
-        del self.context[:]
-        del self.locations[:]
-        del self.flags[:]
-        del self.auto_comments[:]
-        del self.user_comments[:]
-        self.obsolete = False
         self.counter += 1
+        self._reset_message_state()
 
-    def _process_message_line(self, lineno, line):
-        if line.startswith('msgid_plural'):
-            self.in_msgid = True
-            msg = line[12:].lstrip()
-            self.messages.append(msg)
-        elif line.startswith('msgid'):
-            self.in_msgid = True
+    def _finish_current_message(self):
+        if self.messages:
+            self._add_message()
+
+    def _process_message_line(self, lineno, line, obsolete=False):
+        if line.startswith('"'):
+            self._process_string_continuation_line(line, lineno)
+        else:
+            self._process_keyword_line(lineno, line, obsolete)
+
+    def _process_keyword_line(self, lineno, line, obsolete=False):
+
+        for keyword in self._keywords:
+            if line.startswith(keyword) and line[len(keyword)] in [' ', '[']:
+                arg = line[len(keyword):]
+                break
+        else:
+            self._invalid_pofile(line, lineno, "Start of line didn't match any expected keyword.")
+            return
+
+        if keyword in ['msgid', 'msgctxt']:
+            self._finish_current_message()
+
+        self.obsolete = obsolete
+
+        # The line that has the msgid is stored as the offset of the msg
+        # should this be the msgctxt if it has one?
+        if keyword == 'msgid':
             self.offset = lineno
-            txt = line[5:].lstrip()
-            if self.messages:
-                self._add_message()
-            self.messages.append(txt)
-        elif line.startswith('msgstr'):
+
+        if keyword in ['msgid', 'msgid_plural']:
+            self.in_msgid = True
+            self.messages.append(_NormalizedString(arg))
+
+        elif keyword == 'msgstr':
             self.in_msgid = False
             self.in_msgstr = True
-            msg = line[6:].lstrip()
-            if msg.startswith('['):
-                idx, msg = msg[1:].split(']', 1)
-                self.translations.append([int(idx), msg.lstrip()])
+            if arg.startswith('['):
+                idx, msg = arg[1:].split(']', 1)
+                self.translations.append([int(idx), _NormalizedString(msg)])
             else:
-                self.translations.append([0, msg])
-        elif line.startswith('msgctxt'):
-            if self.messages:
-                self._add_message()
-            self.in_msgid = self.in_msgstr = False
-            self.context.append(line[7:].lstrip())
-        elif line.startswith('"'):
-            if self.in_msgid:
-                self.messages[-1] += u'\n' + line.rstrip()
-            elif self.in_msgstr:
-                self.translations[-1][1] += u'\n' + line.rstrip()
-            elif self.in_msgctxt:
-                self.context.append(line.rstrip())
+                self.translations.append([0, _NormalizedString(arg)])
+        elif keyword == 'msgctxt':
+            self.context = _NormalizedString(arg)
+
+    def _process_string_continuation_line(self, line, lineno):
+        if self.in_msgid:
+            s = self.messages[-1]
+        elif self.in_msgstr:
+            s = self.translations[-1][1]
+        elif self.in_msgctxt:
+            s = self.context
+        else:
+            self._invalid_pofile(line, lineno, "Got line starting with \" but not in msgid, msgstr or msgctxt")
+            return
+        s.append(line)
 
     def _process_comment(self, line):
 
-        self.in_msgid = self.in_msgstr = False
-        if self.messages and self.translations:
-            self._add_message()
+        self._finish_current_message()
+
         if line[1:].startswith(':'):
             for location in line[2:].lstrip().split():
                 pos = location.rfind(':')
@@ -211,25 +253,29 @@ def parse(self, fileobj):
             line = line.strip()
             if not isinstance(line, text_type):
                 line = line.decode(self.catalog.charset)
+            if not line:
+                continue
             if line.startswith('#'):
                 if line[1:].startswith('~'):
-                    self.obsolete = True
-                    self._process_message_line(lineno, line[2:].lstrip())
+                    self._process_message_line(lineno, line[2:].lstrip(), obsolete=True)
                 else:
                     self._process_comment(line)
             else:
                 self._process_message_line(lineno, line)
 
-        if self.messages:
-            self._add_message()
+        self._finish_current_message()
 
         # No actual messages found, but there was some info in comments, from which
         # we'll construct an empty header message
-        elif not self.counter and (self.flags or self.user_comments or self.auto_comments):
-            self.messages.append(u'')
-            self.translations.append([0, u''])
+        if not self.counter and (self.flags or self.user_comments or self.auto_comments):
+            self.messages.append(_NormalizedString(u'""'))
+            self.translations.append([0, _NormalizedString(u'""')])
             self._add_message()
 
+    def _invalid_pofile(self, line, lineno, msg):
+        print("WARNING:", msg)
+        print("WARNING: Problem on line {0}: {1}".format(lineno + 1, line))
+
 
 def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=None):
     """Read messages from a ``gettext`` PO (portable object) file from the given
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index d2a10dd05..cdb90f5e9 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -79,7 +79,7 @@ def test_read_multiline(self):
                          message.id)
 
     def test_fuzzy_header(self):
-        buf = StringIO(r'''\
+        buf = StringIO(r'''
 # Translations template for AReallyReallyLongNameForAProject.
 # Copyright (C) 2007 ORGANIZATION
 # This file is distributed under the same license as the
@@ -93,7 +93,7 @@ def test_fuzzy_header(self):
         self.assertEqual(True, list(catalog)[0].fuzzy)
 
     def test_not_fuzzy_header(self):
-        buf = StringIO(r'''\
+        buf = StringIO(r'''
 # Translations template for AReallyReallyLongNameForAProject.
 # Copyright (C) 2007 ORGANIZATION
 # This file is distributed under the same license as the
@@ -106,7 +106,7 @@ def test_not_fuzzy_header(self):
         self.assertEqual(False, list(catalog)[0].fuzzy)
 
     def test_header_entry(self):
-        buf = StringIO(r'''\
+        buf = StringIO(r'''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -208,6 +208,28 @@ def test_unit_following_multi_line_obsolete_message(self):
 #: main.py:1
 msgid "bar"
 msgstr "Bahr"
+''')
+        catalog = pofile.read_po(buf)
+        self.assertEqual(1, len(catalog))
+        message = catalog[u'bar']
+        self.assertEqual(u'bar', message.id)
+        self.assertEqual(u'Bahr', message.string)
+        self.assertEqual(['This message is not obsolete'], message.user_comments)
+
+    def test_unit_before_obsolete_is_not_obsoleted(self):
+        buf = StringIO(r'''
+# This message is not obsolete
+#: main.py:1
+msgid "bar"
+msgstr "Bahr"
+
+# This is an obsolete message
+#~ msgid ""
+#~ "foo"
+#~ "fooooooo"
+#~ msgstr ""
+#~ "Voh"
+#~ "Vooooh"
 ''')
         catalog = pofile.read_po(buf)
         self.assertEqual(1, len(catalog))
@@ -242,6 +264,29 @@ def test_with_context(self):
         assert out_buf.getvalue().strip() == buf.getvalue().strip(), \
             out_buf.getvalue()
 
+    def test_obsolete_message_with_context(self):
+        buf = StringIO('''
+# This message is not obsolete
+msgid "baz"
+msgstr "Bazczch"
+
+# This is an obsolete message
+#~ msgctxt "other"
+#~ msgid "foo"
+#~ msgstr "Voh"
+
+# This message is not obsolete
+#: main.py:1
+msgid "bar"
+msgstr "Bahr"
+''')
+        catalog = pofile.read_po(buf)
+        self.assertEqual(2, len(catalog))
+        self.assertEqual(1, len(catalog.obsolete))
+        message = catalog.obsolete[u"foo"]
+        self.assertEqual(message.context, "other")
+        self.assertEqual(message.string, "Voh")
+
     def test_with_context_two(self):
         buf = BytesIO(b'''msgctxt "Menu"
 msgid "foo"
@@ -308,6 +353,22 @@ def test_plural_with_square_brackets(self):
         message = catalog['foo']
         self.assertEqual(2, len(message.string))
 
+    def test_obsolete_plural_with_square_brackets(self):
+        buf = StringIO('''\
+#~ msgid "foo"
+#~ msgid_plural "foos"
+#~ msgstr[0] "Voh [text]"
+#~ msgstr[1] "Vohs [text]"
+''')
+        catalog = pofile.read_po(buf, locale='nb_NO')
+        self.assertEqual(0, len(catalog))
+        self.assertEqual(1, len(catalog.obsolete))
+        self.assertEqual(2, catalog.num_plurals)
+        message = catalog.obsolete[('foo', 'foos')]
+        self.assertEqual(2, len(message.string))
+        self.assertEqual("Voh [text]", message.string[0])
+        self.assertEqual("Vohs [text]", message.string[1])
+
 
 class WritePoTestCase(unittest.TestCase):
 

From 2ba92312514fcac4902c624b571e8c8a7081658b Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@starleaf.com>
Date: Wed, 12 Oct 2016 17:15:43 +0100
Subject: [PATCH 317/489] pofile reader: Fix multi line msgctxt

---
 babel/messages/pofile.py      |  3 +++
 tests/messages/test_pofile.py | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 2d1854b1c..47db8a9f7 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -190,6 +190,7 @@ def _process_keyword_line(self, lineno, line, obsolete=False):
             self.offset = lineno
 
         if keyword in ['msgid', 'msgid_plural']:
+            self.in_msgctxt = False
             self.in_msgid = True
             self.messages.append(_NormalizedString(arg))
 
@@ -201,7 +202,9 @@ def _process_keyword_line(self, lineno, line, obsolete=False):
                 self.translations.append([int(idx), _NormalizedString(msg)])
             else:
                 self.translations.append([0, _NormalizedString(arg)])
+
         elif keyword == 'msgctxt':
+            self.in_msgctxt = True
             self.context = _NormalizedString(arg)
 
     def _process_string_continuation_line(self, line, lineno):
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index cdb90f5e9..64bf7148c 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -287,6 +287,20 @@ def test_obsolete_message_with_context(self):
         self.assertEqual(message.context, "other")
         self.assertEqual(message.string, "Voh")
 
+    def test_multiline_context(self):
+        buf = StringIO('''
+msgctxt "a really long "
+"message context "
+"why?"
+msgid "mid"
+msgstr "mst"
+        ''')
+        catalog = pofile.read_po(buf)
+        self.assertEqual(1, len(catalog))
+        message = catalog.get('mid', context="a really long message context why?")
+        assert message is not None
+        self.assertEqual("a really long message context why?", message.context)
+
     def test_with_context_two(self):
         buf = BytesIO(b'''msgctxt "Menu"
 msgid "foo"

From 7dfe6f9e01a4c157f69b6495ca1f293def3acc76 Mon Sep 17 00:00:00 2001
From: Michael Birtwell <michael.birtwell@starleaf.com>
Date: Wed, 12 Oct 2016 17:46:06 +0100
Subject: [PATCH 318/489] Fix read_pofile handling of missing plurals

---
 babel/messages/pofile.py      | 14 ++++++------
 tests/messages/test_pofile.py | 40 +++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 47db8a9f7..696ec3e97 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -135,13 +135,13 @@ def _add_message(self):
         else:
             msgid = self.messages[0].denormalize()
         if isinstance(msgid, (list, tuple)):
-            string = []
-            for idx in range(self.catalog.num_plurals):
-                try:
-                    string.append(self.translations[idx])
-                except IndexError:
-                    string.append((idx, ''))
-            string = tuple([t[1].denormalize() for t in string])
+            string = ['' for _ in range(self.catalog.num_plurals)]
+            for idx, translation in self.translations:
+                if idx >= self.catalog.num_plurals:
+                    self._invalid_pofile("", self.offset, "msg has more translations than num_plurals of catalog")
+                    continue
+                string[idx] = translation.denormalize()
+            string = tuple(string)
         else:
             string = self.translations[0][1].denormalize()
         if self.context:
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 64bf7148c..cef691387 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -383,6 +383,46 @@ def test_obsolete_plural_with_square_brackets(self):
         self.assertEqual("Voh [text]", message.string[0])
         self.assertEqual("Vohs [text]", message.string[1])
 
+    def test_missing_plural(self):
+        buf = StringIO('''\
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=3; plural=(n < 2) ? n : 2\n"
+
+msgid "foo"
+msgid_plural "foos"
+msgstr[0] "Voh [text]"
+msgstr[1] "Vohs [text]"
+''')
+        catalog = pofile.read_po(buf, locale='nb_NO')
+        self.assertEqual(1, len(catalog))
+        self.assertEqual(3, catalog.num_plurals)
+        message = catalog['foo']
+        self.assertEqual(3, len(message.string))
+        self.assertEqual("Voh [text]", message.string[0])
+        self.assertEqual("Vohs [text]", message.string[1])
+        self.assertEqual("", message.string[2])
+
+    def test_missing_plural_in_the_middle(self):
+        buf = StringIO('''\
+msgid ""
+msgstr ""
+"Plural-Forms: nplurals=3; plural=(n < 2) ? n : 2\n"
+
+msgid "foo"
+msgid_plural "foos"
+msgstr[0] "Voh [text]"
+msgstr[2] "Vohs [text]"
+''')
+        catalog = pofile.read_po(buf, locale='nb_NO')
+        self.assertEqual(1, len(catalog))
+        self.assertEqual(3, catalog.num_plurals)
+        message = catalog['foo']
+        self.assertEqual(3, len(message.string))
+        self.assertEqual("Voh [text]", message.string[0])
+        self.assertEqual("", message.string[1])
+        self.assertEqual("Vohs [text]", message.string[2])
+
 
 class WritePoTestCase(unittest.TestCase):
 

From 9be702b334453d0a22c18e7443a172cc5ee9f7d3 Mon Sep 17 00:00:00 2001
From: Alex Kuzmenko <a.kuzmenko@smartweb.com.ua>
Date: Thu, 15 Dec 2016 15:47:38 +0200
Subject: [PATCH 319/489] Fix setup.py option 'add_location'

---
 babel/messages/frontend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index da4323cb8..fb171e36a 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -277,7 +277,7 @@ class extract_messages(Command):
          'path to the mapping configuration file'),
         ('no-location', None,
          'do not include location comments with filename and line number'),
-        ('add-location', None,
+        ('add-location=', None,
          'location lines format. If it is not given or "full", it generates '
          'the lines with both file name and line number. If it is "file", '
          'the line number part is omitted. If it is "never", it completely '

From f89f48795fdbed07c51aa897eca590a05eb4b746 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Thu, 29 Dec 2016 00:00:23 -0500
Subject: [PATCH 320/489] Pull flags out of regular expressions

---
 babel/localtime/_unix.py  |  2 +-
 babel/messages/catalog.py |  4 ++--
 babel/messages/jslexer.py | 14 +++++++-------
 babel/plural.py           |  2 +-
 scripts/make-release.py   |  8 +++++---
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/babel/localtime/_unix.py b/babel/localtime/_unix.py
index 91f03bc99..e0b54fb28 100644
--- a/babel/localtime/_unix.py
+++ b/babel/localtime/_unix.py
@@ -5,7 +5,7 @@
 import pytz
 import subprocess
 
-_systemconfig_tz = re.compile(r'^Time Zone: (.*)$(?m)')
+_systemconfig_tz = re.compile(r'^Time Zone: (.*)$', re.MULTILINE)
 
 
 def _tz_from_env(tzenv):
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 9a474a845..018094ca4 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -28,7 +28,7 @@
 __all__ = ['Message', 'Catalog', 'TranslationError']
 
 
-PYTHON_FORMAT = re.compile(r'''(?x)
+PYTHON_FORMAT = re.compile(r'''
     \%
         (?:\(([\w]*)\))?
         (
@@ -37,7 +37,7 @@
             [hlL]?
         )
         ([diouxXeEfFgGcrs%])
-''')
+''', re.VERBOSE)
 
 
 def _parse_datetime_header(value):
diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index a9bab2f2b..30d6e5405 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -25,7 +25,7 @@
 name_re = re.compile(r'[\w$_][\w\d$_]*', re.UNICODE)
 dotted_name_re = re.compile(r'[\w$_][\w\d$_.]*[\w\d$_.]', re.UNICODE)
 division_re = re.compile(r'/=?')
-regex_re = re.compile(r'/(?:[^/\\]*(?:\\.[^/\\]*)*)/[a-zA-Z]*(?s)')
+regex_re = re.compile(r'/(?:[^/\\]*(?:\\.[^/\\]*)*)/[a-zA-Z]*', re.DOTALL)
 line_re = re.compile(r'(\r\n|\n|\r)')
 line_join_re = re.compile(r'\\' + line_re.pattern)
 uni_escape_re = re.compile(r'[a-fA-F0-9]{1,4}')
@@ -33,25 +33,25 @@
 Token = namedtuple('Token', 'type value lineno')
 
 _rules = [
-    (None, re.compile(r'\s+(?u)')),
+    (None, re.compile(r'\s+', re.UNICODE)),
     (None, re.compile(r'<!--.*')),
     ('linecomment', re.compile(r'//.*')),
-    ('multilinecomment', re.compile(r'/\*.*?\*/(?us)')),
+    ('multilinecomment', re.compile(r'/\*.*?\*/', re.UNICODE | re.DOTALL)),
     ('dotted_name', dotted_name_re),
     ('name', name_re),
-    ('number', re.compile(r'''(?x)(
+    ('number', re.compile(r'''(
         (?:0|[1-9]\d*)
         (\.\d+)?
         ([eE][-+]?\d+)? |
         (0x[a-fA-F0-9]+)
-    )''')),
+    )''', re.VERBOSE)),
     ('jsx_tag', re.compile(r'(?:</?[^>\s]+|/>)', re.I)),  # May be mangled in `get_rules`
     ('operator', re.compile(r'(%s)' % '|'.join(map(re.escape, operators)))),
     ('template_string', re.compile(r'''`(?:[^`\\]*(?:\\.[^`\\]*)*)`''', re.UNICODE)),
-    ('string', re.compile(r'''(?xs)(
+    ('string', re.compile(r'''(
         '(?:[^'\\]*(?:\\.[^'\\]*)*)'  |
         "(?:[^"\\]*(?:\\.[^"\\]*)*)"
-    )'''))
+    )''', re.VERBOSE | re.DOTALL))
 ]
 
 
diff --git a/babel/plural.py b/babel/plural.py
index 99e9a6506..a23f8b53f 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -321,7 +321,7 @@ class RuleError(Exception):
 _VARS = 'nivwft'
 
 _RULES = [
-    (None, re.compile(r'\s+(?u)')),
+    (None, re.compile(r'\s+', re.UNICODE)),
     ('word', re.compile(r'\b(and|or|is|(?:with)?in|not|mod|[{0}])\b'
                         .format(_VARS))),
     ('value', re.compile(r'\d+')),
diff --git a/scripts/make-release.py b/scripts/make-release.py
index 7477ad387..dc9bb31e6 100755
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -35,7 +35,8 @@ def parse_changelog():
                     break
 
             match = re.search(r'released on (\w+\s+\d+\w+\s+\d+)'
-                              r'(?:, codename (.*))?(?i)', change_info)
+                              r'(?:, codename (.*))?', change_info,
+                              flags=re.IGNORECASE)
             if match is None:
                 continue
 
@@ -68,8 +69,9 @@ def inject_version(match):
         changed.append(True)
         return before + version_number + after
     with open(filename) as f:
-        contents = re.sub(r"^(\s*%s\s*=\s*')(.+?)(')(?sm)" % pattern,
-                          inject_version, f.read())
+        contents = re.sub(r"^(\s*%s\s*=\s*')(.+?)(')" % pattern,
+                          inject_version, f.read(),
+                          flags=re.DOTALL | re.MULTILINE)
 
     if not changed:
         fail('Could not find %s in %s', pattern, filename)

From cd991a4e1884c87eab32eb85f0ed9ccc192deb29 Mon Sep 17 00:00:00 2001
From: Abhishek Tiwari <erabhishektiwarics@gmail.com>
Date: Tue, 10 Jan 2017 22:52:06 +0530
Subject: [PATCH 321/489] Issue #463. Changed win_mapping to
 windows_zone_mapping in core.py line 48

---
 babel/core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/core.py b/babel/core.py
index 79ce61999..bb59b7413 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -55,7 +55,7 @@ def get_global(key):
     - ``territory_languages``
     - ``territory_zones``
     - ``variant_aliases``
-    - ``win_mapping``
+    - ``windows_zone_mapping``
     - ``zone_aliases``
     - ``zone_territories``
 

From e6d05817b4d8697bfb2394ff02204b243d1c00c1 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 14 Mar 2017 11:53:04 +0200
Subject: [PATCH 322/489] Distill changes from git log into CHANGES

---
 CHANGES | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/CHANGES b/CHANGES
index 9feab7c02..479ea708e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,45 @@
 Babel Changelog
 ===============
 
+Version 2.4.0
+-------------
+
+New Features
+~~~~~~~~~~~~
+
+Some of these changes might break your current code and/or tests.
+
+* CLDR: CLDR 29 is now used instead of CLDR 28 (#405) (@akx)
+* Messages: Add option 'add_location' for location line formatting (#438, #459) (@rrader, @alxpy)
+* Numbers: Allow full control of decimal behavior (#410) (@etanol)
+
+Minor Improvements and bugfixes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Documentation: Improve Date Fields descriptions (#450) (@ldwoolley)
+* Documentation: Typo fixes and documentation improvements (#406, #412, #403, #440, #449, #463) (@zyegfryed, @adamchainz, @jwilk, @akx, @roramirez, @abhishekcs10)
+* Messages: Default to UTF-8 source encoding instead of ISO-8859-1 (#399) (@asottile)
+* Messages: Ensure messages are extracted in the order they were passed in (#424) (@ngrilly)
+* Messages: Message extraction for JSX files is improved (#392, #396, #425) (@karloskar, @georgschoelly)
+* Messages: PO file reading supports multi-line obsolete units (#429) (@mbirtwell)
+* Messages: Python message extractor respects unicode_literals in __future__ (#427) (@sublee)
+* Messages: Roundtrip Language headers (#420) (@kruton)
+* Messages: units before obsolete units are no longer erroneously marked obsolete (#452) (@mbirtwell)
+* Numbers: `parse_pattern` now preserves the full original pattern (#414) (@jtwang)
+* Numbers: Fix float conversion in `extract_operands` (#435) (@akx)
+* Plurals: Fix plural forms for Czech and Slovak locales (#373) (@ykshatroff)
+* Plurals: More plural form fixes based on Mozilla and CLDR references (#431) (@mshenfield)
+
+
+Internal improvements
+~~~~~~~~~~~~~~~~~~~~~
+
+* Local times are constructed correctly in tests (#411) (@etanol)
+* Miscellaneous small improvements (#437) (@scop)
+* Regex flags are extracted from the regex strings (#462) (@singingwolfboy)
+* The PO file reader is now a class and has seen some refactoring (#429, #452) (@mbirtwell)
+
+
 Version 2.3.4
 -------------
 

From 6ce9490240030ccc15449d10e2c16df39013970b Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 14 Mar 2017 12:07:36 +0200
Subject: [PATCH 323/489] Become version 2.4.0

---
 babel/__init__.py | 2 +-
 docs/conf.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index 0162c145f..b9f96b9e0 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.4.0.dev0'
+__version__ = '2.4.0'
diff --git a/docs/conf.py b/docs/conf.py
index 58dcc25ac..33d9a6741 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,7 +44,7 @@
 
 # General information about the project.
 project = u'Babel'
-copyright = u'2016, The Babel Team'
+copyright = u'2017, The Babel Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '2.4'
 # The full version, including alpha/beta/rc tags.
-release = '2.4.0.dev0'
+release = '2.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 57d47e0d69217c2fa5aec3a072a4972823669db3 Mon Sep 17 00:00:00 2001
From: Xavier Fernandez <xavier.fernandez@polyconseil.fr>
Date: Tue, 21 Mar 2017 16:23:09 +0100
Subject: [PATCH 324/489] Simplify Message.__cmp__

---
 babel/messages/catalog.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 018094ca4..193b72bcd 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -116,21 +116,13 @@ def __repr__(self):
         return '<%s %r (flags: %r)>' % (type(self).__name__, self.id,
                                         list(self.flags))
 
-    def __cmp__(self, obj):
+    def __cmp__(self, other):
         """Compare Messages, taking into account plural ids"""
-        def values_to_compare():
-            if isinstance(obj, Message):
-                plural = self.pluralizable
-                obj_plural = obj.pluralizable
-                if plural and obj_plural:
-                    return self.id[0], obj.id[0]
-                elif plural:
-                    return self.id[0], obj.id
-                elif obj_plural:
-                    return self.id, obj.id[0]
-            return self.id, obj.id
-        this, other = values_to_compare()
-        return cmp(this, other)
+        def values_to_compare(obj):
+            if isinstance(obj, Message) and obj.pluralizable:
+                return obj.id[0]
+            return obj.id
+        return cmp(values_to_compare(self), values_to_compare(other))
 
     def __gt__(self, other):
         return self.__cmp__(other) > 0

From 1290a5d5c8f62069d93a9bbec3c7f98b57b36e3f Mon Sep 17 00:00:00 2001
From: Xavier Fernandez <xavier.fernandez@polyconseil.fr>
Date: Tue, 21 Mar 2017 16:36:56 +0100
Subject: [PATCH 325/489] When msgid are equal, sort according to msgctxt

Fix #481
---
 babel/messages/catalog.py     |  4 ++--
 tests/messages/test_pofile.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 193b72bcd..3145fa37a 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -120,8 +120,8 @@ def __cmp__(self, other):
         """Compare Messages, taking into account plural ids"""
         def values_to_compare(obj):
             if isinstance(obj, Message) and obj.pluralizable:
-                return obj.id[0]
-            return obj.id
+                return (obj.id[0], obj.context or '')
+            return (obj.id, obj.context or '')
         return cmp(values_to_compare(self), values_to_compare(other))
 
     def __gt__(self, other):
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index cef691387..ebf9702d8 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -680,6 +680,41 @@ def test_sorted_po(self):
 msgstr[1] "Voeh"''' in value
         assert value.find(b'msgid ""') < value.find(b'msgid "bar"') < value.find(b'msgid "foo"')
 
+    def test_sorted_po_context(self):
+        catalog = Catalog()
+        catalog.add((u'foo', u'foos'), (u'Voh', u'Voeh'),
+                    locations=[('main.py', 1)],
+                    context='there')
+        catalog.add((u'foo', u'foos'), (u'Voh', u'Voeh'),
+                    locations=[('main.py', 1)])
+        catalog.add((u'foo', u'foos'), (u'Voh', u'Voeh'),
+                    locations=[('main.py', 1)],
+                    context='here')
+        buf = BytesIO()
+        pofile.write_po(buf, catalog, sort_output=True)
+        value = buf.getvalue().strip()
+        # We expect the foo without ctx, followed by "here" foo and "there" foo
+        assert b'''\
+#: main.py:1
+msgid "foo"
+msgid_plural "foos"
+msgstr[0] "Voh"
+msgstr[1] "Voeh"
+
+#: main.py:1
+msgctxt "here"
+msgid "foo"
+msgid_plural "foos"
+msgstr[0] "Voh"
+msgstr[1] "Voeh"
+
+#: main.py:1
+msgctxt "there"
+msgid "foo"
+msgid_plural "foos"
+msgstr[0] "Voh"
+msgstr[1] "Voeh"''' in value
+
     def test_file_sorted_po(self):
         catalog = Catalog()
         catalog.add(u'bar', locations=[('utils.py', 3)])

From aec35d8a492fa6ee48922449f77c351bf26ef86b Mon Sep 17 00:00:00 2001
From: Heungsub Lee <sub@subl.ee>
Date: Fri, 31 Mar 2017 19:19:00 +0900
Subject: [PATCH 326/489] Add test case for nested gettext

---
 tests/messages/test_extract.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 22ea1cd6c..0bf074be0 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -424,6 +424,17 @@ def test_extract_strip_comment_tags(self):
         self.assertEqual([u'This is a multiline comment with',
                           u'a prefix too'], messages[1][2])
 
+    def test_nested(self):
+        buf = BytesIO(b"""
+# NOTE: A translation comment
+msg = _(u'Hello, {name}!', name=_(u'Foo Bar'))
+""")
+        messages = list(extract.extract_python(buf, ('_',), ['NOTE:'], {}))
+        self.assertEqual(u'Hello, {name}!', messages[0][2])
+        self.assertEqual([u'NOTE: A translation comment'], messages[0][3])
+        self.assertEqual(u'Foo Bar!', messages[1][2])
+        self.assertEqual(None, messages[1][3])
+
 
 class ExtractTestCase(unittest.TestCase):
 

From f94d61c1d45b3c7869bc022097d49bdd4374cc0e Mon Sep 17 00:00:00 2001
From: Heungsub Lee <sub@subl.ee>
Date: Fri, 31 Mar 2017 20:14:26 +0900
Subject: [PATCH 327/489] More complex test cases for nested gettext

---
 tests/messages/test_extract.py | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 0bf074be0..f3a28278e 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -426,14 +426,34 @@ def test_extract_strip_comment_tags(self):
 
     def test_nested(self):
         buf = BytesIO(b"""
-# NOTE: A translation comment
-msg = _(u'Hello, {name}!', name=_(u'Foo Bar'))
+# NOTE: First
+_(u'Hello, {name}!', name=_(u'Foo Bar'))
+
+# NOTE: Second
+_(u'Hello, {name1} and {name2}!', name1=_(u'Heungsub'),
+  name2=_(u'Armin'))
+
+# NOTE: Third
+_(u'Hello, {0} and {1}!', _(u'Heungsub'),
+  _(u'Armin'))
 """)
         messages = list(extract.extract_python(buf, ('_',), ['NOTE:'], {}))
-        self.assertEqual(u'Hello, {name}!', messages[0][2])
-        self.assertEqual([u'NOTE: A translation comment'], messages[0][3])
-        self.assertEqual(u'Foo Bar!', messages[1][2])
-        self.assertEqual(None, messages[1][3])
+        self.assertEqual((u'Hello, {name}!', None), messages[0][2])
+        self.assertEqual([u'NOTE: First'], messages[0][3])
+        self.assertEqual(u'Foo Bar', messages[1][2])
+        self.assertEqual([], messages[1][3])
+        self.assertEqual((u'Hello, {name1} and {name2}!', None), messages[2][2])
+        self.assertEqual([u'NOTE: Second'], messages[2][3])
+        self.assertEqual(u'Heungsub', messages[3][2])
+        self.assertEqual([], messages[3][3])
+        self.assertEqual(u'Armin', messages[4][2])
+        self.assertEqual([], messages[4][3])
+        self.assertEqual((u'Hello, {0} and {1}!', None), messages[5][2])
+        self.assertEqual([u'NOTE: Third'], messages[5][3])
+        self.assertEqual(u'Heungsub', messages[6][2])
+        self.assertEqual([], messages[6][3])
+        self.assertEqual(u'Armin', messages[7][2])
+        self.assertEqual([], messages[7][3])
 
 
 class ExtractTestCase(unittest.TestCase):

From 95b920d821b881639e5082500ced9d3e0454ee6f Mon Sep 17 00:00:00 2001
From: Heungsub Lee <sub@subl.ee>
Date: Fri, 31 Mar 2017 20:15:28 +0900
Subject: [PATCH 328/489] Rename test case

---
 tests/messages/test_extract.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index f3a28278e..873439de4 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -424,7 +424,7 @@ def test_extract_strip_comment_tags(self):
         self.assertEqual([u'This is a multiline comment with',
                           u'a prefix too'], messages[1][2])
 
-    def test_nested(self):
+    def test_nested_messages(self):
         buf = BytesIO(b"""
 # NOTE: First
 _(u'Hello, {name}!', name=_(u'Foo Bar'))

From b96c84e6b400e6439720b1e06b382d822a48971b Mon Sep 17 00:00:00 2001
From: Heungsub Lee <sub@subl.ee>
Date: Fri, 31 Mar 2017 20:15:33 +0900
Subject: [PATCH 329/489] Fix extraction bug on nested messages

It fixes !487.
---
 babel/messages/extract.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index efddbf5e6..ffcfac86b 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -445,7 +445,8 @@ def extract_python(fileobj, keywords, comment_tags, options):
                     translator_comments.append((lineno, value))
                     break
         elif funcname and call_stack == 0:
-            if tok == OP and value == ')':
+            nested = (tok == NAME and value in keywords)
+            if (tok == OP and value == ')') or nested:
                 if buf:
                     messages.append(''.join(buf))
                     del buf[:]
@@ -470,6 +471,8 @@ def extract_python(fileobj, keywords, comment_tags, options):
                 messages = []
                 translator_comments = []
                 in_translator_comments = False
+                if nested:
+                    funcname = value
             elif tok == STRING:
                 # Unwrap quotes in a safe manner, maintaining the string's
                 # encoding

From 33b4728d340e2910cfaf689d937527c1cfe5cdf2 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 6 Apr 2017 12:45:52 +0300
Subject: [PATCH 330/489] Allow both dash and underscore separated locale
 identifiers in pofiles

Fixes #489

Augments #420 (08b9c5e76e19ae)
---
 babel/messages/catalog.py     | 1 +
 tests/messages/test_pofile.py | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 3145fa37a..fd40058ad 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -395,6 +395,7 @@ def _set_mime_headers(self, headers):
             elif name == 'last-translator':
                 self.last_translator = value
             elif name == 'language':
+                value = value.replace('-', '_')
                 self.locale = Locale.parse(value)
             elif name == 'language-team':
                 self.language_team = value
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index ebf9702d8..f6cd66dba 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -36,6 +36,12 @@ def test_locale_gets_overridden_by_file(self):
 "Language: en_US\n"''')
         catalog = pofile.read_po(buf, locale='de')
         self.assertEqual(Locale('en', 'US'), catalog.locale)
+        buf = StringIO(r'''
+msgid ""
+msgstr ""
+"Language: ko-KR\n"''')
+        catalog = pofile.read_po(buf, locale='de')
+        self.assertEqual(Locale('ko', 'KR'), catalog.locale)
 
     def test_preserve_domain(self):
         buf = StringIO(r'''msgid "foo"

From bd022f1bd066fdc2d779184631fa29183c3fbecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Dufresne?=
 <marc-andre.dufresne@ormuco.com>
Date: Wed, 8 Mar 2017 17:21:28 -0500
Subject: [PATCH 331/489] Fixed in-place editing of dir list while iterating

---
 babel/messages/extract.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index ffcfac86b..351a29070 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -137,9 +137,10 @@ def extract_from_dir(dirname=None, method_map=DEFAULT_MAPPING,
 
     absname = os.path.abspath(dirname)
     for root, dirnames, filenames in os.walk(absname):
-        for subdir in dirnames:
-            if subdir.startswith('.') or subdir.startswith('_'):
-                dirnames.remove(subdir)
+        dirnames[:] = [
+            subdir for subdir in dirnames
+            if not (subdir.startswith('.') or subdir.startswith('_'))
+        ]
         dirnames.sort()
         filenames.sort()
         for filename in filenames:

From d97de31509f3394e72a8dfc066cf77aabe2e1122 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Fri, 7 Apr 2017 16:09:14 +0200
Subject: [PATCH 332/489] Add currency utilities and helpers.

---
 babel/core.py          |   1 +
 babel/numbers.py       | 109 ++++++++++++++++++++++++++++++++++++-----
 scripts/import_cldr.py |  14 ++++--
 tests/test_numbers.py  |  58 ++++++++++++++++++++++
 4 files changed, 166 insertions(+), 16 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index bb59b7413..5140f49d7 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -45,6 +45,7 @@ def get_global(key):
 
     The keys available are:
 
+    - ``all_currencies``
     - ``currency_fractions``
     - ``language_aliases``
     - ``likely_subtags``
diff --git a/babel/numbers.py b/babel/numbers.py
index a5d30ef26..9a60d721d 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -20,14 +20,89 @@
 #  - http://www.unicode.org/reports/tr35/ (Appendix G.6)
 import re
 from datetime import date as date_, datetime as datetime_
+from itertools import chain
 
 from babel.core import default_locale, Locale, get_global
-from babel._compat import decimal
+from babel._compat import decimal, string_types
+from babel.localedata import locale_identifiers
 
 
 LC_NUMERIC = default_locale('LC_NUMERIC')
 
 
+class UnknownCurrencyError(Exception):
+    """Exception thrown when a currency is requested for which no data is available.
+    """
+
+    def __init__(self, identifier):
+        """Create the exception.
+        :param identifier: the identifier string of the unsupported currency
+        """
+        Exception.__init__(self, 'Unknown currency %r.' % identifier)
+
+        #: The identifier of the locale that could not be found.
+        self.identifier = identifier
+
+
+def list_currencies(locale=None):
+    """ Return a `set` of normalized currency codes.
+
+    .. versionadded:: 2.5.0
+
+    :param locale: filters returned currency codes by the provided locale.
+                   Expected to be a locale instance or code. If no locale is
+                   provided, returns the list of all currencies from all
+                   locales.
+    """
+    # Get locale-scoped currencies.
+    if locale:
+        currencies = Locale.parse(locale).currencies.keys()
+    else:
+        currencies = get_global('all_currencies')
+    return set(currencies)
+
+
+def validate_currency(currency, locale=None):
+    """ Check the currency code is recognized by Babel.
+
+    Accepts a ``locale`` parameter for fined-grained validation, working as
+    the one defined above in ``list_currencies()`` method.
+
+    Raises a `ValueError` exception if the currency is unknown to Babel.
+    """
+    if currency not in list_currencies(locale):
+        raise UnknownCurrencyError(currency)
+
+
+def is_currency(currency, locale=None):
+    """ Returns `True` only if a currency is recognized by Babel.
+
+    This method always return a Boolean and never raise.
+    """
+    if not currency or not isinstance(currency, string_types):
+        return False
+    try:
+        validate_currency(currency, locale)
+    except UnknownCurrencyError:
+        return False
+    return True
+
+
+def normalize_currency(currency, locale=None):
+    """Returns the normalized sting of any currency code.
+
+    Accepts a ``locale`` parameter for fined-grained validation, working as
+    the one defined above in ``list_currencies()`` method.
+
+    Returns None if the currency is unknown to Babel.
+    """
+    if isinstance(currency, string_types):
+        currency = currency.upper()
+    if not is_currency(currency, locale):
+        return
+    return currency
+
+
 def get_currency_name(currency, count=None, locale=LC_NUMERIC):
     """Return the name used by the locale for the specified currency.
 
@@ -36,10 +111,10 @@ def get_currency_name(currency, count=None, locale=LC_NUMERIC):
 
     .. versionadded:: 0.9.4
 
-    :param currency: the currency code
+    :param currency: the currency code.
     :param count: the optional count.  If provided the currency name
                   will be pluralized to that number if possible.
-    :param locale: the `Locale` object or locale identifier
+    :param locale: the `Locale` object or locale identifier.
     """
     loc = Locale.parse(locale)
     if count is not None:
@@ -56,12 +131,26 @@ def get_currency_symbol(currency, locale=LC_NUMERIC):
     >>> get_currency_symbol('USD', locale='en_US')
     u'$'
 
-    :param currency: the currency code
-    :param locale: the `Locale` object or locale identifier
+    :param currency: the currency code.
+    :param locale: the `Locale` object or locale identifier.
     """
     return Locale.parse(locale).currency_symbols.get(currency, currency)
 
 
+def get_currency_precision(currency):
+    """Return currency's precision.
+
+    Precision is the number of decimals found after the decimal point in the
+    currency's format pattern.
+
+    .. versionadded:: 2.5.0
+
+    :param currency: the currency code.
+    """
+    precisions = get_global('currency_fractions')
+    return precisions.get(currency, precisions['DEFAULT'])[0]
+
+
 def get_territory_currencies(territory, start_date=None, end_date=None,
                              tender=True, non_tender=False,
                              include_details=False):
@@ -102,7 +191,7 @@ def get_territory_currencies(territory, start_date=None, end_date=None,
 
     .. versionadded:: 2.0
 
-    :param territory: the name of the territory to find the currency fo
+    :param territory: the name of the territory to find the currency for.
     :param start_date: the start date.  If not given today is assumed.
     :param end_date: the end date.  If not given the start date is assumed.
     :param tender: controls whether tender currencies should be included.
@@ -326,12 +415,8 @@ def format_currency(number, currency, format=None, locale=LC_NUMERIC,
             raise UnknownCurrencyFormatError("%r is not a known currency format"
                                              " type" % format_type)
     if currency_digits:
-        fractions = get_global('currency_fractions')
-        try:
-            digits = fractions[currency][0]
-        except KeyError:
-            digits = fractions['DEFAULT'][0]
-        frac = (digits, digits)
+        precision = get_currency_precision(currency)
+        frac = (precision, precision)
     else:
         frac = None
     return pattern.apply(number, locale, currency=currency, force_frac=frac)
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index b8041193f..7b9e7734b 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -12,6 +12,7 @@
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
 
+import collections
 from optparse import OptionParser
 import os
 import re
@@ -218,6 +219,7 @@ def parse_global(srcdir, sup):
     likely_subtags = global_data.setdefault('likely_subtags', {})
     territory_currencies = global_data.setdefault('territory_currencies', {})
     parent_exceptions = global_data.setdefault('parent_exceptions', {})
+    all_currencies = collections.defaultdict(set)
     currency_fractions = global_data.setdefault('currency_fractions', {})
     territory_languages = global_data.setdefault('territory_languages', {})
     bcp47_timezone = parse(os.path.join(srcdir, 'bcp47', 'timezone.xml'))
@@ -286,14 +288,18 @@ def parse_global(srcdir, sup):
         region_code = region.attrib['iso3166']
         region_currencies = []
         for currency in region.findall('./currency'):
+            cur_code = currency.attrib['iso4217']
             cur_start = _parse_currency_date(currency.attrib.get('from'))
             cur_end = _parse_currency_date(currency.attrib.get('to'))
-            region_currencies.append((currency.attrib['iso4217'],
-                                      cur_start, cur_end,
-                                      currency.attrib.get(
-                                          'tender', 'true') == 'true'))
+            cur_tender = currency.attrib.get('tender', 'true') == 'true'
+            # Tie region to currency.
+            region_currencies.append((cur_code, cur_start, cur_end, cur_tender))
+            # Keep a reverse index of currencies to territorie.
+            all_currencies[cur_code].add(region_code)
         region_currencies.sort(key=_currency_sort_key)
         territory_currencies[region_code] = region_currencies
+    global_data['all_currencies'] = dict([
+        (currency, tuple(sorted(regions))) for currency, regions in all_currencies.items()])
 
     # Explicit parent locales
     for paternity in sup.findall('.//parentLocales/parentLocale'):
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 2593cc017..5bcd1717d 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -17,6 +17,10 @@
 from datetime import date
 
 from babel import numbers
+from babel.numbers import (
+    list_currencies, validate_currency, UnknownCurrencyError, is_currency, normalize_currency, get_currency_precision)
+from babel.core import Locale
+from babel.localedata import locale_identifiers
 from babel._compat import decimal
 
 
@@ -162,6 +166,55 @@ def test_can_parse_decimals(self):
                           lambda: numbers.parse_decimal('2,109,998', locale='de'))
 
 
+def test_list_currencies():
+    assert isinstance(list_currencies(), set)
+    assert list_currencies().issuperset(['BAD', 'BAM', 'KRO'])
+
+    assert isinstance(list_currencies(locale='fr'), set)
+    assert list_currencies('fr').issuperset(['BAD', 'BAM', 'KRO'])
+
+    with pytest.raises(ValueError) as excinfo:
+        list_currencies('yo!')
+    assert excinfo.value.args[0] == "expected only letters, got 'yo!'"
+
+    assert list_currencies(locale='pa_Arab') == set(['PKR', 'INR', 'EUR'])
+    assert list_currencies(locale='kok') == set([])
+
+    assert len(list_currencies()) == 296
+
+
+def test_validate_currency():
+    validate_currency('EUR')
+
+    with pytest.raises(UnknownCurrencyError) as excinfo:
+        validate_currency('FUU')
+    assert excinfo.value.args[0] == "Unknown currency 'FUU'."
+
+
+def test_is_currency():
+    assert is_currency('EUR') == True
+    assert is_currency('eUr') == False
+    assert is_currency('FUU') == False
+    assert is_currency('') == False
+    assert is_currency(None) == False
+    assert is_currency('   EUR    ') == False
+    assert is_currency('   ') == False
+    assert is_currency([]) == False
+    assert is_currency(set()) == False
+
+
+def test_normalize_currency():
+    assert normalize_currency('EUR') == 'EUR'
+    assert normalize_currency('eUr') == 'EUR'
+    assert normalize_currency('FUU') == None
+    assert normalize_currency('') == None
+    assert normalize_currency(None) == None
+    assert normalize_currency('   EUR    ') == None
+    assert normalize_currency('   ') == None
+    assert normalize_currency([]) == None
+    assert normalize_currency(set()) == None
+
+
 def test_get_currency_name():
     assert numbers.get_currency_name('USD', locale='en_US') == u'US Dollar'
     assert numbers.get_currency_name('USD', count=2, locale='en_US') == u'US dollars'
@@ -171,6 +224,11 @@ def test_get_currency_symbol():
     assert numbers.get_currency_symbol('USD', 'en_US') == u'$'
 
 
+def test_get_currency_precision():
+    assert get_currency_precision('EUR') == 2
+    assert get_currency_precision('JPY') == 0
+
+
 def test_get_territory_currencies():
     assert numbers.get_territory_currencies('AT', date(1995, 1, 1)) == ['ATS']
     assert numbers.get_territory_currencies('AT', date(2011, 1, 1)) == ['EUR']

From be718f3a7b2b71e936dcc3b498b7013537aa9036 Mon Sep 17 00:00:00 2001
From: Roy Williams <rwilliams@lyft.com>
Date: Fri, 26 May 2017 17:04:27 -0700
Subject: [PATCH 333/489] Fix an invalid string to bytes comparison in Python 3

In Python 3 this branch would never evaluate to `True` due to comparing a string to bytes.

This was flagged by running some unit tests with the `-bb` flag, so I've added
`-bb` to run with the babel unit tests in Python3.5

Here's some docs on the `-bb` flag:
https://docs.python.org/3.5/library/warnings.html#default-warning-filters
https://docs.python.org/3/howto/pyporting.html#use-continuous-integration-to-stay-compatible
---
 .travis.yml              | 2 ++
 Makefile                 | 4 ++--
 babel/localtime/_unix.py | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08ac545df..1f690426b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,8 @@ matrix:
       python: 3.4
     - os: linux
       python: 3.5
+      env:
+      - PYTHON_TEST_FLAGS=-bb
 
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
diff --git a/Makefile b/Makefile
index 74b9a673d..eafaeb48d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 test: import-cldr
-	@PYTHONWARNINGS=default python -m pytest
+	@PYTHONWARNINGS=default python ${PYTHON_TEST_FLAGS} -m pytest
 
 test-cov: import-cldr
-	@PYTHONWARNINGS=default python -m pytest --cov=babel
+	@PYTHONWARNINGS=default python ${PYTHON_TEST_FLAGS} -m pytest --cov=babel
 
 test-env:
 	@virtualenv test-env
diff --git a/babel/localtime/_unix.py b/babel/localtime/_unix.py
index e0b54fb28..8a8b4e967 100644
--- a/babel/localtime/_unix.py
+++ b/babel/localtime/_unix.py
@@ -87,7 +87,7 @@ def _get_localzone(_root='/'):
 
             # Issue #3 in tzlocal was that /etc/timezone was a zoneinfo file.
             # That's a misconfiguration, but we need to handle it gracefully:
-            if data[:5] != 'TZif2':
+            if data[:5] != b'TZif2':
                 etctz = data.strip().decode()
                 # Get rid of host definitions and comments:
                 if ' ' in etctz:

From c3422e8103cb662015e84f5a5ffc29b4333aa062 Mon Sep 17 00:00:00 2001
From: Wolfgang Doll <wolfgang.doll@web.de>
Date: Fri, 23 Jun 2017 12:03:23 +0200
Subject: [PATCH 334/489] Introduce PyInstaller support. Fixes #500

Add a get_base_dir function that works in the context of
PyInstaller, where the __file__ system variable is
not available.
---
 babel/core.py            |  2 +-
 babel/localedata.py      | 12 +++++++++++-
 tests/test_localedata.py | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 5140f49d7..df03b24ad 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -68,7 +68,7 @@ def get_global(key):
     """
     global _global_data
     if _global_data is None:
-        dirname = os.path.join(os.path.dirname(__file__))
+        dirname = localedata.get_base_dir()
         filename = os.path.join(dirname, 'global.dat')
         if not os.path.isfile(filename):
             _raise_no_data_error()
diff --git a/babel/localedata.py b/babel/localedata.py
index 9e272a279..46582212d 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -16,13 +16,23 @@
 import threading
 from collections import MutableMapping
 from itertools import chain
+import sys
 
 from babel._compat import pickle
 
 
+def get_base_dir():
+    if getattr(sys, 'frozen', False):
+        # we are running in a |PyInstaller| bundle
+        basedir = sys._MEIPASS
+    else:
+        # we are running in a normal Python environment
+        basedir = os.path.dirname(__file__)
+    return basedir
+
 _cache = {}
 _cache_lock = threading.RLock()
-_dirname = os.path.join(os.path.dirname(__file__), 'locale-data')
+_dirname = os.path.join(get_base_dir(), 'locale-data')
 
 
 def normalize_locale(name):
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 6a41ac2ad..a23987f28 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -14,6 +14,7 @@
 import unittest
 import random
 from operator import methodcaller
+import sys
 
 from babel import localedata
 
@@ -94,3 +95,16 @@ def test_mixedcased_locale():
         locale_id = ''.join([
             methodcaller(random.choice(['lower', 'upper']))(c) for c in l])
         assert localedata.exists(locale_id)
+
+def test_pi_support_frozen():
+    sys._MEIPASS, sys.frozen = 'testdir', True
+    try:
+        assert localedata.get_base_dir() == 'testdir'
+    finally:
+        del sys._MEIPASS
+        del sys.frozen
+
+
+def test_pi_support_not_frozen():
+    assert not getattr(sys, 'frozen', False)
+    assert localedata.get_base_dir().endswith('babel')

From ac0c327baff434acb6cbd16d578476e458feb301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Magimel?= <magimel.francois@gmail.com>
Date: Sun, 16 Jul 2017 18:20:31 +0200
Subject: [PATCH 335/489] Doc: always redirect to the python gettext module

The link to the python gettext module was dead. So, redirect the user
to the official doc.
---
 docs/messages.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/messages.rst b/docs/messages.rst
index 6814425c5..f1f695c24 100644
--- a/docs/messages.rst
+++ b/docs/messages.rst
@@ -273,11 +273,9 @@ Translator Comments
 -------------------
 
 First of all what are comments tags. Comments tags are excerpts of text to
-search for in comments, only comments, right before the `python gettext`_
+search for in comments, only comments, right before the python :mod:`gettext`
 calls, as shown on the following example:
 
- .. _`python gettext`: http://docs.python.org/lib/module-gettext.html
-
 .. code-block:: python
 
     # NOTE: This is a comment about `Foo Bar`

From df9111e74ac7edd46aa566e2f3e2db3fb2695a91 Mon Sep 17 00:00:00 2001
From: Narayan Acharya <narayan.acharya6@gmail.com>
Date: Thu, 3 Aug 2017 13:52:57 +0530
Subject: [PATCH 336/489] Fix "Good Commits" link in CONTRIBUTING.md (#511)

Closes https://github.com/python-babel/babel/issues/345
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c72ec2573..c1b7e6959 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -51,5 +51,5 @@ shall be amended so the history is not cluttered by "fixup commits".
 ## Writing Good Commits
 
 Please see
-https://coala.readthedocs.io/en/latest/Getting_Involved/Writing_Good_Commits.html
+http://api.coala.io/en/latest/Developers/Writing_Good_Commits.html
 for guidelines on how to write good commits and proper commit messages.

From 5f3b00854bbc6fa6a03e04ab572a609eebcc1f72 Mon Sep 17 00:00:00 2001
From: Stefane Fermigier <sf@fermigier.com>
Date: Thu, 3 Aug 2017 20:22:46 +0200
Subject: [PATCH 337/489] Add __str__ to DateTimePattern (#515)

Fixes #514
---
 babel/dates.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index c84ca4865..75e53a1d7 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -27,8 +27,7 @@
 
 from babel.core import default_locale, get_global, Locale
 from babel.util import UTC, LOCALTZ
-from babel._compat import string_types, integer_types, number_types
-
+from babel._compat import string_types, integer_types, number_types, PY2
 
 # "If a given short metazone form is known NOT to be understood in a given
 #  locale and the parent locale has this value such that it would normally
@@ -1218,6 +1217,12 @@ def __repr__(self):
     def __unicode__(self):
         return self.pattern
 
+    def __str__(self):
+        pat = self.pattern
+        if PY2:
+            pat = pat.encode('utf-8')
+        return pat
+
     def __mod__(self, other):
         if type(other) is not DateTimeFormat:
             return NotImplemented

From 56b5b4178b91cd992db743496d22c436bffd7af7 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 18 Aug 2017 11:05:45 +0300
Subject: [PATCH 338/489] Use Py.test's monkeypatch for PyInstaller tests

---
 tests/test_localedata.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index a23987f28..62ad93c54 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -96,13 +96,11 @@ def test_mixedcased_locale():
             methodcaller(random.choice(['lower', 'upper']))(c) for c in l])
         assert localedata.exists(locale_id)
 
-def test_pi_support_frozen():
-    sys._MEIPASS, sys.frozen = 'testdir', True
-    try:
-        assert localedata.get_base_dir() == 'testdir'
-    finally:
-        del sys._MEIPASS
-        del sys.frozen
+
+def test_pi_support_frozen(monkeypatch):
+    monkeypatch.setattr(sys, '_MEIPASS', 'testdir', raising=False)
+    monkeypatch.setattr(sys, 'frozen', True, raising=False)
+    assert localedata.get_base_dir() == 'testdir'
 
 
 def test_pi_support_not_frozen():

From 230e1f765b59bc8682f887ba0653921e6f442381 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 18 Aug 2017 11:34:06 +0300
Subject: [PATCH 339/489] Date format: Use * parametrized format patterns
 instead of %%0%... (#517)

This is about 60% faster than the old version in a micro-benchmark.
---
 babel/dates.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 75e53a1d7..d1fafe2a7 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1330,14 +1330,14 @@ def format_year(self, char, num):
     def format_quarter(self, char, num):
         quarter = (self.value.month - 1) // 3 + 1
         if num <= 2:
-            return ('%%0%dd' % num) % quarter
+            return '%0*d' % (num, quarter)
         width = {3: 'abbreviated', 4: 'wide', 5: 'narrow'}[num]
         context = {'Q': 'format', 'q': 'stand-alone'}[char]
         return get_quarter_names(width, context, self.locale)[quarter]
 
     def format_month(self, char, num):
         if num <= 2:
-            return ('%%0%dd' % num) % self.value.month
+            return '%0*d' % (num, self.value.month)
         width = {3: 'abbreviated', 4: 'wide', 5: 'narrow'}[num]
         context = {'M': 'format', 'L': 'stand-alone'}[char]
         return get_month_names(width, context, self.locale)[self.value.month]
@@ -1470,7 +1470,7 @@ def format_timezone(self, char, num):
                 return get_timezone_gmt(self.value, width='iso8601', locale=self.locale)
 
     def format(self, value, length):
-        return ('%%0%dd' % length) % value
+        return '%0*d' % (length, value)
 
     def get_day_of_year(self, date=None):
         if date is None:

From e6a926a78d7286b84ff482ed1f61131518532190 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 18 Aug 2017 11:58:20 +0300
Subject: [PATCH 340/489] Become 2.5.0 (#518)

---
 CHANGES           | 24 ++++++++++++++++++++++++
 babel/__init__.py |  2 +-
 docs/conf.py      |  4 ++--
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 479ea708e..99f8db0fe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,30 @@
 Babel Changelog
 ===============
 
+Version 2.5.0
+-------------
+
+New Features
+~~~~~~~~~~~~
+
+* Numbers: Add currency utilities and helpers (#491) (@kdeldycke)
+* Support PyInstaller (#500, #505) (@wodo)
+
+Minor Improvements and bugfixes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Dates: Add __str__ to DateTimePattern (#515) (@sfermigier)
+* Dates: Fix an invalid string to bytes comparison when parsing TZ files on Py3 (#498) (@rowillia)
+* Dates: Formatting zero-padded components of dates is faster (#517) (@akx)
+* Documentation: Fix "Good Commits" link in CONTRIBUTING.md (#511) (@naryanacharya6)
+* Documentation: Fix link to Python gettext module (#512) (@Linkid)
+* Messages: Allow both dash and underscore separated locale identifiers in pofiles (#489, #490) (@akx)
+* Messages: Extract Python messages in nested gettext calls (#488) (@sublee)
+* Messages: Fix in-place editing of dir list while iterating (#476, #492) (@MarcDufresne)
+* Messages: Stabilize sort order (#482) (@xavfernandez)
+* Time zones: Honor the no-inherit marker for metazone names (#405) (@akx)
+
+
 Version 2.4.0
 -------------
 
diff --git a/babel/__init__.py b/babel/__init__.py
index b9f96b9e0..1b367c0f4 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.4.0'
+__version__ = '2.5.0'
diff --git a/docs/conf.py b/docs/conf.py
index 33d9a6741..e54842953 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.4'
+version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.4.0'
+release = '2.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 1da04fd0af20162fe4e2b503a5fcae8f25267010 Mon Sep 17 00:00:00 2001
From: Narendra Vardi <narendravardi@users.noreply.github.com>
Date: Fri, 18 Aug 2017 20:18:26 +0530
Subject: [PATCH 341/489] Use a fixed datetime to avoid test failures (#520)

freezegun library added to travis build and appveyor

Fixes #507
---
 .ci/appveyor.yml                |  2 +-
 .travis.yml                     |  2 +-
 tests/messages/test_frontend.py | 46 ++++++++++++++++++++++-----------
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index e0db91381..2dfbdd884 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -27,7 +27,7 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   # Build data files
-  - "pip install --upgrade pytest==2.8.5 pytest-cov==2.2.0 codecov"
+  - "pip install --upgrade pytest==2.8.5 pytest-cov==2.2.0 codecov freezegun==0.3.9"
   - "pip install --editable ."
   - "python setup.py import_cldr"
 
diff --git a/.travis.yml b/.travis.yml
index 1f690426b..b7eff7d94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ matrix:
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
-  - pip install --upgrade pytest==2.8.5 pytest-cov==2.2.0 $CDECIMAL
+  - pip install --upgrade pytest==2.8.5 pytest-cov==2.2.0 $CDECIMAL freezegun==0.3.9
   - pip install --editable .
 
 script:
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index ef3c00b85..20904a350 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -11,6 +11,7 @@
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
 import shlex
+from freezegun import freeze_time
 from datetime import datetime
 from distutils.dist import Distribution
 from distutils.errors import DistutilsOptionError
@@ -149,6 +150,7 @@ def test_input_dirs_is_mutually_exclusive_with_input_paths(self):
         self.cmd.output_file = self._pot_file()
         self.assertRaises(DistutilsOptionError, self.cmd.finalize_options)
 
+    @freeze_time("1994-11-11")
     def test_extraction_with_default_mapping(self):
         self.cmd.copyright_holder = 'FooBar, Inc.'
         self.cmd.msgid_bugs_address = 'bugs.address@email.tld'
@@ -200,12 +202,13 @@ def test_extraction_with_default_mapping(self):
 
 """ % {'version': VERSION,
             'year': time.strftime('%Y'),
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(self._pot_file(), 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    @freeze_time("1994-11-11")
     def test_extraction_with_mapping_file(self):
         self.cmd.copyright_holder = 'FooBar, Inc.'
         self.cmd.msgid_bugs_address = 'bugs.address@email.tld'
@@ -252,12 +255,13 @@ def test_extraction_with_mapping_file(self):
 
 """ % {'version': VERSION,
             'year': time.strftime('%Y'),
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(self._pot_file(), 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    @freeze_time("1994-11-11")
     def test_extraction_with_mapping_dict(self):
         self.dist.message_extractors = {
             'project': [
@@ -309,7 +313,7 @@ def test_extraction_with_mapping_dict(self):
 
 """ % {'version': VERSION,
             'year': time.strftime('%Y'),
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(self._pot_file(), 'U') as f:
             actual_content = f.read()
@@ -388,6 +392,7 @@ def test_no_locale(self):
         self.cmd.output_file = 'dummy'
         self.assertRaises(DistutilsOptionError, self.cmd.finalize_options)
 
+    @freeze_time("1994-11-11")
     def test_with_output_dir(self):
         self.cmd.input_file = 'project/i18n/messages.pot'
         self.cmd.locale = 'en_US'
@@ -433,12 +438,13 @@ def test_with_output_dir(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    @freeze_time("1994-11-11")
     def test_keeps_catalog_non_fuzzy(self):
         self.cmd.input_file = 'project/i18n/messages_non_fuzzy.pot'
         self.cmd.locale = 'en_US'
@@ -484,12 +490,13 @@ def test_keeps_catalog_non_fuzzy(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    @freeze_time("1994-11-11")
     def test_correct_init_more_than_2_plurals(self):
         self.cmd.input_file = 'project/i18n/messages.pot'
         self.cmd.locale = 'lv_LV'
@@ -537,12 +544,13 @@ def test_correct_init_more_than_2_plurals(self):
 msgstr[2] ""
 
 """ % {'version': VERSION,
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    @freeze_time("1994-11-11")
     def test_correct_init_singular_plural_forms(self):
         self.cmd.input_file = 'project/i18n/messages.pot'
         self.cmd.locale = 'ja_JP'
@@ -587,12 +595,13 @@ def test_correct_init_singular_plural_forms(self):
 msgstr[0] ""
 
 """ % {'version': VERSION,
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='ja_JP')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    @freeze_time("1994-11-11")
     def test_supports_no_wrap(self):
         self.cmd.input_file = 'project/i18n/long_messages.pot'
         self.cmd.locale = 'en_US'
@@ -646,13 +655,14 @@ def test_supports_no_wrap(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en_US'),
             'long_message': long_message}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    @freeze_time("1994-11-11")
     def test_supports_width(self):
         self.cmd.input_file = 'project/i18n/long_messages.pot'
         self.cmd.locale = 'en_US'
@@ -705,7 +715,7 @@ def test_supports_width(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en_US'),
             'long_message': long_message}
         with open(po_file, 'U') as f:
@@ -817,6 +827,7 @@ def _pot_file(self):
     def assert_pot_file_exists(self):
         assert os.path.isfile(self._pot_file())
 
+    @freeze_time("1994-11-11")
     def test_extract_with_default_mapping(self):
         pot_file = self._pot_file()
         self.cli.run(sys.argv + ['extract',
@@ -866,12 +877,13 @@ def test_extract_with_default_mapping(self):
 
 """ % {'version': VERSION,
             'year': time.strftime('%Y'),
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(pot_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    @freeze_time("1994-11-11")
     def test_extract_with_mapping_file(self):
         pot_file = self._pot_file()
         self.cli.run(sys.argv + ['extract',
@@ -916,12 +928,13 @@ def test_extract_with_mapping_file(self):
 
 """ % {'version': VERSION,
             'year': time.strftime('%Y'),
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(pot_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    @freeze_time("1994-11-11")
     def test_extract_with_exact_file(self):
         """Tests that we can call extract with a particular file and only
         strings from that file get extracted. (Note the absence of strings from file1.py)
@@ -964,12 +977,13 @@ def test_extract_with_exact_file(self):
 
 """ % {'version': VERSION,
             'year': time.strftime('%Y'),
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(pot_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    @freeze_time("1994-11-11")
     def test_init_with_output_dir(self):
         po_file = self._po_file('en_US')
         self.cli.run(sys.argv + ['init',
@@ -1011,7 +1025,7 @@ def test_init_with_output_dir(self):
 msgstr[1] ""
 
 """ % {'version': VERSION,
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
@@ -1020,6 +1034,7 @@ def test_init_with_output_dir(self):
     def _i18n_dir(self):
         return os.path.join(self.datadir, 'project', 'i18n')
 
+    @freeze_time("1994-11-11")
     def test_init_singular_plural_forms(self):
         po_file = self._po_file('ja_JP')
         self.cli.run(sys.argv + ['init',
@@ -1060,12 +1075,13 @@ def test_init_singular_plural_forms(self):
 msgstr[0] ""
 
 """ % {'version': VERSION,
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
+    @freeze_time("1994-11-11")
     def test_init_more_than_2_plural_forms(self):
         po_file = self._po_file('lv_LV')
         self.cli.run(sys.argv + ['init',
@@ -1109,7 +1125,7 @@ def test_init_more_than_2_plural_forms(self):
 msgstr[2] ""
 
 """ % {'version': VERSION,
-            'date': format_datetime(datetime.now(LOCALTZ), 'yyyy-MM-dd HH:mmZ',
+            'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
         with open(po_file, 'U') as f:
             actual_content = f.read()

From 231d337b569b15b9437cfefee6584ad8d54d0cd3 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 21 Aug 2017 16:25:51 +0300
Subject: [PATCH 342/489] Parse multi-line __future__ imports better (#519)

Augments #426
Augments #427
Augments #510
---
 babel/util.py      | 17 +++++++++++++++--
 tests/test_util.py | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/babel/util.py b/babel/util.py
index 996f902b2..af8c762ec 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -109,10 +109,23 @@ def parse_future_flags(fp, encoding='latin-1'):
     flags = 0
     try:
         body = fp.read().decode(encoding)
+
+        # Fix up the source to be (hopefully) parsable by regexpen.
+        # This will likely do untoward things if the source code itself is broken.
+
+        # (1) Fix `import (\n...` to be `import (...`.
+        body = re.sub(r'import\s*\([\r\n]+', 'import (', body)
+        # (2) Join line-ending commas with the next line.
+        body = re.sub(r',\s*[\r\n]+', ', ', body)
+        # (3) Remove backslash line continuations.
+        body = re.sub(r'\\\s*[\r\n]+', ' ', body)
+
         for m in PYTHON_FUTURE_IMPORT_re.finditer(body):
-            names = [x.strip() for x in m.group(1).split(',')]
+            names = [x.strip().strip('()') for x in m.group(1).split(',')]
             for name in names:
-                flags |= getattr(__future__, name).compiler_flag
+                feature = getattr(__future__, name, None)
+                if feature:
+                    flags |= feature.compiler_flag
     finally:
         fp.seek(pos)
     return flags
diff --git a/tests/test_util.py b/tests/test_util.py
index 068a102ea..4c769bea3 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -13,8 +13,11 @@
 
 import unittest
 
+import pytest
+
 from babel import util
 from babel._compat import BytesIO
+from babel.util import parse_future_flags
 
 
 def test_distinct():
@@ -69,3 +72,34 @@ def test_parse_encoding_undefined():
 
 def test_parse_encoding_non_ascii():
     assert parse_encoding(u'K\xf6ln') is None
+
+
+@pytest.mark.parametrize('source, result', [
+    ('''
+from __future__ import print_function,
+    division, with_statement,
+    unicode_literals
+''', 0x10000 | 0x2000 | 0x8000 | 0x20000),
+    ('''
+from __future__ import print_function, division
+print('hello')
+''', 0x10000 | 0x2000),
+    ('''
+from __future__ import print_function, division, unknown,,,,,
+print 'hello'
+''', 0x10000 | 0x2000),
+    ('''
+from __future__ import (
+    print_function,
+    division)
+''', 0x10000 | 0x2000),
+    ('''
+from __future__ import \\
+    print_function, \\
+    division
+''', 0x10000 | 0x2000),
+])
+def test_parse_future(source, result):
+    fp = BytesIO(source.encode('latin-1'))
+    flags = parse_future_flags(fp)
+    assert flags == result

From c7729ccbce85e5736a9a7de18321872dd1ed09d5 Mon Sep 17 00:00:00 2001
From: Simeon Visser <svisser@users.noreply.github.com>
Date: Mon, 28 Aug 2017 20:35:32 +0100
Subject: [PATCH 343/489] Fixed docstring of validate_currency function (#522)

---
 babel/numbers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 9a60d721d..8728699fb 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -68,7 +68,7 @@ def validate_currency(currency, locale=None):
     Accepts a ``locale`` parameter for fined-grained validation, working as
     the one defined above in ``list_currencies()`` method.
 
-    Raises a `ValueError` exception if the currency is unknown to Babel.
+    Raises a `UnknownCurrencyError` exception if the currency is unknown to Babel.
     """
     if currency not in list_currencies(locale):
         raise UnknownCurrencyError(currency)

From 1903a2bc514f9b5cf2559be65dff965cf5284bd0 Mon Sep 17 00:00:00 2001
From: Jungmo Ku <suhojm@utexas.edu>
Date: Tue, 12 Sep 2017 08:25:24 -0500
Subject: [PATCH 344/489] Allow normalize_locale and exists to handle various
 unexpected input (#523)

Resolves #521
---
 babel/localedata.py      |  6 +++++-
 tests/test_localedata.py | 17 ++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/babel/localedata.py b/babel/localedata.py
index 46582212d..ae2154781 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -18,7 +18,7 @@
 from itertools import chain
 import sys
 
-from babel._compat import pickle
+from babel._compat import pickle, string_types
 
 
 def get_base_dir():
@@ -41,6 +41,8 @@ def normalize_locale(name):
     Returns the normalized locale ID string or `None` if the ID is not
     recognized.
     """
+    if not name or not isinstance(name, string_types):
+        return None
     name = name.strip().lower()
     for locale_id in chain.from_iterable([_cache, locale_identifiers()]):
         if name == locale_id.lower():
@@ -54,6 +56,8 @@ def exists(name):
 
     :param name: the locale identifier string
     """
+    if not name or not isinstance(name, string_types):
+        return False
     if name in _cache:
         return True
     file_found = os.path.exists(os.path.join(_dirname, '%s.dat' % name))
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 62ad93c54..3599b2157 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -16,8 +16,7 @@
 from operator import methodcaller
 import sys
 
-from babel import localedata
-
+from babel import localedata, numbers
 
 class MergeResolveTestCase(unittest.TestCase):
 
@@ -80,7 +79,6 @@ def test_locale_identification():
     for l in localedata.locale_identifiers():
         assert localedata.exists(l)
 
-
 def test_unique_ids():
     # Check all locale IDs are uniques.
     all_ids = localedata.locale_identifiers()
@@ -106,3 +104,16 @@ def test_pi_support_frozen(monkeypatch):
 def test_pi_support_not_frozen():
     assert not getattr(sys, 'frozen', False)
     assert localedata.get_base_dir().endswith('babel')
+
+def test_locale_argument_acceptance():
+    # Testing None input.
+    normalized_locale = localedata.normalize_locale(None)
+    assert normalized_locale == None
+    locale_exist = localedata.exists(None)
+    assert locale_exist == False
+
+    # # Testing list input.
+    normalized_locale = localedata.normalize_locale(['en_us', None])
+    assert normalized_locale == None
+    locale_exist = localedata.exists(['en_us', None])
+    assert locale_exist == False

From 0b34807ab3d9681bb653ac535e0fbc6f0ac3ffbb Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 14 Sep 2017 12:47:05 +0300
Subject: [PATCH 345/489] Also check for `sys._MEIPASS` before assuming
 PyInstallerness (#526)

Fixes #525
---
 babel/localedata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/localedata.py b/babel/localedata.py
index ae2154781..4b6d3b68a 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -22,7 +22,7 @@
 
 
 def get_base_dir():
-    if getattr(sys, 'frozen', False):
+    if getattr(sys, 'frozen', False) and getattr(sys, '_MEIPASS', None):
         # we are running in a |PyInstaller| bundle
         basedir = sys._MEIPASS
     else:

From f29eccd6b6edd031e43ccd1bcf92513221b66df6 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 14 Sep 2017 13:04:32 +0300
Subject: [PATCH 346/489] Become 2.5.1 (#527)

---
 CHANGES           | 13 +++++++++++++
 babel/__init__.py |  2 +-
 docs/conf.py      |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 99f8db0fe..0efd2044c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,19 @@
 Babel Changelog
 ===============
 
+Version 2.5.1
+-------------
+
+Minor Improvements and bugfixes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Use a fixed datetime to avoid test failures (#520) (@narendravardi)
+* Parse multi-line __future__ imports better (#519) (@akx)
+* Fix validate_currency docstring (#522)
+* Allow normalize_locale and exists to handle various unexpected inputs (#523) (@suhojm)
+* Make PyInstaller support more robust (#525, #526) (@thijstriemstra, @akx)
+
+
 Version 2.5.0
 -------------
 
diff --git a/babel/__init__.py b/babel/__init__.py
index 1b367c0f4..ba972b5a4 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.5.0'
+__version__ = '2.5.1'
diff --git a/docs/conf.py b/docs/conf.py
index e54842953..a0220168a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.5.0'
+release = '2.5.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 7cedb84c7fd29ccb765aa9e408fcdd23bce2af06 Mon Sep 17 00:00:00 2001
From: Jakob Schnitzer <mail@jakobschnitzer.de>
Date: Thu, 28 Sep 2017 19:17:42 +0200
Subject: [PATCH 347/489] Revert "Also check for `sys._MEIPASS` before assuming
 PyInstallerness (#526)"

This reverts commit 0b34807ab3d9681bb653ac535e0fbc6f0ac3ffbb.
---
 babel/localedata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/localedata.py b/babel/localedata.py
index 4b6d3b68a..ae2154781 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -22,7 +22,7 @@
 
 
 def get_base_dir():
-    if getattr(sys, 'frozen', False) and getattr(sys, '_MEIPASS', None):
+    if getattr(sys, 'frozen', False):
         # we are running in a |PyInstaller| bundle
         basedir = sys._MEIPASS
     else:

From 29da2d2d47b43dd71e5b696cb6b9cca90b4446c2 Mon Sep 17 00:00:00 2001
From: Jakob Schnitzer <mail@jakobschnitzer.de>
Date: Thu, 28 Sep 2017 19:18:32 +0200
Subject: [PATCH 348/489] Revert "Merge pull request #505 from wodo/pi_support"

This reverts commit 653e6d4f654f0f3cbce57054654e09c519b9e412, reversing
changes made to 5f3b00854bbc6fa6a03e04ab572a609eebcc1f72.
---
 babel/core.py            |  2 +-
 babel/localedata.py      | 12 +-----------
 tests/test_localedata.py | 12 ------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index df03b24ad..5140f49d7 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -68,7 +68,7 @@ def get_global(key):
     """
     global _global_data
     if _global_data is None:
-        dirname = localedata.get_base_dir()
+        dirname = os.path.join(os.path.dirname(__file__))
         filename = os.path.join(dirname, 'global.dat')
         if not os.path.isfile(filename):
             _raise_no_data_error()
diff --git a/babel/localedata.py b/babel/localedata.py
index ae2154781..0c94e49ea 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -16,23 +16,13 @@
 import threading
 from collections import MutableMapping
 from itertools import chain
-import sys
 
 from babel._compat import pickle, string_types
 
 
-def get_base_dir():
-    if getattr(sys, 'frozen', False):
-        # we are running in a |PyInstaller| bundle
-        basedir = sys._MEIPASS
-    else:
-        # we are running in a normal Python environment
-        basedir = os.path.dirname(__file__)
-    return basedir
-
 _cache = {}
 _cache_lock = threading.RLock()
-_dirname = os.path.join(get_base_dir(), 'locale-data')
+_dirname = os.path.join(os.path.dirname(__file__), 'locale-data')
 
 
 def normalize_locale(name):
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 3599b2157..6954d3886 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -14,7 +14,6 @@
 import unittest
 import random
 from operator import methodcaller
-import sys
 
 from babel import localedata, numbers
 
@@ -94,17 +93,6 @@ def test_mixedcased_locale():
             methodcaller(random.choice(['lower', 'upper']))(c) for c in l])
         assert localedata.exists(locale_id)
 
-
-def test_pi_support_frozen(monkeypatch):
-    monkeypatch.setattr(sys, '_MEIPASS', 'testdir', raising=False)
-    monkeypatch.setattr(sys, 'frozen', True, raising=False)
-    assert localedata.get_base_dir() == 'testdir'
-
-
-def test_pi_support_not_frozen():
-    assert not getattr(sys, 'frozen', False)
-    assert localedata.get_base_dir().endswith('babel')
-
 def test_locale_argument_acceptance():
     # Testing None input.
     normalized_locale = localedata.normalize_locale(None)

From a53fd344c988d8ad0ec7eeabcaf010c6ccb9c9e9 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Mon, 16 Oct 2017 10:45:15 +0200
Subject: [PATCH 349/489] Keep tox dependencies in sync with travis config.

Refs 1da04fd0af20162fe4e2b503a5fcae8f25267010 and #520.
---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 812561da7..537465823 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@ envlist = py26, py27, pypy, py33, py34, py26-cdecimal, py27-cdecimal
 deps =
     pytest
     cdecimal: m3-cdecimal
+    freezegun
 whitelist_externals = make
 commands = make clean-cldr test
 

From cf03578b117f92f0af23ae07a65c3e2eada5c30c Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Fri, 7 Apr 2017 16:09:14 +0200
Subject: [PATCH 350/489] Refactor decimal handling code.

---
 babel/numbers.py      | 172 +++++++++++++++++++++++++++++-------------
 tests/test_numbers.py | 146 +++++++++++++++++++++++++++++++++--
 2 files changed, 259 insertions(+), 59 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 8728699fb..036513217 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -21,11 +21,18 @@
 import re
 from datetime import date as date_, datetime as datetime_
 from itertools import chain
+import warnings
+from itertools import chain
 
 from babel.core import default_locale, Locale, get_global
 from babel._compat import decimal, string_types
 from babel.localedata import locale_identifiers
 
+try:
+    long
+except NameError:
+    long = int
+
 
 LC_NUMERIC = default_locale('LC_NUMERIC')
 
@@ -304,14 +311,25 @@ def format_number(number, locale=LC_NUMERIC):
     >>> format_number(1099, locale='de_DE')
     u'1.099'
 
+    .. deprecated:: 2.6.0
+
+       Use babel.numbers.format_decimal() instead.
 
     :param number: the number to format
     :param locale: the `Locale` object or locale identifier
+
+
     """
-    # Do we really need this one?
+    warnings.warn('Use babel.numbers.format_decimal() instead.', DeprecationWarning)
     return format_decimal(number, locale=locale)
 
 
+def get_decimal_quantum(precision):
+    """Return minimal quantum of a number, as defined by precision."""
+    assert isinstance(precision, (int, long, decimal.Decimal))
+    return decimal.Decimal(10) ** (-precision)
+
+
 def format_decimal(number, format=None, locale=LC_NUMERIC):
     u"""Return the given decimal number formatted for a specific locale.
 
@@ -412,14 +430,11 @@ def format_currency(number, currency, format=None, locale=LC_NUMERIC,
         try:
             pattern = locale.currency_formats[format_type]
         except KeyError:
-            raise UnknownCurrencyFormatError("%r is not a known currency format"
-                                             " type" % format_type)
-    if currency_digits:
-        precision = get_currency_precision(currency)
-        frac = (precision, precision)
-    else:
-        frac = None
-    return pattern.apply(number, locale, currency=currency, force_frac=frac)
+            raise UnknownCurrencyFormatError(
+                "%r is not a known currency format type" % format_type)
+
+    return pattern.apply(
+        number, locale, currency=currency, currency_digits=currency_digits)
 
 
 def format_percent(number, format=None, locale=LC_NUMERIC):
@@ -456,7 +471,7 @@ def format_scientific(number, format=None, locale=LC_NUMERIC):
 
     The format pattern can also be specified explicitly:
 
-    >>> format_scientific(1234567, u'##0E00', locale='en_US')
+    >>> format_scientific(1234567, u'##0.##E00', locale='en_US')
     u'1.23E06'
 
     :param number: the number to format
@@ -615,7 +630,6 @@ def parse_precision(p):
     int_prec = parse_precision(integer)
     frac_prec = parse_precision(fraction)
     if exp:
-        frac_prec = parse_precision(integer + fraction)
         exp_plus = exp.startswith('+')
         exp = exp.lstrip('+')
         exp_prec = parse_precision(exp)
@@ -633,6 +647,7 @@ class NumberPattern(object):
 
     def __init__(self, pattern, prefix, suffix, grouping,
                  int_prec, frac_prec, exp_prec, exp_plus):
+        # Metadata of the decomposed parsed pattern.
         self.pattern = pattern
         self.prefix = prefix
         self.suffix = suffix
@@ -641,68 +656,108 @@ def __init__(self, pattern, prefix, suffix, grouping,
         self.frac_prec = frac_prec
         self.exp_prec = exp_prec
         self.exp_plus = exp_plus
-        if '%' in ''.join(self.prefix + self.suffix):
-            self.scale = 2
-        elif u'‰' in ''.join(self.prefix + self.suffix):
-            self.scale = 3
-        else:
-            self.scale = 0
+        self.scale = self.compute_scale()
 
     def __repr__(self):
         return '<%s %r>' % (type(self).__name__, self.pattern)
 
-    def apply(self, value, locale, currency=None, force_frac=None):
-        frac_prec = force_frac or self.frac_prec
+    def compute_scale(self):
+        """Return the scaling factor to apply to the number before rendering.
+
+        Auto-set to a factor of 2 or 3 if presence of a ``%`` or ``‰`` sign is
+        detected in the prefix or suffix of the pattern. Default is to not mess
+        with the scale at all and keep it to 0.
+        """
+        scale = 0
+        if '%' in ''.join(self.prefix + self.suffix):
+            scale = 2
+        elif u'‰' in ''.join(self.prefix + self.suffix):
+            scale = 3
+        return scale
+
+    def scientific_notation_elements(self, value, locale):
+        """ Returns normalized scientific notation components of a value.
+        """
+        # Normalize value to only have one lead digit.
+        exp = value.adjusted()
+        value = value * get_decimal_quantum(exp)
+        assert value.adjusted() == 0
+
+        # Shift exponent and value by the minimum number of leading digits
+        # imposed by the rendering pattern. And always make that number
+        # greater or equal to 1.
+        lead_shift = max([1, min(self.int_prec)]) - 1
+        exp = exp - lead_shift
+        value = value * get_decimal_quantum(-lead_shift)
+
+        # Get exponent sign symbol.
+        exp_sign = ''
+        if exp < 0:
+            exp_sign = get_minus_sign_symbol(locale)
+        elif self.exp_plus:
+            exp_sign = get_plus_sign_symbol(locale)
+
+        # Normalize exponent value now that we have the sign.
+        exp = abs(exp)
+
+        return value, exp, exp_sign
+
+    def apply(self, value, locale, currency=None, currency_digits=True):
+        """Renders into a string a number following the defined pattern.
+        """
         if not isinstance(value, decimal.Decimal):
             value = decimal.Decimal(str(value))
+
         value = value.scaleb(self.scale)
+
+        # Separate the absolute value from its sign.
         is_negative = int(value.is_signed())
-        if self.exp_prec:  # Scientific notation
-            exp = value.adjusted()
-            value = abs(value)
-            # Minimum number of integer digits
-            if self.int_prec[0] == self.int_prec[1]:
-                exp -= self.int_prec[0] - 1
-            # Exponent grouping
-            elif self.int_prec[1]:
-                exp = int(exp / self.int_prec[1]) * self.int_prec[1]
-            if exp < 0:
-                value = value * 10**(-exp)
-            else:
-                value = value / 10**exp
-            exp_sign = ''
-            if exp < 0:
-                exp_sign = get_minus_sign_symbol(locale)
-            elif self.exp_plus:
-                exp_sign = get_plus_sign_symbol(locale)
-            exp = abs(exp)
-            number = u'%s%s%s%s' % \
-                (self._format_significant(value, frac_prec[0], frac_prec[1]),
-                 get_exponential_symbol(locale), exp_sign,
-                 self._format_int(str(exp), self.exp_prec[0],
-                                  self.exp_prec[1], locale))
-        elif '@' in self.pattern:  # Is it a siginificant digits pattern?
-            text = self._format_significant(abs(value),
+        value = abs(value).normalize()
+
+        # Prepare scientific notation metadata.
+        if self.exp_prec:
+            value, exp, exp_sign = self.scientific_notation_elements(value, locale)
+
+        # Adjust the precision of the fractionnal part and force it to the
+        # currency's if neccessary.
+        frac_prec = self.frac_prec
+        if currency and currency_digits:
+            frac_prec = (get_currency_precision(currency), ) * 2
+
+        # Render scientific notation.
+        if self.exp_prec:
+            number = ''.join([
+                self._quantize_value(value, locale, frac_prec),
+                get_exponential_symbol(locale),
+                exp_sign,
+                self._format_int(
+                    str(exp), self.exp_prec[0], self.exp_prec[1], locale)])
+
+        # Is it a siginificant digits pattern?
+        elif '@' in self.pattern:
+            text = self._format_significant(value,
                                             self.int_prec[0],
                                             self.int_prec[1])
             a, sep, b = text.partition(".")
             number = self._format_int(a, 0, 1000, locale)
             if sep:
                 number += get_decimal_symbol(locale) + b
-        else:  # A normal number pattern
-            precision = decimal.Decimal('1.' + '1' * frac_prec[1])
-            rounded = value.quantize(precision)
-            a, sep, b = str(abs(rounded)).partition(".")
-            number = (self._format_int(a, self.int_prec[0],
-                                       self.int_prec[1], locale) +
-                      self._format_frac(b or '0', locale, force_frac))
-        retval = u'%s%s%s' % (self.prefix[is_negative], number,
-                              self.suffix[is_negative])
+
+        # A normal number pattern.
+        else:
+            number = self._quantize_value(value, locale, frac_prec)
+
+        retval = ''.join([
+            self.prefix[is_negative],
+            number,
+            self.suffix[is_negative]])
+
         if u'¤' in retval:
             retval = retval.replace(u'¤¤¤',
                                     get_currency_name(currency, value, locale))
             retval = retval.replace(u'¤¤', currency.upper())
             retval = retval.replace(u'¤', get_currency_symbol(currency, locale))
+
         return retval
 
     #
@@ -757,6 +812,15 @@ def _format_int(self, value, min, max, locale):
             gsize = self.grouping[1]
         return value + ret
 
+    def _quantize_value(self, value, locale, frac_prec):
+        quantum = get_decimal_quantum(frac_prec[1])
+        rounded = value.quantize(quantum)
+        a, sep, b = str(rounded).partition(".")
+        number = (self._format_int(a, self.int_prec[0],
+                                   self.int_prec[1], locale) +
+                  self._format_frac(b or '0', locale, frac_prec))
+        return number
+
     def _format_frac(self, value, locale, force_frac=None):
         min, max = force_frac or self.frac_prec
         if len(value) < min:
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 5bcd1717d..5c8da3422 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -124,7 +124,7 @@ def test_scientific_notation(self):
         self.assertEqual(fmt, '1.2E3')
         # Exponent grouping
         fmt = numbers.format_scientific(12345, '##0.####E0', locale='en_US')
-        self.assertEqual(fmt, '12.345E3')
+        self.assertEqual(fmt, '1.2345E4')
         # Minimum number of int digits
         fmt = numbers.format_scientific(12345, '00.###E0', locale='en_US')
         self.assertEqual(fmt, '12.345E3')
@@ -283,11 +283,45 @@ def test_format_decimal():
     assert numbers.format_decimal(1.2345, locale='sv_SE') == u'1,234'
     assert numbers.format_decimal(1.2345, locale='de') == u'1,234'
     assert numbers.format_decimal(12345.5, locale='en_US') == u'12,345.5'
+    assert numbers.format_decimal(0001.2345000, locale='en_US') == u'1.234'
+    assert numbers.format_decimal(-0001.2346000, locale='en_US') == u'-1.235'
+    assert numbers.format_decimal(0000000.5, locale='en_US') == u'0.5'
+    assert numbers.format_decimal(000, locale='en_US') == u'0'
+
+
+@pytest.mark.parametrize('input_value, expected_value', [
+    ('10000', '10,000'),
+    ('1', '1'),
+    ('1.0', '1'),
+    ('1.1', '1.1'),
+    ('1.11', '1.11'),
+    ('1.110', '1.11'),
+    ('1.001', '1.001'),
+    ('1.00100', '1.001'),
+    ('01.00100', '1.001'),
+    ('101.00100', '101.001'),
+    ('00000', '0'),
+    ('0', '0'),
+    ('0.0', '0'),
+    ('0.1', '0.1'),
+    ('0.11', '0.11'),
+    ('0.110', '0.11'),
+    ('0.001', '0.001'),
+    ('0.00100', '0.001'),
+    ('00.00100', '0.001'),
+    ('000.00100', '0.001'),
+])
+def test_format_decimal_precision(input_value, expected_value):
+    # Test precision conservation.
+    assert numbers.format_decimal(
+        decimal.Decimal(input_value), locale='en_US') == expected_value
 
 
 def test_format_currency():
     assert (numbers.format_currency(1099.98, 'USD', locale='en_US')
             == u'$1,099.98')
+    assert (numbers.format_currency(0, 'USD', locale='en_US')
+            == u'$0.00')
     assert (numbers.format_currency(1099.98, 'USD', locale='es_CO')
             == u'US$\xa01.099,98')
     assert (numbers.format_currency(1099.98, 'EUR', locale='de_DE')
@@ -306,10 +340,16 @@ def test_format_currency_format_type():
     assert (numbers.format_currency(1099.98, 'USD', locale='en_US',
                                     format_type="standard")
             == u'$1,099.98')
+    assert (numbers.format_currency(0, 'USD', locale='en_US',
+                                    format_type="standard")
+            == u'$0.00')
 
     assert (numbers.format_currency(1099.98, 'USD', locale='en_US',
                                     format_type="accounting")
             == u'$1,099.98')
+    assert (numbers.format_currency(0, 'USD', locale='en_US',
+                                    format_type="accounting")
+            == u'$0.00')
 
     with pytest.raises(numbers.UnknownCurrencyFormatError) as excinfo:
         numbers.format_currency(1099.98, 'USD', locale='en_US',
@@ -328,8 +368,37 @@ def test_format_currency_format_type():
             == u'1.099,98')
 
 
+@pytest.mark.parametrize('input_value, expected_value', [
+    ('10000', '$10,000.00'),
+    ('1', '$1.00'),
+    ('1.0', '$1.00'),
+    ('1.1', '$1.10'),
+    ('1.11', '$1.11'),
+    ('1.110', '$1.11'),
+    ('1.001', '$1.00'),
+    ('1.00100', '$1.00'),
+    ('01.00100', '$1.00'),
+    ('101.00100', '$101.00'),
+    ('00000', '$0.00'),
+    ('0', '$0.00'),
+    ('0.0', '$0.00'),
+    ('0.1', '$0.10'),
+    ('0.11', '$0.11'),
+    ('0.110', '$0.11'),
+    ('0.001', '$0.00'),
+    ('0.00100', '$0.00'),
+    ('00.00100', '$0.00'),
+    ('000.00100', '$0.00'),
+])
+def test_format_currency_precision(input_value, expected_value):
+    # Test precision conservation.
+    assert numbers.format_currency(
+        decimal.Decimal(input_value), 'USD', locale='en_US') == expected_value
+
+
 def test_format_percent():
     assert numbers.format_percent(0.34, locale='en_US') == u'34%'
+    assert numbers.format_percent(0, locale='en_US') == u'0%'
     assert numbers.format_percent(0.34, u'##0%', locale='en_US') == u'34%'
     assert numbers.format_percent(34, u'##0', locale='en_US') == u'34'
     assert numbers.format_percent(25.1234, locale='en_US') == u'2,512%'
@@ -339,14 +408,81 @@ def test_format_percent():
             == u'25,123\u2030')
 
 
-def test_scientific_exponent_displayed_as_integer():
-    assert numbers.format_scientific(100000, locale='en_US') == u'1E5'
+@pytest.mark.parametrize('input_value, expected_value', [
+    ('100', '10,000%'),
+    ('0.01', '1%'),
+    ('0.010', '1%'),
+    ('0.011', '1%'),
+    ('0.0111', '1%'),
+    ('0.01110', '1%'),
+    ('0.01001', '1%'),
+    ('0.0100100', '1%'),
+    ('0.010100100', '1%'),
+    ('0.000000', '0%'),
+    ('0', '0%'),
+    ('0.00', '0%'),
+    ('0.01', '1%'),
+    ('0.011', '1%'),
+    ('0.0110', '1%'),
+    ('0.0001', '0%'),
+    ('0.000100', '0%'),
+    ('0.0000100', '0%'),
+    ('0.00000100', '0%'),
+])
+def test_format_percent_precision(input_value, expected_value):
+    # Test precision conservation.
+    assert numbers.format_percent(
+        decimal.Decimal(input_value), locale='en_US') == expected_value
 
 
 def test_format_scientific():
     assert numbers.format_scientific(10000, locale='en_US') == u'1E4'
-    assert (numbers.format_scientific(1234567, u'##0E00', locale='en_US')
-            == u'1.23E06')
+    assert numbers.format_scientific(4234567, u'#.#E0', locale='en_US') == u'4.2E6'
+    assert numbers.format_scientific(4234567, u'0E0000', locale='en_US') == u'4E0006'
+    assert numbers.format_scientific(4234567, u'##0E00', locale='en_US') == u'4E06'
+    assert numbers.format_scientific(4234567, u'##00E00', locale='en_US') == u'42E05'
+    assert numbers.format_scientific(4234567, u'0,000E00', locale='en_US') == u'4,235E03'
+    assert numbers.format_scientific(4234567, u'##0.#####E00', locale='en_US') == u'4.23457E06'
+    assert numbers.format_scientific(4234567, u'##0.##E00', locale='en_US') == u'4.23E06'
+    assert numbers.format_scientific(42, u'00000.000000E0000', locale='en_US') == u'42000.000000E-0003'
+
+
+def test_default_scientific_format():
+    """ Check the scientific format method auto-correct the rendering pattern
+    in case of a missing fractional part.
+    """
+    assert numbers.format_scientific(12345, locale='en_US') == u'1E4'
+    assert numbers.format_scientific(12345.678, locale='en_US') == u'1E4'
+    assert numbers.format_scientific(12345, u'#E0', locale='en_US') == u'1E4'
+    assert numbers.format_scientific(12345.678, u'#E0', locale='en_US') == u'1E4'
+
+
+@pytest.mark.parametrize('input_value, expected_value', [
+    ('10000', '1E4'),
+    ('1', '1E0'),
+    ('1.0', '1E0'),
+    ('1.1', '1E0'),
+    ('1.11', '1E0'),
+    ('1.110', '1E0'),
+    ('1.001', '1E0'),
+    ('1.00100', '1E0'),
+    ('01.00100', '1E0'),
+    ('101.00100', '1E2'),
+    ('00000', '0E0'),
+    ('0', '0E0'),
+    ('0.0', '0E0'),
+    ('0.1', '1E-1'),
+    ('0.11', '1E-1'),
+    ('0.110', '1E-1'),
+    ('0.001', '1E-3'),
+    ('0.00100', '1E-3'),
+    ('00.00100', '1E-3'),
+    ('000.00100', '1E-3'),
+])
+def test_format_scientific_precision(input_value, expected_value):
+    # Test precision conservation.
+    assert numbers.format_scientific(
+        decimal.Decimal(input_value), locale='en_US') == expected_value
 
 
 def test_parse_number():

From 812c9f0bbf19eb669ecd9195a4a02ba68253a857 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 21 Oct 2017 09:47:07 -0700
Subject: [PATCH 351/489] Include license file in the generated wheel package

The wheel package format supports including the license file. This is
done using the [metadata] section in the setup.cfg file. For additional
information on this feature, see:

https://wheel.readthedocs.io/en/stable/index.html#including-the-license-in-the-generated-wheel-file
---
 setup.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index c2d8f87e9..d5f180a24 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,3 +7,6 @@ doctest_optionflags = ELLIPSIS NORMALIZE_WHITESPACE ALLOW_UNICODE IGNORE_EXCEPTI
 
 [bdist_wheel]
 universal = 1
+
+[metadata]
+license_file = LICENSE

From a97b426476638c815bdfe11196aa2e9940444cb4 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 21 Oct 2017 09:49:07 -0700
Subject: [PATCH 352/489] Test and document all supported Python versions

Add Python 3.6 to Travis CI and tox.

Add PyPy to tox.

Add trove classifiers for all supported versions. Helps package users
know if the library is compatible.
---
 .travis.yml | 2 ++
 setup.py    | 3 +++
 tox.ini     | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b7eff7d94..f9469c99a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,8 @@ matrix:
       python: 3.5
       env:
       - PYTHON_TEST_FLAGS=-bb
+    - os: linux
+      python: 3.6
 
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
diff --git a/setup.py b/setup.py
index 146f38dc4..684c38718 100755
--- a/setup.py
+++ b/setup.py
@@ -44,12 +44,15 @@ def run(self):
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
diff --git a/tox.ini b/tox.ini
index 537465823..b71dec7c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, pypy, py33, py34, py26-cdecimal, py27-cdecimal
+envlist = py26, py27, pypy, py33, py34, py35, py36, pypy3, py26-cdecimal, py27-cdecimal
 
 [testenv]
 deps =

From 1539c8a89119f37890f46586d705d5a90cc98ae6 Mon Sep 17 00:00:00 2001
From: Kevin Deldycke <kevin@deldycke.com>
Date: Fri, 7 Apr 2017 16:09:14 +0200
Subject: [PATCH 353/489] Allow bypass of decimal quantization.

---
 babel/numbers.py      | 102 ++++++++++++++++++++++++++++++-----
 tests/test_numbers.py | 122 +++++++++++++++++++++++++++---------------
 2 files changed, 168 insertions(+), 56 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 036513217..1f77bcd23 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -22,7 +22,6 @@
 from datetime import date as date_, datetime as datetime_
 from itertools import chain
 import warnings
-from itertools import chain
 
 from babel.core import default_locale, Locale, get_global
 from babel._compat import decimal, string_types
@@ -324,13 +323,27 @@ def format_number(number, locale=LC_NUMERIC):
     return format_decimal(number, locale=locale)
 
 
+def get_decimal_precision(number):
+    """Return maximum precision of a decimal instance's fractional part.
+
+    Precision is extracted from the fractional part only.
+    """
+    # Copied from: https://github.com/mahmoud/boltons/pull/59
+    assert isinstance(number, decimal.Decimal)
+    decimal_tuple = number.normalize().as_tuple()
+    if decimal_tuple.exponent >= 0:
+        return 0
+    return abs(decimal_tuple.exponent)
+
+
 def get_decimal_quantum(precision):
     """Return minimal quantum of a number, as defined by precision."""
     assert isinstance(precision, (int, long, decimal.Decimal))
     return decimal.Decimal(10) ** (-precision)
 
 
-def format_decimal(number, format=None, locale=LC_NUMERIC):
+def format_decimal(
+        number, format=None, locale=LC_NUMERIC, decimal_quantization=True):
     u"""Return the given decimal number formatted for a specific locale.
 
     >>> format_decimal(1.2345, locale='en_US')
@@ -350,23 +363,36 @@ def format_decimal(number, format=None, locale=LC_NUMERIC):
     >>> format_decimal(12345.5, locale='en_US')
     u'12,345.5'
 
+    By default the locale is allowed to truncate and round a high-precision
+    number by forcing its format pattern onto the decimal part. You can bypass
+    this behavior with the `decimal_quantization` parameter:
+
+    >>> format_decimal(1.2346, locale='en_US')
+    u'1.235'
+    >>> format_decimal(1.2346, locale='en_US', decimal_quantization=False)
+    u'1.2346'
+
     :param number: the number to format
     :param format:
     :param locale: the `Locale` object or locale identifier
+    :param decimal_quantization: Truncate and round high-precision numbers to
+                                 the format pattern. Defaults to `True`.
     """
     locale = Locale.parse(locale)
     if not format:
         format = locale.decimal_formats.get(format)
     pattern = parse_pattern(format)
-    return pattern.apply(number, locale)
+    return pattern.apply(
+        number, locale, decimal_quantization=decimal_quantization)
 
 
 class UnknownCurrencyFormatError(KeyError):
     """Exception raised when an unknown currency format is requested."""
 
 
-def format_currency(number, currency, format=None, locale=LC_NUMERIC,
-                    currency_digits=True, format_type='standard'):
+def format_currency(
+        number, currency, format=None, locale=LC_NUMERIC, currency_digits=True,
+        format_type='standard', decimal_quantization=True):
     u"""Return formatted currency value.
 
     >>> format_currency(1099.98, 'USD', locale='en_US')
@@ -416,12 +442,23 @@ def format_currency(number, currency, format=None, locale=LC_NUMERIC,
         ...
     UnknownCurrencyFormatError: "'unknown' is not a known currency format type"
 
+    By default the locale is allowed to truncate and round a high-precision
+    number by forcing its format pattern onto the decimal part. You can bypass
+    this behavior with the `decimal_quantization` parameter:
+
+    >>> format_currency(1099.9876, 'USD', locale='en_US')
+    u'$1,099.99'
+    >>> format_currency(1099.9876, 'USD', locale='en_US', decimal_quantization=False)
+    u'$1,099.9876'
+
     :param number: the number to format
     :param currency: the currency code
     :param format: the format string to use
     :param locale: the `Locale` object or locale identifier
-    :param currency_digits: use the currency's number of decimal digits
+    :param currency_digits: use the currency's natural number of decimal digits
     :param format_type: the currency format type to use
+    :param decimal_quantization: Truncate and round high-precision numbers to
+                                 the format pattern. Defaults to `True`.
     """
     locale = Locale.parse(locale)
     if format:
@@ -434,10 +471,12 @@ def format_currency(number, currency, format=None, locale=LC_NUMERIC,
                 "%r is not a known currency format type" % format_type)
 
     return pattern.apply(
-        number, locale, currency=currency, currency_digits=currency_digits)
+        number, locale, currency=currency, currency_digits=currency_digits,
+        decimal_quantization=decimal_quantization)
 
 
-def format_percent(number, format=None, locale=LC_NUMERIC):
+def format_percent(
+        number, format=None, locale=LC_NUMERIC, decimal_quantization=True):
     """Return formatted percent value for a specific locale.
 
     >>> format_percent(0.34, locale='en_US')
@@ -452,18 +491,31 @@ def format_percent(number, format=None, locale=LC_NUMERIC):
     >>> format_percent(25.1234, u'#,##0\u2030', locale='en_US')
     u'25,123\u2030'
 
+    By default the locale is allowed to truncate and round a high-precision
+    number by forcing its format pattern onto the decimal part. You can bypass
+    this behavior with the `decimal_quantization` parameter:
+
+    >>> format_percent(23.9876, locale='en_US')
+    u'2,399%'
+    >>> format_percent(23.9876, locale='en_US', decimal_quantization=False)
+    u'2,398.76%'
+
     :param number: the percent number to format
     :param format:
     :param locale: the `Locale` object or locale identifier
+    :param decimal_quantization: Truncate and round high-precision numbers to
+                                 the format pattern. Defaults to `True`.
     """
     locale = Locale.parse(locale)
     if not format:
         format = locale.percent_formats.get(format)
     pattern = parse_pattern(format)
-    return pattern.apply(number, locale)
+    return pattern.apply(
+        number, locale, decimal_quantization=decimal_quantization)
 
 
-def format_scientific(number, format=None, locale=LC_NUMERIC):
+def format_scientific(
+        number, format=None, locale=LC_NUMERIC, decimal_quantization=True):
     """Return value formatted in scientific notation for a specific locale.
 
     >>> format_scientific(10000, locale='en_US')
@@ -474,15 +526,27 @@ def format_scientific(number, format=None, locale=LC_NUMERIC):
     >>> format_scientific(1234567, u'##0.##E00', locale='en_US')
     u'1.23E06'
 
+    By default the locale is allowed to truncate and round a high-precision
+    number by forcing its format pattern onto the decimal part. You can bypass
+    this behavior with the `decimal_quantization` parameter:
+
+    >>> format_scientific(1234.9876, u'#.##E0', locale='en_US')
+    u'1.23E3'
+    >>> format_scientific(1234.9876, u'#.##E0', locale='en_US', decimal_quantization=False)
+    u'1.2349876E3'
+
     :param number: the number to format
     :param format:
     :param locale: the `Locale` object or locale identifier
+    :param decimal_quantization: Truncate and round high-precision numbers to
+                                 the format pattern. Defaults to `True`.
     """
     locale = Locale.parse(locale)
     if not format:
         format = locale.scientific_formats.get(format)
     pattern = parse_pattern(format)
-    return pattern.apply(number, locale)
+    return pattern.apply(
+        number, locale, decimal_quantization=decimal_quantization)
 
 
 class NumberFormatError(ValueError):
@@ -702,8 +766,13 @@ def scientific_notation_elements(self, value, locale):
 
         return value, exp, exp_sign
 
-    def apply(self, value, locale, currency=None, currency_digits=True):
+    def apply(
+            self, value, locale, currency=None, currency_digits=True,
+            decimal_quantization=True):
         """Renders into a string a number following the defined pattern.
+
+        Forced decimal quantization is active by default so we'll produce a
+        number string that is strictly following CLDR pattern definitions.
         """
         if not isinstance(value, decimal.Decimal):
             value = decimal.Decimal(str(value))
@@ -724,6 +793,15 @@ def apply(self, value, locale, currency=None, currency_digits=True):
         if currency and currency_digits:
             frac_prec = (get_currency_precision(currency), ) * 2
 
+        # Bump decimal precision to the natural precision of the number if it
+        # exceeds the one we're about to use. This adaptative precision is only
+        # triggered if the decimal quantization is disabled or if a scientific
+        # notation pattern has a missing mandatory fractional part (as in the
+        # default '#E0' pattern). This special case has been extensively
+        # discussed at https://github.com/python-babel/babel/pull/494#issuecomment-307649969 .
+        if not decimal_quantization or (self.exp_prec and frac_prec == (0, 0)):
+            frac_prec = (frac_prec[0], max([frac_prec[1], get_decimal_precision(value)]))
+
         # Render scientific notation.
         if self.exp_prec:
             number = ''.join([
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 5c8da3422..48a260b40 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -16,10 +16,10 @@
 
 from datetime import date
 
-from babel import numbers
+from babel import Locale, localedata, numbers
 from babel.numbers import (
-    list_currencies, validate_currency, UnknownCurrencyError, is_currency, normalize_currency, get_currency_precision)
-from babel.core import Locale
+    list_currencies, validate_currency, UnknownCurrencyError, is_currency, normalize_currency,
+    get_currency_precision, get_decimal_precision)
 from babel.localedata import locale_identifiers
 from babel._compat import decimal
 
@@ -271,6 +271,12 @@ def test_get_group_symbol():
     assert numbers.get_group_symbol('en_US') == u','
 
 
+def test_decimal_precision():
+    assert get_decimal_precision(decimal.Decimal('0.110')) == 2
+    assert get_decimal_precision(decimal.Decimal('1.0')) == 0
+    assert get_decimal_precision(decimal.Decimal('10000')) == 0
+
+
 def test_format_number():
     assert numbers.format_number(1099, locale='en_US') == u'1,099'
     assert numbers.format_number(1099, locale='de_DE') == u'1.099'
@@ -314,7 +320,14 @@ def test_format_decimal():
 def test_format_decimal_precision(input_value, expected_value):
     # Test precision conservation.
     assert numbers.format_decimal(
-        decimal.Decimal(input_value), locale='en_US') == expected_value
+        decimal.Decimal(input_value), locale='en_US', decimal_quantization=False) == expected_value
+
+
+def test_format_decimal_quantization():
+    # Test all locales.
+    for locale_code in localedata.locale_identifiers():
+        assert numbers.format_decimal(
+            '0.9999999999', locale=locale_code, decimal_quantization=False).endswith('9999999999') is True
 
 
 def test_format_currency():
@@ -375,25 +388,32 @@ def test_format_currency_format_type():
     ('1.1', '$1.10'),
     ('1.11', '$1.11'),
     ('1.110', '$1.11'),
-    ('1.001', '$1.00'),
-    ('1.00100', '$1.00'),
-    ('01.00100', '$1.00'),
-    ('101.00100', '$101.00'),
+    ('1.001', '$1.001'),
+    ('1.00100', '$1.001'),
+    ('01.00100', '$1.001'),
+    ('101.00100', '$101.001'),
     ('00000', '$0.00'),
     ('0', '$0.00'),
     ('0.0', '$0.00'),
     ('0.1', '$0.10'),
     ('0.11', '$0.11'),
     ('0.110', '$0.11'),
-    ('0.001', '$0.00'),
-    ('0.00100', '$0.00'),
-    ('00.00100', '$0.00'),
-    ('000.00100', '$0.00'),
+    ('0.001', '$0.001'),
+    ('0.00100', '$0.001'),
+    ('00.00100', '$0.001'),
+    ('000.00100', '$0.001'),
 ])
 def test_format_currency_precision(input_value, expected_value):
     # Test precision conservation.
     assert numbers.format_currency(
-        decimal.Decimal(input_value), 'USD', locale='en_US') == expected_value
+        decimal.Decimal(input_value), 'USD', locale='en_US', decimal_quantization=False) == expected_value
+
+
+def test_format_currency_quantization():
+    # Test all locales.
+    for locale_code in localedata.locale_identifiers():
+        assert numbers.format_currency(
+            '0.9999999999', 'USD', locale=locale_code, decimal_quantization=False).find('9999999999') > -1
 
 
 def test_format_percent():
@@ -412,36 +432,43 @@ def test_format_percent():
     ('100', '10,000%'),
     ('0.01', '1%'),
     ('0.010', '1%'),
-    ('0.011', '1%'),
-    ('0.0111', '1%'),
-    ('0.01110', '1%'),
-    ('0.01001', '1%'),
-    ('0.0100100', '1%'),
-    ('0.010100100', '1%'),
+    ('0.011', '1.1%'),
+    ('0.0111', '1.11%'),
+    ('0.01110', '1.11%'),
+    ('0.01001', '1.001%'),
+    ('0.0100100', '1.001%'),
+    ('0.010100100', '1.01001%'),
     ('0.000000', '0%'),
     ('0', '0%'),
     ('0.00', '0%'),
     ('0.01', '1%'),
-    ('0.011', '1%'),
-    ('0.0110', '1%'),
-    ('0.0001', '0%'),
-    ('0.000100', '0%'),
-    ('0.0000100', '0%'),
-    ('0.00000100', '0%'),
+    ('0.011', '1.1%'),
+    ('0.0110', '1.1%'),
+    ('0.0001', '0.01%'),
+    ('0.000100', '0.01%'),
+    ('0.0000100', '0.001%'),
+    ('0.00000100', '0.0001%'),
 ])
 def test_format_percent_precision(input_value, expected_value):
     # Test precision conservation.
     assert numbers.format_percent(
-        decimal.Decimal(input_value), locale='en_US') == expected_value
+        decimal.Decimal(input_value), locale='en_US', decimal_quantization=False) == expected_value
+
+
+def test_format_percent_quantization():
+    # Test all locales.
+    for locale_code in localedata.locale_identifiers():
+        assert numbers.format_percent(
+            '0.9999999999', locale=locale_code, decimal_quantization=False).find('99999999') > -1
 
 
 def test_format_scientific():
     assert numbers.format_scientific(10000, locale='en_US') == u'1E4'
     assert numbers.format_scientific(4234567, u'#.#E0', locale='en_US') == u'4.2E6'
-    assert numbers.format_scientific(4234567, u'0E0000', locale='en_US') == u'4E0006'
-    assert numbers.format_scientific(4234567, u'##0E00', locale='en_US') == u'4E06'
-    assert numbers.format_scientific(4234567, u'##00E00', locale='en_US') == u'42E05'
-    assert numbers.format_scientific(4234567, u'0,000E00', locale='en_US') == u'4,235E03'
+    assert numbers.format_scientific(4234567, u'0E0000', locale='en_US') == u'4.234567E0006'
+    assert numbers.format_scientific(4234567, u'##0E00', locale='en_US') == u'4.234567E06'
+    assert numbers.format_scientific(4234567, u'##00E00', locale='en_US') == u'42.34567E05'
+    assert numbers.format_scientific(4234567, u'0,000E00', locale='en_US') == u'4,234.567E03'
     assert numbers.format_scientific(4234567, u'##0.#####E00', locale='en_US') == u'4.23457E06'
     assert numbers.format_scientific(4234567, u'##0.##E00', locale='en_US') == u'4.23E06'
     assert numbers.format_scientific(42, u'00000.000000E0000', locale='en_US') == u'42000.000000E-0003'
@@ -451,29 +478,29 @@ def test_default_scientific_format():
     """ Check the scientific format method auto-correct the rendering pattern
     in case of a missing fractional part.
     """
-    assert numbers.format_scientific(12345, locale='en_US') == u'1E4'
-    assert numbers.format_scientific(12345.678, locale='en_US') == u'1E4'
-    assert numbers.format_scientific(12345, u'#E0', locale='en_US') == u'1E4'
-    assert numbers.format_scientific(12345.678, u'#E0', locale='en_US') == u'1E4'
+    assert numbers.format_scientific(12345, locale='en_US') == u'1.2345E4'
+    assert numbers.format_scientific(12345.678, locale='en_US') == u'1.2345678E4'
+    assert numbers.format_scientific(12345, u'#E0', locale='en_US') == u'1.2345E4'
+    assert numbers.format_scientific(12345.678, u'#E0', locale='en_US') == u'1.2345678E4'
 
 
 @pytest.mark.parametrize('input_value, expected_value', [
     ('10000', '1E4'),
     ('1', '1E0'),
     ('1.0', '1E0'),
-    ('1.1', '1E0'),
-    ('1.11', '1E0'),
-    ('1.110', '1E0'),
-    ('1.001', '1E0'),
-    ('1.00100', '1E0'),
-    ('01.00100', '1E0'),
-    ('101.00100', '1E2'),
+    ('1.1', '1.1E0'),
+    ('1.11', '1.11E0'),
+    ('1.110', '1.11E0'),
+    ('1.001', '1.001E0'),
+    ('1.00100', '1.001E0'),
+    ('01.00100', '1.001E0'),
+    ('101.00100', '1.01001E2'),
     ('00000', '0E0'),
     ('0', '0E0'),
     ('0.0', '0E0'),
     ('0.1', '1E-1'),
-    ('0.11', '1E-1'),
-    ('0.110', '1E-1'),
+    ('0.11', '1.1E-1'),
+    ('0.110', '1.1E-1'),
     ('0.001', '1E-3'),
     ('0.00100', '1E-3'),
     ('00.00100', '1E-3'),
@@ -482,7 +509,14 @@ def test_default_scientific_format():
 def test_format_scientific_precision(input_value, expected_value):
     # Test precision conservation.
     assert numbers.format_scientific(
-        decimal.Decimal(input_value), locale='en_US') == expected_value
+        decimal.Decimal(input_value), locale='en_US', decimal_quantization=False) == expected_value
+
+
+def test_format_scientific_quantization():
+    # Test all locales.
+    for locale_code in localedata.locale_identifiers():
+        assert numbers.format_scientific(
+            '0.9999999999', locale=locale_code, decimal_quantization=False).find('999999999') > -1
 
 
 def test_parse_number():

From 75b8f7899f0080e99a7793c4b97de07be06af518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 16 Sep 2017 00:07:04 +0300
Subject: [PATCH 354/489] Python 3.6 invalid escape sequence deprecation fixes

https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
---
 babel/core.py              | 2 +-
 babel/dates.py             | 4 ++--
 babel/localtime/_unix.py   | 6 +++---
 babel/messages/checkers.py | 2 +-
 babel/messages/frontend.py | 2 +-
 scripts/make-release.py    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index df03b24ad..7d38d43ec 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -1118,7 +1118,7 @@ def parse_locale(identifier, sep='_'):
 def get_locale_identifier(tup, sep='_'):
     """The reverse of :func:`parse_locale`.  It creates a locale identifier out
     of a ``(language, territory, script, variant)`` tuple.  Items can be set to
-    ``None`` and trailing ``None``\s can also be left out of the tuple.
+    ``None`` and trailing ``None``\\s can also be left out of the tuple.
 
     >>> get_locale_identifier(('de', 'DE', None, '1999'))
     'de_DE_1999'
diff --git a/babel/dates.py b/babel/dates.py
index d1fafe2a7..3a075eb47 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1155,7 +1155,7 @@ def parse_date(string, locale=LC_TIME):
     # FIXME: this currently only supports numbers, but should also support month
     #        names, both in the requested locale, and english
 
-    numbers = re.findall('(\d+)', string)
+    numbers = re.findall(r'(\d+)', string)
     year = numbers[indexes['Y']]
     if len(year) == 2:
         year = 2000 + int(year)
@@ -1198,7 +1198,7 @@ def parse_time(string, locale=LC_TIME):
     #        and seconds should be optional, maybe minutes too
     #        oh, and time-zones, of course
 
-    numbers = re.findall('(\d+)', string)
+    numbers = re.findall(r'(\d+)', string)
     hour = int(numbers[indexes['H']])
     minute = int(numbers[indexes['M']])
     second = int(numbers[indexes['S']])
diff --git a/babel/localtime/_unix.py b/babel/localtime/_unix.py
index 8a8b4e967..561de0d6a 100644
--- a/babel/localtime/_unix.py
+++ b/babel/localtime/_unix.py
@@ -100,9 +100,9 @@ def _get_localzone(_root='/'):
     # OpenSUSE has a TIMEZONE setting in /etc/sysconfig/clock and
     # Gentoo has a TIMEZONE setting in /etc/conf.d/clock
     # We look through these files for a timezone:
-    zone_re = re.compile('\s*ZONE\s*=\s*\"')
-    timezone_re = re.compile('\s*TIMEZONE\s*=\s*\"')
-    end_re = re.compile('\"')
+    zone_re = re.compile(r'\s*ZONE\s*=\s*"')
+    timezone_re = re.compile(r'\s*TIMEZONE\s*=\s*"')
+    end_re = re.compile(r'"')
 
     for filename in ('etc/sysconfig/clock', 'etc/conf.d/clock'):
         tzpath = os.path.join(_root, filename)
diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py
index 24ecdcfed..c4669c53b 100644
--- a/babel/messages/checkers.py
+++ b/babel/messages/checkers.py
@@ -61,7 +61,7 @@ def python_format(catalog, message):
 
 def _validate_format(format, alternative):
     """Test format string `alternative` against `format`.  `format` can be the
-    msgid of a message and `alternative` one of the `msgstr`\s.  The two
+    msgid of a message and `alternative` one of the `msgstr`\\s.  The two
     arguments are not interchangeable as `alternative` may contain less
     placeholders if `format` uses named placeholders.
 
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index fb171e36a..388c14b7a 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -391,7 +391,7 @@ def finalize_options(self):
 
         if self.input_paths:
             if isinstance(self.input_paths, string_types):
-                self.input_paths = re.split(',\s*', self.input_paths)
+                self.input_paths = re.split(r',\s*', self.input_paths)
         elif self.distribution is not None:
             self.input_paths = dict.fromkeys([
                 k.split('.', 1)[0]
diff --git a/scripts/make-release.py b/scripts/make-release.py
index dc9bb31e6..245608a73 100755
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -23,7 +23,7 @@ def parse_changelog():
     with open('CHANGES') as f:
         lineiter = iter(f)
         for line in lineiter:
-            match = re.search('^Version\s+(.*)', line.strip())
+            match = re.search(r'^Version\s+(.*)', line.strip())
             if match is None:
                 continue
             version = match.group(1).strip()

From f2626a8793575c291ed8d9edbb0b99778a964dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 16 Sep 2017 00:08:07 +0300
Subject: [PATCH 355/489] Simplify Linux distro specific explicit timezone
 setting search

---
 babel/localtime/_unix.py | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/babel/localtime/_unix.py b/babel/localtime/_unix.py
index 561de0d6a..8f25fe7b8 100644
--- a/babel/localtime/_unix.py
+++ b/babel/localtime/_unix.py
@@ -100,9 +100,7 @@ def _get_localzone(_root='/'):
     # OpenSUSE has a TIMEZONE setting in /etc/sysconfig/clock and
     # Gentoo has a TIMEZONE setting in /etc/conf.d/clock
     # We look through these files for a timezone:
-    zone_re = re.compile(r'\s*ZONE\s*=\s*"')
-    timezone_re = re.compile(r'\s*TIMEZONE\s*=\s*"')
-    end_re = re.compile(r'"')
+    timezone_re = re.compile(r'\s*(TIME)?ZONE\s*=\s*"(?P<etctz>.+)"')
 
     for filename in ('etc/sysconfig/clock', 'etc/conf.d/clock'):
         tzpath = os.path.join(_root, filename)
@@ -110,17 +108,10 @@ def _get_localzone(_root='/'):
             continue
         with open(tzpath, 'rt') as tzfile:
             for line in tzfile:
-                # Look for the ZONE= setting.
-                match = zone_re.match(line)
-                if match is None:
-                    # No ZONE= setting. Look for the TIMEZONE= setting.
-                    match = timezone_re.match(line)
+                match = timezone_re.match(line)
                 if match is not None:
-                    # Some setting existed
-                    line = line[match.end():]
-                    etctz = line[:end_re.search(line).start()]
-
                     # We found a timezone
+                    etctz = match.group("etctz")
                     return pytz.timezone(etctz.replace(' ', '_'))
 
     # No explicit setting existed. Use localtime

From 66f51babed216adbc4f11aaa715ca355cf88a867 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 28 Dec 2017 00:17:29 +0200
Subject: [PATCH 356/489] Drop EOL Python 2.6 and 3.3

---
 .travis.yml  | 8 --------
 docs/dev.rst | 3 +--
 setup.py     | 3 +--
 tox.ini      | 2 +-
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9469c99a..b819e3e5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,6 @@ cache:
 
 matrix:
   include:
-    - os: linux
-      python: 2.6
-    - os: linux
-      python: 2.6
-      env:
-      - CDECIMAL=m3-cdecimal
     - os: linux
       python: 2.7
     - os: linux
@@ -27,8 +21,6 @@ matrix:
       python: pypy
     - os: linux
       python: pypy3
-    - os: linux
-      python: 3.3
     - os: linux
       python: 3.4
     - os: linux
diff --git a/docs/dev.rst b/docs/dev.rst
index afc8b12d6..0ff033ff8 100644
--- a/docs/dev.rst
+++ b/docs/dev.rst
@@ -30,9 +30,8 @@ Python Versions
 
 At the moment the following Python versions should be supported:
 
-*   Python 2.6
 *   Python 2.7
-*   Python 3.3 and up
+*   Python 3.4 and up
 *   PyPy tracking 2.7 and 3.2 and up
 
 While PyPy does not currently support 3.3, it does support traditional
diff --git a/setup.py b/setup.py
index 684c38718..8e268e16b 100755
--- a/setup.py
+++ b/setup.py
@@ -45,10 +45,8 @@ def run(self):
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
@@ -56,6 +54,7 @@ def run(self):
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     packages=['babel', 'babel.messages', 'babel.localtime'],
     include_package_data=True,
     install_requires=[
diff --git a/tox.ini b/tox.ini
index b71dec7c4..ab733469a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, pypy, py33, py34, py35, py36, pypy3, py26-cdecimal, py27-cdecimal
+envlist = py27, pypy, py33, py34, py35, py36, pypy3, py27-cdecimal
 
 [testenv]
 deps =

From 44f509c6ab67a1a7154d0ffbb8e626e80c3d32be Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 28 Dec 2017 00:25:54 +0200
Subject: [PATCH 357/489] Replace function call with set literal

---
 babel/languages.py              |  2 +-
 babel/messages/catalog.py       |  4 ++--
 babel/messages/checkers.py      |  6 +++---
 babel/plural.py                 |  2 +-
 tests/messages/test_frontend.py | 30 +++++++++---------------------
 tests/test_languages.py         |  4 +++-
 tests/test_numbers.py           |  2 +-
 tests/test_support.py           |  2 +-
 8 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/babel/languages.py b/babel/languages.py
index 40f5d9828..0513d002d 100644
--- a/babel/languages.py
+++ b/babel/languages.py
@@ -26,7 +26,7 @@ def get_official_languages(territory, regional=False, de_facto=False):
     """
 
     territory = str(territory).upper()
-    allowed_stati = set(("official",))
+    allowed_stati = {"official"}
     if regional:
         allowed_stati.add("official_regional")
     if de_facto:
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index fd40058ad..93d0440a8 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -531,7 +531,7 @@ def __iter__(self):
             buf.append('%s: %s' % (name, value))
         flags = set()
         if self.fuzzy:
-            flags |= set(['fuzzy'])
+            flags |= {'fuzzy'}
         yield Message(u'', '\n'.join(buf), flags=flags)
         for key in self._messages:
             yield self._messages[key]
@@ -762,7 +762,7 @@ def _merge(message, oldkey, newkey):
                 message.string = message.string[0]
             message.flags |= oldmsg.flags
             if fuzzy:
-                message.flags |= set([u'fuzzy'])
+                message.flags |= {u'fuzzy'}
             self[message.id] = message
 
         for message in template:
diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py
index 24ecdcfed..97e6e197b 100644
--- a/babel/messages/checkers.py
+++ b/babel/messages/checkers.py
@@ -17,9 +17,9 @@
 
 #: list of format chars that are compatible to each other
 _string_format_compatibilities = [
-    set(['i', 'd', 'u']),
-    set(['x', 'X']),
-    set(['f', 'F', 'g', 'G'])
+    {'i', 'd', 'u'},
+    {'x', 'X'},
+    {'f', 'F', 'g', 'G'}
 ]
 
 
diff --git a/babel/plural.py b/babel/plural.py
index a23f8b53f..06f349ea9 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -241,7 +241,7 @@ def to_gettext(rule):
     """
     rule = PluralRule.parse(rule)
 
-    used_tags = rule.tags | set([_fallback_tag])
+    used_tags = rule.tags | {_fallback_tag}
     _compile = _GettextCompiler().compile
     _get_index = [tag for tag in _plural_tags if tag in used_tags].index
 
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 20904a350..3ac0ac314 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1343,26 +1343,14 @@ def test_extract_keyword_args_384(split, arg_name):
         "extract -F babel-django.cfg --add-comments Translators: -o django232.pot %s ." % kwarg_text
     )
     assert isinstance(cmdinst, extract_messages)
-    assert set(cmdinst.keywords.keys()) == set((
-        '_',
-        'dgettext',
-        'dngettext',
-        'gettext',
-        'gettext_lazy',
-        'gettext_noop',
-        'N_',
-        'ngettext',
-        'ngettext_lazy',
-        'npgettext',
-        'npgettext_lazy',
-        'pgettext',
-        'pgettext_lazy',
-        'ugettext',
-        'ugettext_lazy',
-        'ugettext_noop',
-        'ungettext',
-        'ungettext_lazy',
-    ))
+    assert set(cmdinst.keywords.keys()) == {'_', 'dgettext', 'dngettext',
+                                            'gettext', 'gettext_lazy',
+                                            'gettext_noop', 'N_', 'ngettext',
+                                            'ngettext_lazy', 'npgettext',
+                                            'npgettext_lazy', 'pgettext',
+                                            'pgettext_lazy', 'ugettext',
+                                            'ugettext_lazy', 'ugettext_noop',
+                                            'ungettext', 'ungettext_lazy'}
 
 
 @pytest.mark.parametrize("kwarg,expected", [
@@ -1384,7 +1372,7 @@ def test_extract_distutils_keyword_arg_388(kwarg, expected):
     assert set(cmdinst.keywords.keys()) == set(expected)
 
     # Test the comma-separated comment argument while we're at it:
-    assert set(cmdinst.add_comments) == set(("Bar", "Foo"))
+    assert set(cmdinst.add_comments) == {"Bar", "Foo"}
 
 
 def test_update_catalog_boolean_args():
diff --git a/tests/test_languages.py b/tests/test_languages.py
index 594149fa7..23af26d53 100644
--- a/tests/test_languages.py
+++ b/tests/test_languages.py
@@ -11,4 +11,6 @@ def test_official_languages():
 
 
 def test_get_language_info():
-    assert set(get_territory_language_info("HU").keys()) == set(("hu", "en", "de", "ro", "hr", "sk", "sl"))
+    assert set(get_territory_language_info("HU").keys()) == {"hu", "en", "de",
+                                                             "ro", "hr", "sk",
+                                                             "sl"}
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 48a260b40..6cc6e438e 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -177,7 +177,7 @@ def test_list_currencies():
         list_currencies('yo!')
     assert excinfo.value.args[0] == "expected only letters, got 'yo!'"
 
-    assert list_currencies(locale='pa_Arab') == set(['PKR', 'INR', 'EUR'])
+    assert list_currencies(locale='pa_Arab') == {'PKR', 'INR', 'EUR'}
     assert list_currencies(locale='kok') == set([])
 
     assert len(list_currencies()) == 296
diff --git a/tests/test_support.py b/tests/test_support.py
index f2a99b7ba..6f9fb3246 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -358,4 +358,4 @@ def test_catalog_merge_files():
     t2._catalog["bar"] = "quux"
     t1.merge(t2)
     assert t1.files == ["pro.mo"]
-    assert set(t1._catalog.keys()) == set(('', 'foo', 'bar'))
+    assert set(t1._catalog.keys()) == {'', 'foo', 'bar'}

From 2e6f6b9bd48f93a86dec5b317d4c2eb89a3a6301 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 28 Dec 2017 11:06:59 +0200
Subject: [PATCH 358/489] Remove redundant parentheses

---
 babel/dates.py                  | 4 ++--
 babel/messages/catalog.py       | 4 ++--
 babel/messages/frontend.py      | 2 +-
 tests/messages/test_catalog.py  | 2 +-
 tests/messages/test_extract.py  | 4 ++--
 tests/messages/test_frontend.py | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index d1fafe2a7..377dfebb0 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -521,7 +521,7 @@ def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME, return_city=False):
         territory = 'ZZ'  # invalid/unknown
     territory_name = locale.territories[territory]
     if not return_city and territory and len(get_global('territory_zones').get(territory, [])) == 1:
-        return region_format % (territory_name)
+        return region_format % territory_name
 
     # Otherwise, include the city in the output
     fallback_format = locale.zone_formats['fallback']
@@ -1303,7 +1303,7 @@ def extract(self, char):
         elif char == 'H':
             return self.value.hour
         elif char == 'h':
-            return (self.value.hour % 12 or 12)
+            return self.value.hour % 12 or 12
         elif char == 'm':
             return self.value.minute
         elif char == 'a':
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 93d0440a8..b293e3c73 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -120,8 +120,8 @@ def __cmp__(self, other):
         """Compare Messages, taking into account plural ids"""
         def values_to_compare(obj):
             if isinstance(obj, Message) and obj.pluralizable:
-                return (obj.id[0], obj.context or '')
-            return (obj.id, obj.context or '')
+                return obj.id[0], obj.context or ''
+            return obj.id, obj.context or ''
         return cmp(values_to_compare(self), values_to_compare(other))
 
     def __gt__(self, other):
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index fb171e36a..bee745a7e 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -978,7 +978,7 @@ def parse_mapping(fileobj, filename=None):
                 method = extractors[method]
             method_map[idx] = (pattern, method)
 
-    return (method_map, options_map)
+    return method_map, options_map
 
 
 def parse_keywords(strings=[]):
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index 2d2880c38..07ed724b9 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -101,7 +101,7 @@ def test_update_message_changed_to_plural(self):
 
     def test_update_message_changed_to_simple(self):
         cat = catalog.Catalog()
-        cat.add((u'foo' u'foos'), (u'Voh', u'Vöhs'))
+        cat.add(u'foo' u'foos', (u'Voh', u'Vöhs'))
         tmpl = catalog.Catalog()
         tmpl.add(u'foo')
         cat.update(tmpl)
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 873439de4..17b090fc1 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -178,7 +178,7 @@ def test_triple_quoted_strings(self):
         messages = list(extract.extract_python(buf,
                                                extract.DEFAULT_KEYWORDS.keys(),
                                                [], {}))
-        self.assertEqual([(1, '_', (u'pylons'), []),
+        self.assertEqual([(1, '_', u'pylons', []),
                           (2, 'ngettext', (u'elvis', u'elvises', None), []),
                           (3, 'ngettext', (u'elvis', u'elvises', None), [])],
                          messages)
@@ -350,7 +350,7 @@ def test_different_signatures(self):
         self.assertEqual((None, u'hello', u'there'), messages[2][2])
         self.assertEqual((None, None), messages[3][2])
         self.assertEqual(None, messages[4][2])
-        self.assertEqual(('foo'), messages[5][2])
+        self.assertEqual('foo', messages[5][2])
 
     def test_utf8_message(self):
         buf = BytesIO(u"""
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 3ac0ac314..10325fe61 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1140,7 +1140,7 @@ def test_compile_catalog(self):
         assert not os.path.isfile(mo_file), 'Expected no file at %r' % mo_file
         self.assertEqual("""\
 catalog %s is marked as fuzzy, skipping
-""" % (po_file), sys.stderr.getvalue())
+""" % po_file, sys.stderr.getvalue())
 
     def test_compile_fuzzy_catalog(self):
         po_file = self._po_file('de_DE')

From 0c404b58b25f8e2e115d51fddd5d5716969af219 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 28 Dec 2017 11:12:01 +0200
Subject: [PATCH 359/489] Remove unused imports

---
 babel/numbers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 1f77bcd23..73ff816c6 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -20,16 +20,16 @@
 #  - http://www.unicode.org/reports/tr35/ (Appendix G.6)
 import re
 from datetime import date as date_, datetime as datetime_
-from itertools import chain
 import warnings
 
 from babel.core import default_locale, Locale, get_global
 from babel._compat import decimal, string_types
-from babel.localedata import locale_identifiers
 
 try:
+    # Python 2
     long
 except NameError:
+    # Python 3
     long = int
 
 

From 05974ff14feda12a0d292a560313961796e69113 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 28 Dec 2017 11:13:50 +0200
Subject: [PATCH 360/489] Replace comparison with None with equality operator

---
 tests/test_localedata.py |  4 ++--
 tests/test_numbers.py    | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 3599b2157..5d6c8008a 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -108,12 +108,12 @@ def test_pi_support_not_frozen():
 def test_locale_argument_acceptance():
     # Testing None input.
     normalized_locale = localedata.normalize_locale(None)
-    assert normalized_locale == None
+    assert normalized_locale is None
     locale_exist = localedata.exists(None)
     assert locale_exist == False
 
     # # Testing list input.
     normalized_locale = localedata.normalize_locale(['en_us', None])
-    assert normalized_locale == None
+    assert normalized_locale is None
     locale_exist = localedata.exists(['en_us', None])
     assert locale_exist == False
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 6cc6e438e..2795b0f47 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -206,13 +206,13 @@ def test_is_currency():
 def test_normalize_currency():
     assert normalize_currency('EUR') == 'EUR'
     assert normalize_currency('eUr') == 'EUR'
-    assert normalize_currency('FUU') == None
-    assert normalize_currency('') == None
-    assert normalize_currency(None) == None
-    assert normalize_currency('   EUR    ') == None
-    assert normalize_currency('   ') == None
-    assert normalize_currency([]) == None
-    assert normalize_currency(set()) == None
+    assert normalize_currency('FUU') is None
+    assert normalize_currency('') is None
+    assert normalize_currency(None) is None
+    assert normalize_currency('   EUR    ') is None
+    assert normalize_currency('   ') is None
+    assert normalize_currency([]) is None
+    assert normalize_currency(set()) is None
 
 
 def test_get_currency_name():

From 6126d3bb3be6d51f8676638f9475e0048c44a494 Mon Sep 17 00:00:00 2001
From: Hugo <hugovk@users.noreply.github.com>
Date: Thu, 28 Dec 2017 11:39:20 +0200
Subject: [PATCH 361/489] Drop EOL Python 3.3

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index ab733469a..33d1ab890 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, pypy, py33, py34, py35, py36, pypy3, py27-cdecimal
+envlist = py27, pypy, py34, py35, py36, pypy3, py27-cdecimal
 
 [testenv]
 deps =

From edfb518a589aa6d7bc4243dc2430a5b0f200ca8c Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 15 Jan 2018 12:43:52 +0200
Subject: [PATCH 362/489] Become 2.5.2

---
 CHANGES           | 8 ++++++++
 babel/__init__.py | 2 +-
 docs/conf.py      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0efd2044c..e0f47e87d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,14 @@
 Babel Changelog
 ===============
 
+Version 2.5.2
+-------------
+
+Bugfixes
+~~~~~~~~
+
+* Revert the unnecessary PyInstaller fixes from 2.5.0 and 2.5.1 (#533) (@yagebu)
+
 Version 2.5.1
 -------------
 
diff --git a/babel/__init__.py b/babel/__init__.py
index ba972b5a4..400dbdf3f 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.5.1'
+__version__ = '2.5.2'
diff --git a/docs/conf.py b/docs/conf.py
index a0220168a..f90fe6865 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.5.1'
+release = '2.5.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From bdb2f4babbdbbf425a66e4423279f954fba0fc65 Mon Sep 17 00:00:00 2001
From: Jakob Schnitzer <mail@jakobschnitzer.de>
Date: Thu, 28 Sep 2017 19:17:42 +0200
Subject: [PATCH 363/489] Revert "Also check for `sys._MEIPASS` before assuming
 PyInstallerness (#526)"

This reverts commit 0b34807ab3d9681bb653ac535e0fbc6f0ac3ffbb.
---
 babel/localedata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/localedata.py b/babel/localedata.py
index 4b6d3b68a..ae2154781 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -22,7 +22,7 @@
 
 
 def get_base_dir():
-    if getattr(sys, 'frozen', False) and getattr(sys, '_MEIPASS', None):
+    if getattr(sys, 'frozen', False):
         # we are running in a |PyInstaller| bundle
         basedir = sys._MEIPASS
     else:

From 3fdda1fa34f20fe0feeebf35b29346e8c91b30f3 Mon Sep 17 00:00:00 2001
From: Jakob Schnitzer <mail@jakobschnitzer.de>
Date: Thu, 28 Sep 2017 19:18:32 +0200
Subject: [PATCH 364/489] Revert "Merge pull request #505 from wodo/pi_support"

This reverts commit 653e6d4f654f0f3cbce57054654e09c519b9e412, reversing
changes made to 5f3b00854bbc6fa6a03e04ab572a609eebcc1f72.
---
 babel/core.py            |  2 +-
 babel/localedata.py      | 12 +-----------
 tests/test_localedata.py | 12 ------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index df03b24ad..5140f49d7 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -68,7 +68,7 @@ def get_global(key):
     """
     global _global_data
     if _global_data is None:
-        dirname = localedata.get_base_dir()
+        dirname = os.path.join(os.path.dirname(__file__))
         filename = os.path.join(dirname, 'global.dat')
         if not os.path.isfile(filename):
             _raise_no_data_error()
diff --git a/babel/localedata.py b/babel/localedata.py
index ae2154781..0c94e49ea 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -16,23 +16,13 @@
 import threading
 from collections import MutableMapping
 from itertools import chain
-import sys
 
 from babel._compat import pickle, string_types
 
 
-def get_base_dir():
-    if getattr(sys, 'frozen', False):
-        # we are running in a |PyInstaller| bundle
-        basedir = sys._MEIPASS
-    else:
-        # we are running in a normal Python environment
-        basedir = os.path.dirname(__file__)
-    return basedir
-
 _cache = {}
 _cache_lock = threading.RLock()
-_dirname = os.path.join(get_base_dir(), 'locale-data')
+_dirname = os.path.join(os.path.dirname(__file__), 'locale-data')
 
 
 def normalize_locale(name):
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 3599b2157..6954d3886 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -14,7 +14,6 @@
 import unittest
 import random
 from operator import methodcaller
-import sys
 
 from babel import localedata, numbers
 
@@ -94,17 +93,6 @@ def test_mixedcased_locale():
             methodcaller(random.choice(['lower', 'upper']))(c) for c in l])
         assert localedata.exists(locale_id)
 
-
-def test_pi_support_frozen(monkeypatch):
-    monkeypatch.setattr(sys, '_MEIPASS', 'testdir', raising=False)
-    monkeypatch.setattr(sys, 'frozen', True, raising=False)
-    assert localedata.get_base_dir() == 'testdir'
-
-
-def test_pi_support_not_frozen():
-    assert not getattr(sys, 'frozen', False)
-    assert localedata.get_base_dir().endswith('babel')
-
 def test_locale_argument_acceptance():
     # Testing None input.
     normalized_locale = localedata.normalize_locale(None)

From a009381658f0b1b25cebba26eabb243f210d807c Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 15 Jan 2018 12:43:52 +0200
Subject: [PATCH 365/489] Become 2.5.2

---
 CHANGES           | 8 ++++++++
 babel/__init__.py | 2 +-
 docs/conf.py      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0efd2044c..e0f47e87d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,14 @@
 Babel Changelog
 ===============
 
+Version 2.5.2
+-------------
+
+Bugfixes
+~~~~~~~~
+
+* Revert the unnecessary PyInstaller fixes from 2.5.0 and 2.5.1 (#533) (@yagebu)
+
 Version 2.5.1
 -------------
 
diff --git a/babel/__init__.py b/babel/__init__.py
index ba972b5a4..400dbdf3f 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.5.1'
+__version__ = '2.5.2'
diff --git a/docs/conf.py b/docs/conf.py
index a0220168a..f90fe6865 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.5.1'
+release = '2.5.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 6cca5c736e53936b8b0d16d809382b472f5cd342 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 15 Jan 2018 18:55:40 +0200
Subject: [PATCH 366/489] Become 2.5.3

---
 CHANGES           | 8 ++++++++
 babel/__init__.py | 2 +-
 docs/conf.py      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index e0f47e87d..eff75e070 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,14 @@
 Babel Changelog
 ===============
 
+Version 2.5.3
+-------------
+
+This is a maintenance release that reverts undesired API-breaking changes that slipped into 2.5.2
+(see https://github.com/python-babel/babel/issues/550).
+
+It is based on v2.5.1 (f29eccd) with commits 7cedb84, 29da2d2 and edfb518 cherry-picked on top.
+
 Version 2.5.2
 -------------
 
diff --git a/babel/__init__.py b/babel/__init__.py
index 400dbdf3f..5a388226b 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.5.2'
+__version__ = '2.5.3'
diff --git a/docs/conf.py b/docs/conf.py
index f90fe6865..432387e7c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.5.2'
+release = '2.5.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 9ba950c5ed92496a161cf481b694dd13b534f21d Mon Sep 17 00:00:00 2001
From: StevenJ <stevenj@surveymonkey.com>
Date: Mon, 25 Sep 2017 16:03:14 -0700
Subject: [PATCH 367/489] pofile.py: Added new exception called PoFileError and
 thrown if flagged

This new exception is thrown when the po parser finds an invalid pofile.
This helps handle invalid po files that are parsed. Invalid po files may cause
other possible errors such as a UnicodeEncodeError.

Closes https://github.com/python-babel/babel/issues/531
---
 babel/messages/pofile.py      | 20 +++++++++--
 tests/messages/test_pofile.py | 66 ++++++++++++++++++++++++++++++++++-
 2 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 696ec3e97..beb6f3570 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -19,6 +19,7 @@
 from babel._compat import text_type
 
 
+
 def unescape(string):
     r"""Reverse `escape` the given string.
 
@@ -73,6 +74,15 @@ def denormalize(string):
         return unescape(string)
 
 
+class PoFileError(Exception):
+    """Exception thrown by PoParser when an invalid po file is encountered."""
+    def __init__(self, message, catalog, line, lineno):
+        super(PoFileError, self).__init__('{message} on {lineno}'.format(message=message, lineno=lineno))
+        self.catalog = catalog
+        self.line = line
+        self.lineno = lineno
+
+
 class _NormalizedString(object):
 
     def __init__(self, *args):
@@ -104,11 +114,12 @@ class PoFileParser(object):
         'msgid_plural',
     ]
 
-    def __init__(self, catalog, ignore_obsolete=False):
+    def __init__(self, catalog, ignore_obsolete=False, abort_invalid=False):
         self.catalog = catalog
         self.ignore_obsolete = ignore_obsolete
         self.counter = 0
         self.offset = 0
+        self.abort_invalid = abort_invalid
         self._reset_message_state()
 
     def _reset_message_state(self):
@@ -276,11 +287,13 @@ def parse(self, fileobj):
             self._add_message()
 
     def _invalid_pofile(self, line, lineno, msg):
+        if self.abort_invalid:
+            raise PoFileError(msg, self.catalog, line, lineno)
         print("WARNING:", msg)
         print("WARNING: Problem on line {0}: {1}".format(lineno + 1, line))
 
 
-def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=None):
+def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=None, abort_invalid=False):
     """Read messages from a ``gettext`` PO (portable object) file from the given
     file-like object and return a `Catalog`.
 
@@ -325,9 +338,10 @@ def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=No
     :param domain: the message domain
     :param ignore_obsolete: whether to ignore obsolete messages in the input
     :param charset: the character set of the catalog.
+    :param abort_invalid: abort read if po file is invalid
     """
     catalog = Catalog(locale=locale, domain=domain, charset=charset)
-    parser = PoFileParser(catalog, ignore_obsolete)
+    parser = PoFileParser(catalog, ignore_obsolete, abort_invalid=abort_invalid)
     parser.parse(fileobj)
     return catalog
 
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index f6cd66dba..002954f8a 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -13,6 +13,7 @@
 
 from datetime import datetime
 import unittest
+import sys
 
 from babel.core import Locale
 from babel.messages.catalog import Catalog, Message
@@ -20,7 +21,6 @@
 from babel.util import FixedOffsetTimezone
 from babel._compat import StringIO, BytesIO
 
-
 class ReadPoTestCase(unittest.TestCase):
 
     def test_preserve_locale(self):
@@ -429,6 +429,70 @@ def test_missing_plural_in_the_middle(self):
         self.assertEqual("", message.string[1])
         self.assertEqual("Vohs [text]", message.string[2])
 
+    def test_abort_invalid_po_file(self):
+        invalid_po = '''
+            msgctxt ""
+            "{\"checksum\": 2148532640, \"cxt\": \"collector_thankyou\", \"id\": "
+            "270005359}"
+            msgid ""
+            "Thank you very much for your time.\n"
+            "If you have any questions regarding this survey, please contact Fulano "
+            "at nadie@blah.com"
+            msgstr "Merci de prendre le temps de remplir le sondage.
+            Pour toute question, veuillez communiquer avec Fulano  à nadie@blah.com
+            "
+        '''
+        invalid_po_2 = '''
+            msgctxt ""
+            "{\"checksum\": 2148532640, \"cxt\": \"collector_thankyou\", \"id\": "
+            "270005359}"
+            msgid ""
+            "Thank you very much for your time.\n"
+            "If you have any questions regarding this survey, please contact Fulano "
+            "at fulano@blah.com."
+            msgstr "Merci de prendre le temps de remplir le sondage.
+            Pour toute question, veuillez communiquer avec Fulano a fulano@blah.com
+            "
+            '''
+        # Catalog not created, throws Unicode Error
+        buf = StringIO(invalid_po)
+        output = None
+
+        # This should only be thrown under py27
+        if sys.version_info.major == 2:
+            with self.assertRaises(UnicodeEncodeError):
+                output = pofile.read_po(buf, locale='fr', abort_invalid=False)
+            assert not output
+        else:
+            output = pofile.read_po(buf, locale='fr', abort_invalid=False)
+            assert isinstance(output, Catalog)
+
+        # Catalog not created, throws PoFileError
+        buf = StringIO(invalid_po_2)
+        output = None
+        with self.assertRaises(pofile.PoFileError) as e:
+            output = pofile.read_po(buf, locale='fr', abort_invalid=True)
+        assert not output
+
+        # Catalog is created with warning, no abort
+        buf = StringIO(invalid_po_2)
+        output = pofile.read_po(buf, locale='fr', abort_invalid=False)
+        assert isinstance(output, Catalog)
+
+        # Catalog not created, aborted with PoFileError
+        buf = StringIO(invalid_po_2)
+        output = None
+        with self.assertRaises(pofile.PoFileError) as e:
+            output = pofile.read_po(buf, locale='fr', abort_invalid=True)
+        assert not output
+
+    def test_invalid_pofile_with_abort_flag(self):
+        parser = pofile.PoFileParser(None, abort_invalid=True)
+        lineno = 10
+        line = 'Algo esta mal'
+        msg = 'invalid file'
+        with self.assertRaises(pofile.PoFileError) as e:
+            parser._invalid_pofile(line, lineno, msg)
 
 class WritePoTestCase(unittest.TestCase):
 

From 7dca6fad8e46cd6c491d1ff1f84f3c297f3f5ddd Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 21 Nov 2016 16:38:14 +0200
Subject: [PATCH 368/489] numbers: allow number patterns with no dynamic parts
 whatsoever

---
 babel/numbers.py      | 2 +-
 tests/test_numbers.py | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 73ff816c6..cbd147475 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -611,7 +611,7 @@ def parse_decimal(string, locale=LC_NUMERIC):
 NUMBER_TOKEN = r'[0-9@#.,E+]'
 
 PREFIX_PATTERN = r"(?P<prefix>(?:'[^']*'|%s)*)" % PREFIX_END
-NUMBER_PATTERN = r"(?P<number>%s+)" % NUMBER_TOKEN
+NUMBER_PATTERN = r"(?P<number>%s*)" % NUMBER_TOKEN
 SUFFIX_PATTERN = r"(?P<suffix>.*)"
 
 number_re = re.compile(r"%s%s%s" % (PREFIX_PATTERN, NUMBER_PATTERN,
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 2795b0f47..d9ca991ec 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -589,3 +589,8 @@ def test_numberpattern_repr():
     format = u'¤#,##0.00;(¤#,##0.00)'
     np = numbers.parse_pattern(format)
     assert repr(format) in repr(np)
+
+
+def test_parse_static_pattern():
+    assert numbers.parse_pattern('Kun')  # in the So locale in CLDR 30
+    # TODO: static patterns might not be correctly `apply()`ed at present
\ No newline at end of file

From 63741104da581fbed53ad854d00835cf5f87a8d6 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 21 Nov 2016 16:38:54 +0200
Subject: [PATCH 369/489] cldr: use CLDR 30.0.2 (and fix test changes)

---
 babel/units.py                  |  2 +-
 scripts/download_import_cldr.py |  6 +++---
 scripts/import_cldr.py          | 12 ++++++++----
 tests/test_date_intervals.py    |  2 +-
 tests/test_lists.py             |  2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/babel/units.py b/babel/units.py
index 1ea5b17cc..4260b3d56 100644
--- a/babel/units.py
+++ b/babel/units.py
@@ -201,7 +201,7 @@ def format_compound_unit(
     '150 kilometer per timme'
 
     >>> format_compound_unit(150, "kilowatt", denominator_unit="year", locale="fi")
-    '150 kilowattia vuodessa'
+    '150 kilowattia / vuosi'
 
     >>> format_compound_unit(32.5, "ton", 15, denominator_unit="hour", locale="en")
     '32.5 tons per 15 hours'
diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index 4cc6a4b9b..9914a113e 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -13,9 +13,9 @@
     from urllib import urlretrieve
 
 
-URL = 'http://unicode.org/Public/cldr/29/core.zip'
-FILENAME = 'core-29.zip'
-FILESUM = '44d117e6e591a8f9655602ff0abdee105df3cabe'
+URL = 'http://unicode.org/Public/cldr/30.0.2/core.zip'
+FILENAME = 'core-30.0.2.zip'
+FILESUM = '7d21d5f34a2b94f78f737d9279bcaae85ccc5332'
 BLKSIZE = 131072
 
 
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 7b9e7734b..4f49491ca 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -708,14 +708,18 @@ def parse_number_symbols(data, tree):
 def parse_decimal_formats(data, tree):
     decimal_formats = data.setdefault('decimal_formats', {})
     for elem in tree.findall('.//decimalFormats/decimalFormatLength'):
-        type = elem.attrib.get('type')
-        if _should_skip_elem(elem, type, decimal_formats):
+        length_type = elem.attrib.get('type')
+        if _should_skip_elem(elem, length_type, decimal_formats):
             continue
         if elem.findall('./alias'):
             # TODO map the alias to its target
             continue
-        pattern = text_type(elem.findtext('./decimalFormat/pattern'))
-        decimal_formats[type] = numbers.parse_pattern(pattern)
+        for pattern_el in elem.findall('./decimalFormat/pattern'):
+            pattern_type = pattern_el.attrib.get('type')
+            pattern = numbers.parse_pattern(text_type(pattern_el.text))
+            if not pattern_type:
+                # Regular decimal format.
+                decimal_formats[length_type] = pattern
 
 
 def parse_scientific_formats(data, tree):
diff --git a/tests/test_date_intervals.py b/tests/test_date_intervals.py
index e5a797a94..2e5f0d6e2 100644
--- a/tests/test_date_intervals.py
+++ b/tests/test_date_intervals.py
@@ -13,7 +13,7 @@
 
 
 def test_format_interval_same_instant_1():
-    assert dates.format_interval(TEST_DT, TEST_DT, "yMMMd", fuzzy=False, locale="fi") == "8. tammikuuta 2016"
+    assert dates.format_interval(TEST_DT, TEST_DT, "yMMMd", fuzzy=False, locale="fi") == "8. tammik. 2016"
 
 
 def test_format_interval_same_instant_2():
diff --git a/tests/test_lists.py b/tests/test_lists.py
index f5021ea50..bd297ec38 100644
--- a/tests/test_lists.py
+++ b/tests/test_lists.py
@@ -9,6 +9,6 @@ def test_format_list():
         (['string1', 'string2'], 'en', u'string1 and string2'),
         (['string1', 'string2', 'string3'], 'en', u'string1, string2, and string3'),
         (['string1', 'string2', 'string3'], 'zh', u'string1、string2和string3'),
-        (['string1', 'string2', 'string3', 'string4'], 'ne', u'string1 र string2, string3 र string4'),
+        (['string1', 'string2', 'string3', 'string4'], 'ne', u'string1,string2, string3 र string4'),
     ]:
         assert lists.format_list(list, locale=locale) == expected

From 77849ec967f9ff6f8470753abc2976c94b22aa2e Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 21 Nov 2016 16:39:53 +0200
Subject: [PATCH 370/489] cldr: Parse compact decimal formats that appear in
 CLDR 30

---
 scripts/import_cldr.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 4f49491ca..94fe85ea2 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -717,7 +717,19 @@ def parse_decimal_formats(data, tree):
         for pattern_el in elem.findall('./decimalFormat/pattern'):
             pattern_type = pattern_el.attrib.get('type')
             pattern = numbers.parse_pattern(text_type(pattern_el.text))
-            if not pattern_type:
+            if pattern_type:
+                # This is a compact decimal format, see:
+                # http://www.unicode.org/reports/tr35/tr35-45/tr35-numbers.html#Compact_Number_Formats
+
+                # These are mapped into a `compact_decimal_formats` dictionary
+                # with the format {length: {count: {multiplier: pattern}}}.
+
+                # TODO: Add support for formatting them.
+                compact_decimal_formats = data.setdefault('compact_decimal_formats', {})
+                length_map = compact_decimal_formats.setdefault(length_type, {})
+                length_count_map = length_map.setdefault(pattern_el.attrib['count'], {})
+                length_count_map[pattern_type] = pattern
+            else:
                 # Regular decimal format.
                 decimal_formats[length_type] = pattern
 

From a43d46486746b270f44e5412fc227d5f803bdf9e Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 18 Aug 2017 13:14:46 +0300
Subject: [PATCH 371/489] cldr: use CLDR 31.0.1 (and fix test changes); see
 below!

CLDR 31.0 separated the GMT and UTC time zones, so formatting of that
time zone has changed.  Most notably, "UTC" replaces "+0000" when formatting
the timezone.  This could break code that expects +0000.

A subset (the parts supported by Babel) of the migration guide from
http://cldr.unicode.org/index/downloads/cldr-31:

* The locales in the language-territory population tables have been changed to
  be the canonical format, dropping the script where it is the default.
  So "ku_Latn" changes to "ku".
* Plural rules: The Portuguese plural rules have changed so that all
  (and only) integers and decimal fractions < 2 are singular.
* Timezones: The GMT timezone has been split from the UTC timezone.
* Timezones: New timezone bcp47 codes have been added.
* Languages "hr" and "sr" are no longer a short distance apart, for political reasons.
* The primary names for CZ changed from "Czech Republic" to
  "Czechia", with the longer name now the alternate.
---
 babel/core.py                   |  2 +-
 scripts/download_import_cldr.py |  8 ++++----
 tests/test_core.py              |  3 ++-
 tests/test_dates.py             | 14 +++++++-------
 tests/test_languages.py         |  7 ++++---
 tests/test_numbers.py           |  4 ++--
 6 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index c8b180214..5a9091fae 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -39,7 +39,7 @@ def get_global(key):
     information independent of individual locales.
 
     >>> get_global('zone_aliases')['UTC']
-    u'Etc/GMT'
+    u'Etc/UTC'
     >>> get_global('zone_territories')['Europe/Berlin']
     u'DE'
 
diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index 9914a113e..61b277326 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -13,9 +13,9 @@
     from urllib import urlretrieve
 
 
-URL = 'http://unicode.org/Public/cldr/30.0.2/core.zip'
-FILENAME = 'core-30.0.2.zip'
-FILESUM = '7d21d5f34a2b94f78f737d9279bcaae85ccc5332'
+URL = 'http://www.unicode.org/Public/cldr/31.0.1/core.zip'
+FILENAME = 'core-31.0.1.zip'
+FILESUM = '01ade6c2d1f358e63c2ab6e2861d4caa7114ff45'
 BLKSIZE = 131072
 
 
@@ -82,7 +82,7 @@ def main():
             os.remove(zip_path)
         urlretrieve(URL, zip_path, reporthook)
         changed = True
-        print
+        print()
     common_path = os.path.join(cldr_path, 'common')
 
     if changed or not os.path.isdir(common_path):
diff --git a/tests/test_core.py b/tests/test_core.py
index e3d8faffa..4f985ca74 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -58,7 +58,8 @@ def test_ignore_invalid_locales_in_lc_ctype(os_environ):
 
 
 def test_get_global():
-    assert core.get_global('zone_aliases')['UTC'] == 'Etc/GMT'
+    assert core.get_global('zone_aliases')['GMT'] == 'Etc/GMT'
+    assert core.get_global('zone_aliases')['UTC'] == 'Etc/UTC'
     assert core.get_global('zone_territories')['Europe/Berlin'] == 'DE'
 
 
diff --git a/tests/test_dates.py b/tests/test_dates.py
index f74cd396d..9a01d985e 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -292,7 +292,7 @@ def test_with_float(self):
         d = datetime(2012, 4, 1, 15, 30, 29, tzinfo=timezone('UTC'))
         epoch = float(calendar.timegm(d.timetuple()))
         formatted_string = dates.format_datetime(epoch, format='long', locale='en_US')
-        self.assertEqual(u'April 1, 2012 at 3:30:29 PM +0000', formatted_string)
+        self.assertEqual(u'April 1, 2012 at 3:30:29 PM UTC', formatted_string)
 
     def test_timezone_formats(self):
         dt = datetime(2016, 1, 13, 7, 8, 35)
@@ -358,9 +358,9 @@ def test_timezone_formats(self):
         formatted_string = dates.format_datetime(dt, 'OOOO', locale='en')
         self.assertEqual(u'GMT+00:00', formatted_string)
         formatted_string = dates.format_datetime(dt, 'VV', locale='en')
-        self.assertEqual(u'Etc/GMT', formatted_string)
+        self.assertEqual(u'Etc/UTC', formatted_string)
         formatted_string = dates.format_datetime(dt, 'VVV', locale='en')
-        self.assertEqual(u'GMT', formatted_string)
+        self.assertEqual(u'UTC', formatted_string)
         formatted_string = dates.format_datetime(dt, 'X', locale='en')
         self.assertEqual(u'Z', formatted_string)
         formatted_string = dates.format_datetime(dt, 'XX', locale='en')
@@ -430,7 +430,7 @@ def test_with_float(self):
         d = datetime(2012, 4, 1, 15, 30, 29, tzinfo=timezone('UTC'))
         epoch = float(calendar.timegm(d.timetuple()))
         formatted_time = dates.format_time(epoch, format='long', locale='en_US')
-        self.assertEqual(u'3:30:29 PM +0000', formatted_time)
+        self.assertEqual(u'3:30:29 PM UTC', formatted_time)
 
     def test_with_date_fields_in_pattern(self):
         self.assertRaises(AttributeError, dates.format_time, date(2007, 4, 1),
@@ -511,7 +511,7 @@ def test_can_format_time_with_non_pytz_timezone(self):
         utc = self._utc()
         t = datetime(2007, 4, 1, 15, 30, tzinfo=utc)
         formatted_time = dates.format_time(t, 'long', tzinfo=utc, locale='en')
-        self.assertEqual('3:30:00 PM +0000', formatted_time)
+        self.assertEqual('3:30:00 PM UTC', formatted_time)
 
 
 def test_get_period_names():
@@ -633,8 +633,8 @@ def test_get_timezone_name():
 
     assert (dates.get_timezone_name('Europe/Berlin', locale='en_US') == "Central European Time")
 
-    assert (dates.get_timezone_name(1400000000, locale='en_US', width='short') == "Unknown Region (GMT) Time")
-    assert (dates.get_timezone_name(time(16, 20), locale='en_US', width='short') == "+0000")
+    assert (dates.get_timezone_name(1400000000, locale='en_US', width='short') == "Unknown Region (UTC) Time")
+    assert (dates.get_timezone_name(time(16, 20), locale='en_US', width='short') == "UTC")
 
 
 def test_format_date():
diff --git a/tests/test_languages.py b/tests/test_languages.py
index 23af26d53..32f0d67d5 100644
--- a/tests/test_languages.py
+++ b/tests/test_languages.py
@@ -11,6 +11,7 @@ def test_official_languages():
 
 
 def test_get_language_info():
-    assert set(get_territory_language_info("HU").keys()) == {"hu", "en", "de",
-                                                             "ro", "hr", "sk",
-                                                             "sl"}
+    assert (
+        set(get_territory_language_info("HU")) ==
+        {"hu", "fr", "en", "de", "ro", "hr", "sk", "sl"}
+    )
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index d9ca991ec..83990058c 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -180,7 +180,7 @@ def test_list_currencies():
     assert list_currencies(locale='pa_Arab') == {'PKR', 'INR', 'EUR'}
     assert list_currencies(locale='kok') == set([])
 
-    assert len(list_currencies()) == 296
+    assert len(list_currencies()) == 297
 
 
 def test_validate_currency():
@@ -593,4 +593,4 @@ def test_numberpattern_repr():
 
 def test_parse_static_pattern():
     assert numbers.parse_pattern('Kun')  # in the So locale in CLDR 30
-    # TODO: static patterns might not be correctly `apply()`ed at present
\ No newline at end of file
+    # TODO: static patterns might not be correctly `apply()`ed at present

From 7bfa3a51a20ddb9dd78e9587095a7986bfc716fb Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 19 Jan 2018 13:31:17 +0200
Subject: [PATCH 372/489] Update py.test

* Add py.test's .cache to ignore
* setup.cfg: Use [tool:pytest] instead of deprecated [pytest]
---
 .ci/appveyor.yml | 2 +-
 .gitignore       | 3 ++-
 .travis.yml      | 2 +-
 setup.cfg        | 2 +-
 tox.ini          | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index 2dfbdd884..816b938f6 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -27,7 +27,7 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   # Build data files
-  - "pip install --upgrade pytest==2.8.5 pytest-cov==2.2.0 codecov freezegun==0.3.9"
+  - "pip install --upgrade pytest==3.3.2 pytest-cov==2.5.1 codecov freezegun==0.3.9"
   - "pip install --editable ."
   - "python setup.py import_cldr"
 
diff --git a/.gitignore b/.gitignore
index d8f8bc164..e15875ba0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ build
 dist
 .DS_Store
 .tox
+.cache
 test-env
 **/__pycache__
 babel/global.dat
@@ -18,4 +19,4 @@ babel/global.dat.json
 tests/messages/data/project/i18n/long_messages.pot
 tests/messages/data/project/i18n/temp*
 tests/messages/data/project/i18n/en_US
-/venv*
+/venv*
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index b819e3e5e..63dcd3ec0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ matrix:
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
-  - pip install --upgrade pytest==2.8.5 pytest-cov==2.2.0 $CDECIMAL freezegun==0.3.9
+  - pip install --upgrade $CDECIMAL pytest==3.3.2 pytest-cov==2.5.1 freezegun==0.3.9
   - pip install --editable .
 
 script:
diff --git a/setup.cfg b/setup.cfg
index d5f180a24..4e877a36f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [aliases]
 release = sdist bdist_wheel
 
-[pytest]
+[tool:pytest]
 norecursedirs = venv* .* _* scripts {args}
 doctest_optionflags = ELLIPSIS NORMALIZE_WHITESPACE ALLOW_UNICODE IGNORE_EXCEPTION_DETAIL
 
diff --git a/tox.ini b/tox.ini
index 33d1ab890..925ea7fe0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,8 @@ envlist = py27, pypy, py34, py35, py36, pypy3, py27-cdecimal
 
 [testenv]
 deps =
-    pytest
+    pytest==3.3.2
+    pytest-cov==2.5.1
     cdecimal: m3-cdecimal
     freezegun
 whitelist_externals = make

From ff7e3d2e74ff2c271294ae850f5fa139ce981488 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 19 Jan 2018 13:27:44 +0200
Subject: [PATCH 373/489] CLDR: Use CLDR 32.0.1

---
 babel/dates.py                  | 2 +-
 scripts/download_import_cldr.py | 6 +++---
 tests/test_numbers.py           | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 1cc796222..a30d6d8e2 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -982,7 +982,7 @@ def format_interval(start, end, skeleton=None, tzinfo=None, fuzzy=True, locale=L
     u'15.\u201317.1.2016'
 
     >>> format_interval(time(12, 12), time(16, 16), "Hm", locale="en_GB")
-    '12:12 \u2013 16:16'
+    '12:12\u201316:16'
 
     >>> format_interval(time(5, 12), time(16, 16), "hm", locale="en_US")
     '5:12 AM \u2013 4:16 PM'
diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index 61b277326..1d3c17bf6 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -13,9 +13,9 @@
     from urllib import urlretrieve
 
 
-URL = 'http://www.unicode.org/Public/cldr/31.0.1/core.zip'
-FILENAME = 'core-31.0.1.zip'
-FILESUM = '01ade6c2d1f358e63c2ab6e2861d4caa7114ff45'
+URL = 'http://unicode.org/Public/cldr/32.0.1/core.zip'
+FILENAME = 'core-32.0.1.zip'
+FILESUM = '571e33f482543f02ebd06c9b43d127a87c637c8c'
 BLKSIZE = 131072
 
 
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 83990058c..3ad9c663f 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -178,9 +178,8 @@ def test_list_currencies():
     assert excinfo.value.args[0] == "expected only letters, got 'yo!'"
 
     assert list_currencies(locale='pa_Arab') == {'PKR', 'INR', 'EUR'}
-    assert list_currencies(locale='kok') == set([])
 
-    assert len(list_currencies()) == 297
+    assert len(list_currencies()) == 299
 
 
 def test_validate_currency():

From bd2ac889827f55fc6d48b3e63fa38e3c090f8892 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 19 Jan 2018 13:39:07 +0200
Subject: [PATCH 374/489] Lists: add support for various list styles other than
 the default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was inspired by the CLDR 32 release notes:

> New “disjunctive” list style (eg “a, b, or c”)
---
 babel/core.py          |  6 ++---
 babel/lists.py         | 55 ++++++++++++++++++++++++++++++++++++------
 scripts/import_cldr.py | 10 +++++---
 tests/test_lists.py    |  7 ++++++
 4 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/babel/core.py b/babel/core.py
index 5a9091fae..5a1a9125d 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -857,11 +857,11 @@ def list_patterns(self):
         .. note:: The format of the value returned may change between
                   Babel versions.
 
-        >>> Locale('en').list_patterns['start']
+        >>> Locale('en').list_patterns['standard']['start']
         u'{0}, {1}'
-        >>> Locale('en').list_patterns['end']
+        >>> Locale('en').list_patterns['standard']['end']
         u'{0}, and {1}'
-        >>> Locale('en_GB').list_patterns['end']
+        >>> Locale('en_GB').list_patterns['standard']['end']
         u'{0} and {1}'
         """
         return self._data['list_patterns']
diff --git a/babel/lists.py b/babel/lists.py
index 82e5590c1..329437975 100644
--- a/babel/lists.py
+++ b/babel/lists.py
@@ -11,7 +11,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2015 by the Babel Team.
+    :copyright: (c) 2015, 2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
@@ -20,16 +20,46 @@
 DEFAULT_LOCALE = default_locale()
 
 
-def format_list(lst, locale=DEFAULT_LOCALE):
+def format_list(lst, style='standard', locale=DEFAULT_LOCALE):
     """
     Format the items in `lst` as a list.
 
-    >>> format_list(['apples', 'oranges', 'pears'], 'en')
+    >>> format_list(['apples', 'oranges', 'pears'], locale='en')
     u'apples, oranges, and pears'
-    >>> format_list(['apples', 'oranges', 'pears'], 'zh')
+    >>> format_list(['apples', 'oranges', 'pears'], locale='zh')
     u'apples\u3001oranges\u548cpears'
+    >>> format_list(['omena', 'peruna', 'aplari'], style='or', locale='fi')
+    u'omena, peruna tai aplari'
+
+    These styles are defined, but not all are necessarily available in all locales.
+    The following text is verbatim from the Unicode TR35-49 spec [1].
+
+    * standard:
+      A typical 'and' list for arbitrary placeholders.
+      eg. "January, February, and March"
+    * standard-short:
+      A short version of a 'and' list, suitable for use with short or abbreviated placeholder values.
+      eg. "Jan., Feb., and Mar."
+    * or:
+      A typical 'or' list for arbitrary placeholders.
+      eg. "January, February, or March"
+    * or-short:
+      A short version of an 'or' list.
+      eg. "Jan., Feb., or Mar."
+    * unit:
+      A list suitable for wide units.
+      eg. "3 feet, 7 inches"
+    * unit-short:
+      A list suitable for short units
+      eg. "3 ft, 7 in"
+    * unit-narrow:
+      A list suitable for narrow units, where space on the screen is very limited.
+      eg. "3′ 7″"
+
+    [1]: https://www.unicode.org/reports/tr35/tr35-49/tr35-general.html#ListPatterns
 
     :param lst: a sequence of items to format in to a list
+    :param style: the style to format the list with. See above for description.
     :param locale: the locale
     """
     locale = Locale.parse(locale)
@@ -37,12 +67,21 @@ def format_list(lst, locale=DEFAULT_LOCALE):
         return ''
     if len(lst) == 1:
         return lst[0]
+
+    if style not in locale.list_patterns:
+        raise ValueError('Locale %s does not support list formatting style %r (supported are %s)' % (
+            locale,
+            style,
+            list(sorted(locale.list_patterns)),
+        ))
+    patterns = locale.list_patterns[style]
+
     if len(lst) == 2:
-        return locale.list_patterns['2'].format(*lst)
+        return patterns['2'].format(*lst)
 
-    result = locale.list_patterns['start'].format(lst[0], lst[1])
+    result = patterns['start'].format(lst[0], lst[1])
     for elem in lst[2:-1]:
-        result = locale.list_patterns['middle'].format(result, elem)
-    result = locale.list_patterns['end'].format(result, lst[-1])
+        result = patterns['middle'].format(result, elem)
+    result = patterns['end'].format(result, lst[-1])
 
     return result
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 94fe85ea2..d50e14667 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -397,7 +397,7 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
             data["day_period_rules"] = day_period_rules[locale_id]
 
         parse_locale_display_names(data, tree)
-
+        parse_list_patterns(data, tree)
         parse_dates(data, tree, sup, regions, territory)
 
         for calendar in tree.findall('.//calendars/calendar'):
@@ -478,12 +478,14 @@ def parse_locale_display_names(data, tree):
     scripts = data.setdefault('scripts', {})
     for elem in tree.findall('.//scripts/script'):
         _import_type_text(scripts, elem)
+
+
+def parse_list_patterns(data, tree):
     list_patterns = data.setdefault('list_patterns', {})
     for listType in tree.findall('.//listPatterns/listPattern'):
-        if 'type' in listType.attrib:
-            continue
+        by_type = list_patterns.setdefault(listType.attrib.get('type', 'standard'), {})
         for listPattern in listType.findall('listPatternPart'):
-            list_patterns[listPattern.attrib['type']] = _text(listPattern)
+            by_type[listPattern.attrib['type']] = _text(listPattern)
 
 
 def parse_dates(data, tree, sup, regions, territory):
diff --git a/tests/test_lists.py b/tests/test_lists.py
index bd297ec38..e843a6358 100644
--- a/tests/test_lists.py
+++ b/tests/test_lists.py
@@ -1,4 +1,6 @@
 # coding=utf-8
+import pytest
+
 from babel import lists
 
 
@@ -12,3 +14,8 @@ def test_format_list():
         (['string1', 'string2', 'string3', 'string4'], 'ne', u'string1,string2, string3 र string4'),
     ]:
         assert lists.format_list(list, locale=locale) == expected
+
+
+def test_format_list_error():
+    with pytest.raises(ValueError):
+        lists.format_list(['a', 'b', 'c'], style='orange', locale='en')

From b7e1895c2c3fd90d21c658506c3f009e510989eb Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 25 Jan 2018 18:17:06 +0200
Subject: [PATCH 375/489] Test that CLDR 32 properly formats Russian
 start-of-year dates.

Fixes #485
---
 tests/test_dates.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/test_dates.py b/tests/test_dates.py
index 9a01d985e..6df4631f5 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -783,3 +783,10 @@ def test_no_inherit_metazone_formatting():
     assert dates.format_time(t, format='long', locale='en_GB') == "07:00:00 Pacific Standard Time"
     assert dates.get_timezone_name(t, width='short', locale='en_US') == "PST"
     assert dates.get_timezone_name(t, width='short', locale='en_GB') == "Pacific Standard Time"
+
+
+def test_russian_week_numbering():
+    # See https://github.com/python-babel/babel/issues/485
+    v = date(2017, 1, 1)
+    assert dates.format_date(v, format='YYYY-ww',locale='ru_RU') == '2016-52'  # This would have returned 2017-01 prior to CLDR 32
+    assert dates.format_date(v, format='YYYY-ww',locale='de_DE') == '2016-52'
\ No newline at end of file

From 57832c6e3d3b6513d66a3825de9bf537bb07be17 Mon Sep 17 00:00:00 2001
From: xmo-odoo <xmo@odoo.com>
Date: Fri, 26 Jan 2018 11:14:57 +0100
Subject: [PATCH 376/489] Add explicit signatures to some date autofunctions

Because default_locale is eager, it generates misleading documentation when built (including on the site) as the doc will show the LC_TIME for the machine which built the doc.

An explicit autofunction signature fixes that and provides a more correct view of the signature.

An alternative fix would be for the LC_TIME value in the module to be a custom object with a repr of LC_TIME or something along those lines.

Fixes #542
---
 docs/api/dates.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/api/dates.rst b/docs/api/dates.rst
index 0fa9f1f32..f3e59b63b 100644
--- a/docs/api/dates.rst
+++ b/docs/api/dates.rst
@@ -9,17 +9,17 @@ Python `datetime`, `date` and `time` objects and work with timezones.
 Date and Time Formatting
 ------------------------
 
-.. autofunction:: format_datetime
+.. autofunction:: format_datetime(datetime=None, format='medium', tzinfo=None, locale=default_locale('LC_TIME'))
 
-.. autofunction:: format_date
+.. autofunction:: format_date(date=None, format='medium', locale=default_locale('LC_TIME'))
 
-.. autofunction:: format_time
+.. autofunction:: format_time(time=None, format='medium', tzinfo=None, locale=default_locale('LC_TIME'))
 
-.. autofunction:: format_timedelta
+.. autofunction:: format_timedelta(delta, granularity='second', threshold=.85, add_direction=False, format='long', locale=default_locale('LC_TIME'))
 
-.. autofunction:: format_skeleton
+.. autofunction:: format_skeleton(skeleton, datetime=None, tzinfo=None, fuzzy=True, locale=default_locale('LC_TIME'))
 
-.. autofunction:: format_interval
+.. autofunction:: format_interval(start, end, skeleton=None, tzinfo=None, fuzzy=True, locale=default_locale('LC_TIME'))
 
 Timezone Functionality
 ----------------------

From c60e26ab85561bc90709008c10606f5e0b2ac1a1 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 2 Feb 2018 17:29:52 +0200
Subject: [PATCH 377/489] messages: allow processing files that are in locales
 unknown to Babel

Fixes #553, #555
---
 babel/messages/catalog.py     | 54 +++++++++++++++++++++++++++--------
 tests/messages/test_pofile.py | 23 +++++++++++++++
 2 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index b293e3c73..cd01ec4e4 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -19,11 +19,11 @@
 from copy import copy
 
 from babel import __version__ as VERSION
-from babel.core import Locale
+from babel.core import Locale, UnknownLocaleError
 from babel.dates import format_datetime
 from babel.messages.plurals import get_plural
 from babel.util import odict, distinct, LOCALTZ, FixedOffsetTimezone
-from babel._compat import string_types, number_types, PY2, cmp
+from babel._compat import string_types, number_types, PY2, cmp, text_type
 
 __all__ = ['Message', 'Catalog', 'TranslationError']
 
@@ -267,8 +267,6 @@ def __init__(self, locale=None, domain=None, header_comment=DEFAULT_HEADER,
         :param fuzzy: the fuzzy bit on the catalog header
         """
         self.domain = domain
-        if locale:
-            locale = Locale.parse(locale)
         self.locale = locale
         self._header_comment = header_comment
         self._messages = odict()
@@ -301,6 +299,36 @@ def __init__(self, locale=None, domain=None, header_comment=DEFAULT_HEADER,
         self._num_plurals = None
         self._plural_expr = None
 
+    def _set_locale(self, locale):
+        if locale is None:
+            self._locale_identifier = None
+            self._locale = None
+            return
+
+        if isinstance(locale, Locale):
+            self._locale_identifier = text_type(locale)
+            self._locale = locale
+            return
+
+        if isinstance(locale, string_types):
+            self._locale_identifier = text_type(locale)
+            try:
+                self._locale = Locale.parse(locale)
+            except UnknownLocaleError:
+                self._locale = None
+            return
+
+        raise TypeError('`locale` must be a Locale, a locale identifier string, or None; got %r' % locale)
+
+    def _get_locale(self):
+        return self._locale
+
+    def _get_locale_identifier(self):
+        return self._locale_identifier
+
+    locale = property(_get_locale, _set_locale)
+    locale_identifier = property(_get_locale_identifier)
+
     def _get_header_comment(self):
         comment = self._header_comment
         year = datetime.now(LOCALTZ).strftime('%Y')
@@ -310,9 +338,9 @@ def _get_header_comment(self):
                          .replace('VERSION', self.version) \
                          .replace('YEAR', year) \
                          .replace('ORGANIZATION', self.copyright_holder)
-        if self.locale:
-            comment = comment.replace('Translations template', '%s translations'
-                                      % self.locale.english_name)
+        locale_name = (self.locale.english_name if self.locale else self.locale_identifier)
+        if locale_name:
+            comment = comment.replace('Translations template', '%s translations' % locale_name)
         return comment
 
     def _set_header_comment(self, string):
@@ -366,12 +394,12 @@ def _get_mime_headers(self):
         else:
             headers.append(('PO-Revision-Date', self.revision_date))
         headers.append(('Last-Translator', self.last_translator))
-        if self.locale is not None:
-            headers.append(('Language', str(self.locale)))
-        if (self.locale is not None) and ('LANGUAGE' in self.language_team):
+        if self.locale_identifier:
+            headers.append(('Language', str(self.locale_identifier)))
+        if self.locale_identifier and ('LANGUAGE' in self.language_team):
             headers.append(('Language-Team',
                             self.language_team.replace('LANGUAGE',
-                                                       str(self.locale))))
+                                                       str(self.locale_identifier))))
         else:
             headers.append(('Language-Team', self.language_team))
         if self.locale is not None:
@@ -396,7 +424,7 @@ def _set_mime_headers(self, headers):
                 self.last_translator = value
             elif name == 'language':
                 value = value.replace('-', '_')
-                self.locale = Locale.parse(value)
+                self._set_locale(value)
             elif name == 'language-team':
                 self.language_team = value
             elif name == 'content-type':
@@ -490,6 +518,8 @@ def plural_expr(self):
         '(n != 1)'
         >>> Catalog(locale='ga').plural_expr
         '(n==1 ? 0 : n==2 ? 1 : n>=3 && n<=6 ? 2 : n>=7 && n<=10 ? 3 : 4)'
+        >>> Catalog(locale='ding').plural_expr  # unknown locale
+        '(n != 1)'
 
         :type: `string_types`"""
         if self._plural_expr is None:
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 002954f8a..b2c6f6702 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -494,6 +494,7 @@ def test_invalid_pofile_with_abort_flag(self):
         with self.assertRaises(pofile.PoFileError) as e:
             parser._invalid_pofile(line, lineno, msg)
 
+
 class WritePoTestCase(unittest.TestCase):
 
     def test_join_locations(self):
@@ -864,3 +865,25 @@ def test_denormalize_on_msgstr_without_empty_first_line(self):
         self.assertEqual(expected_denormalized, pofile.denormalize(msgstr))
         self.assertEqual(expected_denormalized,
                          pofile.denormalize('""\n' + msgstr))
+
+
+def test_unknown_language_roundtrip():
+    buf = StringIO(r'''
+msgid ""
+msgstr ""
+"Language: sr_SP\n"''')
+    catalog = pofile.read_po(buf)
+    assert catalog.locale_identifier == 'sr_SP'
+    assert not catalog.locale
+    buf = BytesIO()
+    pofile.write_po(buf, catalog)
+    assert 'sr_SP' in buf.getvalue().decode()
+
+
+def test_unknown_language_write():
+    catalog = Catalog(locale='sr_SP')
+    assert catalog.locale_identifier == 'sr_SP'
+    assert not catalog.locale
+    buf = BytesIO()
+    pofile.write_po(buf, catalog)
+    assert 'sr_SP' in buf.getvalue().decode()

From 6170eff2b566ccf4a17139cf6195df4d1d02629c Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 2 Feb 2018 17:50:04 +0200
Subject: [PATCH 378/489] import_cldr: choice patterns in currencies are
 deprecated, so remove todo

---
 scripts/import_cldr.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index d50e14667..ab676a901 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -770,7 +770,6 @@ def parse_currency_names(data, tree):
                     name.attrib['count']] = text_type(name.text)
             else:
                 currency_names[code] = text_type(name.text)
-        # TODO: support choice patterns for currency symbol selection
         symbol = elem.find('symbol')
         if symbol is not None and 'draft' not in symbol.attrib and 'choice' not in symbol.attrib:
             currency_symbols[code] = text_type(symbol.text)

From b611f0c6175e85e9caea6dab8add35d1a2968dec Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 2 Feb 2018 17:52:47 +0200
Subject: [PATCH 379/489] import_cldr: avoid importing alt=narrow currency
 symbols

Fixes #397

Closes #483, #556
---
 scripts/import_cldr.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index ab676a901..b81fa6091 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -770,8 +770,11 @@ def parse_currency_names(data, tree):
                     name.attrib['count']] = text_type(name.text)
             else:
                 currency_names[code] = text_type(name.text)
-        symbol = elem.find('symbol')
-        if symbol is not None and 'draft' not in symbol.attrib and 'choice' not in symbol.attrib:
+        for symbol in elem.findall('symbol'):
+            if 'draft' in symbol.attrib or 'choice' in symbol.attrib:  # Skip drafts and choice-patterns
+                continue
+            if symbol.attrib.get('alt'):  # Skip alternate forms
+                continue
             currency_symbols[code] = text_type(symbol.text)
 
 

From 47fa155ace10d32fd69867043486e87f50ad97eb Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 2 Feb 2018 18:45:19 +0200
Subject: [PATCH 380/489] Add script to generate the AUTHORS file and
 regenerate it

---
 AUTHORS                     | 114 +++++++++++++++++++++++++++++-------
 scripts/generate_authors.py |  40 +++++++++++++
 2 files changed, 134 insertions(+), 20 deletions(-)
 create mode 100644 scripts/generate_authors.py

diff --git a/AUTHORS b/AUTHORS
index b9208fe59..58a9bee28 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,25 +1,99 @@
-Babel is written and maintained by the Babel team and various contributors:
-
-Maintainer and Current Project Lead:
 
-- Armin Ronacher <armin.ronacher@active-4.com>
-
-Contributors:
+Babel is written and maintained by the Babel team and various contributors:
 
-- Christopher Lenz <cmlenz@gmail.com>
-- Alex Morega <alex@grep.ro>
-- Felix Schwarz <felix.schwarz@oss.schwarz.eu>
-- Pedro Algarvio <pedro@algarvio.me>
-- Jeroen Ruigrok van der Werven <asmodai@in-nomine.org>
-- Philip Jenvey <pjenvey@underboss.org>
-- Tobias Bieniek <Tobias.Bieniek@gmx.de>
-- Jonas Borgström <jonas@edgewall.org>
-- Daniel Neuhäuser <dasdasich@gmail.com>
-- Nick Retallack <nick@bitcasa.com>
-- Thomas Waldmann <tw@waldmann-edv.de>
-- Lennart Regebro <regebro@gmail.com>
-- Isaac Jurado <diptongo@gmail.com>
-- Craig Loftus <craig@regulusweb.com>
+- Christopher Lenz
+- Armin Ronacher
+- Aarni Koskela
+- Alex Morega
+- Lasse Schuirmann
+- Felix Schwarz
+- Pedro Algarvio
+- Jeroen Ruigrok van der Werven
+- Philip Jenvey
+- benselme
+- Isaac Jurado
+- Tobias Bieniek
+- Erick Wilder
+- Michael Birtwell
+- Jonas Borgström
+- Kevin Deldycke
+- Ville Skyttä
+- Hugo
+- Heungsub Lee
+- Jakob Schnitzer
+- Sachin Paliwal
+- Alex Willmer
+- Daniel Neuhäuser
+- Jennifer Wang
+- Lukas Balaga
+- sudheesh001
+- Jon Dufresne
+- Xavier Fernandez
+- KO. Mattsson
+- Sébastien Diemer
+- alexbodn@gmail.com
+- saurabhiiit
+- srisankethu
+- Erik Romijn
+- Lukas B
+- Ryan J Ollos
+- Arturas Moskvinas
+- Leonardo Pistone
+- Jun Omae
+- Hyunjun Kim
+- xmo-odoo
+- StevenJ
+- Jungmo Ku
+- Simeon Visser
+- Narendra Vardi
+- Stefane Fermigier
+- Narayan Acharya
+- François Magimel
+- Wolfgang Doll
+- Roy Williams
+- Marc-André Dufresne
+- Abhishek Tiwari
+- David Baumgold
+- Alex Kuzmenko
+- Georg Schölly
+- ldwoolley
+- Rodrigo Ramírez Norambuena
+- Jakub Wilk
+- Roman Rader
+- Max Shenfield
+- Nicolas Grilly
+- Kenny Root
+- Adam Chainz
+- Sébastien Fievet
+- Anthony Sottile
+- Yuriy Shatrov
+- iamshubh22
+- Sven Anderson
+- Eoin Nugent
+- Roman Imankulov
+- David Stanek
+- Roy Wellington Ⅳ
+- Florian Schulze
+- Todd M. Guerra
+- Joseph Breihan
+- Craig Loftus
+- The Gitter Badger
+- Régis Behmo
+- Julen Ruiz Aizpuru
+- astaric
+- Felix Yan
+- Philip_Tzou
+- Jesús Espino
+- Jeremy Weinstein
+- James Page
+- masklinn
+- Sjoerd Langkemper
+- Matt Iversen
+- Alexander A. Dyshev
+- Dirkjan Ochtman
+- Nick Retallack
+- Thomas Waldmann
+- xen
 
 Babel was previously developed under the Copyright of Edgewall Software.  The
 following copyright notice holds true for releases before 2013: "Copyright (c)
diff --git a/scripts/generate_authors.py b/scripts/generate_authors.py
new file mode 100644
index 000000000..409f24e36
--- /dev/null
+++ b/scripts/generate_authors.py
@@ -0,0 +1,40 @@
+from collections import Counter
+from subprocess import check_output
+
+import os
+
+root_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))
+
+
+def get_sorted_authors_list():
+    authors = check_output(['git', 'log', '--format=%aN'], cwd=root_path).decode('UTF-8')
+    counts = Counter(authors.splitlines())
+    return [author for (author, count) in counts.most_common()]
+
+
+def get_authors_file_content():
+    author_list = '\n'.join('- %s' % a for a in get_sorted_authors_list())
+
+    return '''
+Babel is written and maintained by the Babel team and various contributors:
+
+{author_list}
+
+Babel was previously developed under the Copyright of Edgewall Software.  The
+following copyright notice holds true for releases before 2013: "Copyright (c)
+2007 - 2011 by Edgewall Software"
+
+In addition to the regular contributions Babel includes a fork of Lennart
+Regebro's tzlocal that originally was licensed under the CC0 license.  The
+original copyright of that project is "Copyright 2013 by Lennart Regebro".
+'''.format(author_list=author_list)
+
+
+def write_authors_file():
+    content = get_authors_file_content()
+    with open(os.path.join(root_path, 'AUTHORS'), 'w', encoding='UTF-8') as fp:
+        fp.write(content)
+
+
+if __name__ == '__main__':
+    write_authors_file()

From 6af596705230ae92f9d007002b0fcc9b24db2944 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 2 Feb 2018 18:51:30 +0200
Subject: [PATCH 381/489] Update copyright header years, and include the Babel
 team

---
 LICENSE                         | 2 +-
 babel/__init__.py               | 2 +-
 babel/core.py                   | 2 +-
 babel/dates.py                  | 2 +-
 babel/localedata.py             | 2 +-
 babel/localtime/__init__.py     | 2 +-
 babel/localtime/_unix.py        | 1 +
 babel/messages/__init__.py      | 2 +-
 babel/messages/catalog.py       | 2 +-
 babel/messages/checkers.py      | 2 +-
 babel/messages/extract.py       | 2 +-
 babel/messages/frontend.py      | 2 +-
 babel/messages/jslexer.py       | 2 +-
 babel/messages/mofile.py        | 2 +-
 babel/messages/plurals.py       | 2 +-
 babel/messages/pofile.py        | 2 +-
 babel/numbers.py                | 2 +-
 babel/plural.py                 | 2 +-
 babel/support.py                | 2 +-
 babel/util.py                   | 2 +-
 docs/conf.py                    | 2 +-
 scripts/dump_data.py            | 2 +-
 scripts/dump_global.py          | 2 +-
 scripts/import_cldr.py          | 2 +-
 tests/messages/test_catalog.py  | 2 +-
 tests/messages/test_checkers.py | 2 +-
 tests/messages/test_extract.py  | 2 +-
 tests/messages/test_frontend.py | 2 +-
 tests/messages/test_mofile.py   | 2 +-
 tests/messages/test_plurals.py  | 2 +-
 tests/messages/test_pofile.py   | 2 +-
 tests/test_core.py              | 2 +-
 tests/test_dates.py             | 4 ++--
 tests/test_localedata.py        | 2 +-
 tests/test_numbers.py           | 2 +-
 tests/test_plural.py            | 2 +-
 tests/test_support.py           | 2 +-
 tests/test_util.py              | 2 +-
 38 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/LICENSE b/LICENSE
index 1f1f55b60..b517a5294 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2013 by the Babel Team, see AUTHORS for more information.
+Copyright (c) 2013-2018 by the Babel Team, see AUTHORS for more information.
 
 All rights reserved.
 
diff --git a/babel/__init__.py b/babel/__init__.py
index 5a388226b..c4e4d20ac 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -13,7 +13,7 @@
        access to various locale display names, localized number and date
        formatting, etc.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/core.py b/babel/core.py
index 5a1a9125d..d028c07da 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -5,7 +5,7 @@
 
     Core locale representation and locale data access.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/dates.py b/babel/dates.py
index a30d6d8e2..cf58a485d 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -12,7 +12,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/localedata.py b/babel/localedata.py
index 0c94e49ea..a638e58af 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -8,7 +8,7 @@
     :note: The `Locale` class, which uses this module under the hood, provides a
            more convenient interface for accessing the locale data.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/localtime/__init__.py b/babel/localtime/__init__.py
index 883ff1661..bb4341d60 100644
--- a/babel/localtime/__init__.py
+++ b/babel/localtime/__init__.py
@@ -6,7 +6,7 @@
     Babel specific fork of tzlocal to determine the local timezone
     of the system.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/localtime/_unix.py b/babel/localtime/_unix.py
index 8f25fe7b8..c2194694c 100644
--- a/babel/localtime/_unix.py
+++ b/babel/localtime/_unix.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import with_statement
 import os
 import re
diff --git a/babel/messages/__init__.py b/babel/messages/__init__.py
index 1b63bae2e..7dd6f8b6d 100644
--- a/babel/messages/__init__.py
+++ b/babel/messages/__init__.py
@@ -5,7 +5,7 @@
 
     Support for ``gettext`` message catalogs.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index b293e3c73..5f05427bb 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -5,7 +5,7 @@
 
     Data structures for message catalogs.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py
index a1e6e8d60..d04ad70ec 100644
--- a/babel/messages/checkers.py
+++ b/babel/messages/checkers.py
@@ -7,7 +7,7 @@
 
     :since: version 0.9
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 351a29070..009bea2b4 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -13,7 +13,7 @@
     The main entry points into the extraction functionality are the functions
     `extract_from_dir` and `extract_from_file`.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index b573a97ca..d848f2dfc 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -5,7 +5,7 @@
 
     Frontends for the message extraction functionality.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 from __future__ import print_function
diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index 30d6e5405..04d02761d 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -6,7 +6,7 @@
     A simple JavaScript 1.5 lexer which is used for the JavaScript
     extractor.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 from collections import namedtuple
diff --git a/babel/messages/mofile.py b/babel/messages/mofile.py
index 79042e003..7bddd1845 100644
--- a/babel/messages/mofile.py
+++ b/babel/messages/mofile.py
@@ -5,7 +5,7 @@
 
     Writing of files in the ``gettext`` MO (machine object) format.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
index 92cefa79a..067ac9826 100644
--- a/babel/messages/plurals.py
+++ b/babel/messages/plurals.py
@@ -5,7 +5,7 @@
 
     Plural form definitions.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index beb6f3570..ea8d7d7e2 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -6,7 +6,7 @@
     Reading and writing of files in the ``gettext`` PO (portable object)
     format.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/numbers.py b/babel/numbers.py
index cbd147475..cb851e4ca 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -12,7 +12,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 # TODO:
diff --git a/babel/plural.py b/babel/plural.py
index 06f349ea9..38093fe6e 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -5,7 +5,7 @@
 
     CLDR Plural support.  See UTS #35.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 import re
diff --git a/babel/support.py b/babel/support.py
index 24bc9aaa1..932fcf2bb 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -8,7 +8,7 @@
 
     .. note: the code in this module is not used by Babel itself
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/util.py b/babel/util.py
index af8c762ec..0150827de 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -5,7 +5,7 @@
 
     Various utility classes and functions.
 
-    :copyright: (c) 2013 by the Babel Team.
+    :copyright: (c) 2013-2018 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/docs/conf.py b/docs/conf.py
index 432387e7c..5aebe94d9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,7 +44,7 @@
 
 # General information about the project.
 project = u'Babel'
-copyright = u'2017, The Babel Team'
+copyright = u'2018, The Babel Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/scripts/dump_data.py b/scripts/dump_data.py
index 0bb3e9117..5e1286053 100755
--- a/scripts/dump_data.py
+++ b/scripts/dump_data.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/scripts/dump_global.py b/scripts/dump_global.py
index 2970bc2ba..ad3d35da9 100755
--- a/scripts/dump_global.py
+++ b/scripts/dump_global.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index b81fa6091..89fc1a7f6 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index 07ed724b9..f9fa72443 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/messages/test_checkers.py b/tests/messages/test_checkers.py
index e9c34bcb7..6af81c64f 100644
--- a/tests/messages/test_checkers.py
+++ b/tests/messages/test_checkers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 17b090fc1..13ce8735a 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 10325fe61..0f12f1e77 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/messages/test_mofile.py b/tests/messages/test_mofile.py
index 5fedc600a..c590facc8 100644
--- a/tests/messages/test_mofile.py
+++ b/tests/messages/test_mofile.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py
index 2e7553c16..3792a1b28 100644
--- a/tests/messages/test_plurals.py
+++ b/tests/messages/test_plurals.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 002954f8a..1a04b4e6f 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/test_core.py b/tests/test_core.py
index 4f985ca74..7fa9e0036 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 6df4631f5..5a46c1b8a 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
@@ -789,4 +789,4 @@ def test_russian_week_numbering():
     # See https://github.com/python-babel/babel/issues/485
     v = date(2017, 1, 1)
     assert dates.format_date(v, format='YYYY-ww',locale='ru_RU') == '2016-52'  # This would have returned 2017-01 prior to CLDR 32
-    assert dates.format_date(v, format='YYYY-ww',locale='de_DE') == '2016-52'
\ No newline at end of file
+    assert dates.format_date(v, format='YYYY-ww',locale='de_DE') == '2016-52'
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index f678d5ba7..be5694a7d 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 3ad9c663f..1f4a0fe00 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/test_plural.py b/tests/test_plural.py
index be7414994..852a7c755 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/test_support.py b/tests/test_support.py
index 6f9fb3246..7e63ba2e9 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/tests/test_util.py b/tests/test_util.py
index 4c769bea3..61d4f4fa7 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file COPYING, which

From 5e50652b2c73eac42f9e6c99b7337d82b8b581cb Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 2 Feb 2018 18:52:10 +0200
Subject: [PATCH 382/489] Rephrase copyright headers to link to the LICENSE
 file instead of COPYING

Fixes #398
---
 scripts/dump_data.py            | 2 +-
 scripts/dump_global.py          | 2 +-
 scripts/import_cldr.py          | 2 +-
 tests/messages/test_catalog.py  | 2 +-
 tests/messages/test_checkers.py | 2 +-
 tests/messages/test_extract.py  | 2 +-
 tests/messages/test_frontend.py | 2 +-
 tests/messages/test_mofile.py   | 2 +-
 tests/messages/test_plurals.py  | 2 +-
 tests/messages/test_pofile.py   | 2 +-
 tests/test_core.py              | 2 +-
 tests/test_dates.py             | 2 +-
 tests/test_localedata.py        | 2 +-
 tests/test_numbers.py           | 2 +-
 tests/test_plural.py            | 2 +-
 tests/test_support.py           | 2 +-
 tests/test_util.py              | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/dump_data.py b/scripts/dump_data.py
index 5e1286053..3bf35f2be 100755
--- a/scripts/dump_data.py
+++ b/scripts/dump_data.py
@@ -4,7 +4,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/scripts/dump_global.py b/scripts/dump_global.py
index ad3d35da9..641f3c018 100755
--- a/scripts/dump_global.py
+++ b/scripts/dump_global.py
@@ -4,7 +4,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 89fc1a7f6..cd0ec37c1 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -4,7 +4,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index f9fa72443..1b23832a6 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/messages/test_checkers.py b/tests/messages/test_checkers.py
index 6af81c64f..be4afb341 100644
--- a/tests/messages/test_checkers.py
+++ b/tests/messages/test_checkers.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 13ce8735a..fa50a4c9e 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 0f12f1e77..d2e9e35cf 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/messages/test_mofile.py b/tests/messages/test_mofile.py
index c590facc8..7038b1d83 100644
--- a/tests/messages/test_mofile.py
+++ b/tests/messages/test_mofile.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py
index 3792a1b28..2ba15e911 100644
--- a/tests/messages/test_plurals.py
+++ b/tests/messages/test_plurals.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 1a04b4e6f..091e0a6a6 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/test_core.py b/tests/test_core.py
index 7fa9e0036..f22ab309b 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 5a46c1b8a..1cb60f169 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index be5694a7d..37c1304e9 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 1f4a0fe00..cdbe0663c 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 852a7c755..546e12a14 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/test_support.py b/tests/test_support.py
index 7e63ba2e9..64b60d85f 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #
diff --git a/tests/test_util.py b/tests/test_util.py
index 61d4f4fa7..a3607d5fc 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -3,7 +3,7 @@
 # Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
 # All rights reserved.
 #
-# This software is licensed as described in the file COPYING, which
+# This software is licensed as described in the file LICENSE, which
 # you should have received as part of this distribution. The terms
 # are also available at http://babel.edgewall.org/wiki/License.
 #

From 41e8169c63ac6b6ec673c74a9e1f7ebaa8c6be87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 8 Mar 2018 00:16:47 +0100
Subject: [PATCH 383/489] Skip empty message when writing mo file

Instead of using the msgid, this allows to have gettext fallback to
retrieve the translation. Otherwise gettext will anyway return msgid.
---
 babel/messages/mofile.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/babel/messages/mofile.py b/babel/messages/mofile.py
index 79042e003..8aa704f96 100644
--- a/babel/messages/mofile.py
+++ b/babel/messages/mofile.py
@@ -153,8 +153,8 @@ def write_mo(fileobj, catalog, use_fuzzy=False):
                       in the output
     """
     messages = list(catalog)
-    if not use_fuzzy:
-        messages[1:] = [m for m in messages[1:] if not m.fuzzy]
+    messages[1:] = [m for m in messages[1:]
+                    if m.string and (use_fuzzy or not m.fuzzy)]
     messages.sort()
 
     ids = strs = b''
@@ -178,10 +178,7 @@ def write_mo(fileobj, catalog, use_fuzzy=False):
             ])
         else:
             msgid = message.id.encode(catalog.charset)
-            if not message.string:
-                msgstr = message.id.encode(catalog.charset)
-            else:
-                msgstr = message.string.encode(catalog.charset)
+            msgstr = message.string.encode(catalog.charset)
         if message.context:
             msgid = b'\x04'.join([message.context.encode(catalog.charset),
                                   msgid])

From cbc8cf8308d0958ddbde7a01c430c58a40c00308 Mon Sep 17 00:00:00 2001
From: PTrottier <31802216+PTrottier@users.noreply.github.com>
Date: Fri, 27 Apr 2018 10:42:56 -0400
Subject: [PATCH 384/489] Month and Day must be valid tokens

````>>> dt = datetime(2007, 04, 01, 15, 30, tzinfo=UTC)
  File "<stdin>", line 1
    dt = datetime(2007, 04, 01, 15, 30, tzinfo=UTC)
                         ^
SyntaxError: invalid token````

See: https://docs.python.org/3.5/library/datetime.html#datetime.datetime.month
---
 docs/dates.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/dates.rst b/docs/dates.rst
index bb3398abb..0ddd7bc95 100644
--- a/docs/dates.rst
+++ b/docs/dates.rst
@@ -286,7 +286,7 @@ directly interface with it from within Babel:
 
     >>> from datetime import time
     >>> from babel.dates import get_timezone, UTC
-    >>> dt = datetime(2007, 04, 01, 15, 30, tzinfo=UTC)
+    >>> dt = datetime(2007, 4, 1, 15, 30, tzinfo=UTC)
     >>> eastern = get_timezone('US/Eastern')
     >>> format_datetime(dt, 'H:mm Z', tzinfo=eastern, locale='en_US')
     u'11:30 -0400'

From 1377559c830d6c3166f1e1bdced9953e0f4045fa Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 7 May 2018 13:01:25 +0300
Subject: [PATCH 385/489] Restore force_frac to NumberPattern.apply(), as
 deprecated

This retains backwards compatibility (at least as far as the function's
signature is concerned) with users that are using NumberPattern.apply()
directly.

See: https://github.com/python-babel/babel/issues/550
See: https://github.com/python-babel/babel/issues/569
---
 babel/numbers.py | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index cbd147475..a3a93a66f 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -767,12 +767,38 @@ def scientific_notation_elements(self, value, locale):
         return value, exp, exp_sign
 
     def apply(
-            self, value, locale, currency=None, currency_digits=True,
-            decimal_quantization=True):
+        self,
+        value,
+        locale,
+        currency=None,
+        currency_digits=True,
+        decimal_quantization=True,
+        force_frac=None,
+    ):
         """Renders into a string a number following the defined pattern.
 
         Forced decimal quantization is active by default so we'll produce a
         number string that is strictly following CLDR pattern definitions.
+
+        :param value: The value to format. If this is not a Decimal object,
+                      it will be cast to one.
+        :type value: decimal.Decimal|float|int
+        :param locale: The locale to use for formatting.
+        :type locale: str|babel.core.Locale
+        :param currency: Which currency, if any, to format as.
+        :type currency: str|None
+        :param currency_digits: Whether or not to use the currency's precision.
+                                If false, the pattern's precision is used.
+        :type currency_digits: bool
+        :param decimal_quantization: Whether decimal numbers should be forcibly
+                                     quantized to produce a formatted output
+                                     strictly matching the CLDR definition for
+                                     the locale.
+        :type decimal_quantization: bool
+        :param force_frac: DEPRECATED - a forced override for `self.frac_prec`
+                           for a single formatting invocation.
+        :return: Formatted decimal string.
+        :rtype: str
         """
         if not isinstance(value, decimal.Decimal):
             value = decimal.Decimal(str(value))
@@ -789,9 +815,14 @@ def apply(
 
         # Adjust the precision of the fractionnal part and force it to the
         # currency's if neccessary.
-        frac_prec = self.frac_prec
-        if currency and currency_digits:
+        if force_frac:
+            # TODO (3.x?): Remove this parameter
+            warnings.warn('The force_frac parameter to NumberPattern.apply() is deprecated.', DeprecationWarning)
+            frac_prec = force_frac
+        elif currency and currency_digits:
             frac_prec = (get_currency_precision(currency), ) * 2
+        else:
+            frac_prec = self.frac_prec
 
         # Bump decimal precision to the natural precision of the number if it
         # exceeds the one we're about to use. This adaptative precision is only

From 77dc9d4024b78c2339f7cf3bff1a2e8be8e2d0f7 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 12:12:23 +0300
Subject: [PATCH 386/489] import_cldr: ignore formatting rules for non-Latin
 numbering systems

Previously the script could have inadvertently merged formatting rules between numbering systems due to the XML selectors used.  This makes sure only Latin rules are used for the time being.  When support for other numbering systems is properly added (see #470), these checks can be changed.
---
 scripts/import_cldr.py | 157 ++++++++++++++++++++++++++---------------
 1 file changed, 101 insertions(+), 56 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index cd0ec37c1..60aa6c280 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -389,6 +389,8 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
             territory != '001' and territory or None
         ]))
 
+        data['locale_id'] = locale_id
+
         if locale_id in plural_rules:
             data['plural_form'] = plural_rules[locale_id]
         if locale_id in ordinal_rules:
@@ -430,6 +432,31 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
         write_datafile(data_filename, data, dump_json=dump_json)
 
 
+def _should_skip_number_elem(data, elem):
+    """
+    Figure out whether the numbering-containing element `elem` is in a currently
+    non-supported (i.e. currently non-Latin) numbering system.
+
+    If it is, a warning is raised.
+
+    :param data: The root data element, for formatting the warning.
+    :param elem: Element with `numberSystem` key
+    :return: Boolean
+    """
+    number_system = elem.get('numberSystem', 'latn')
+
+    if number_system != 'latn':
+        log('%s: Unsupported number system "%s" in <%s numberSystem="%s">' % (
+            data['locale_id'],
+            number_system,
+            elem.tag,
+            number_system,
+        ))
+        return True
+
+    return False
+
+
 def _should_skip_elem(elem, type=None, dest=None):
     """
     Check whether the given element should be skipped.
@@ -701,59 +728,73 @@ def parse_calendar_datetime_skeletons(data, calendar):
 
 def parse_number_symbols(data, tree):
     number_symbols = data.setdefault('number_symbols', {})
-    for elem in tree.findall('.//numbers/symbols/*'):
-        if _should_skip_elem(elem):
+    for symbol_elem in tree.findall('.//numbers/symbols'):
+        if _should_skip_number_elem(data, symbol_elem):  # TODO: Support other number systems
             continue
-        number_symbols[elem.tag] = text_type(elem.text)
+
+        for elem in symbol_elem.findall('./*'):
+            if _should_skip_elem(elem):
+                continue
+            number_symbols[elem.tag] = text_type(elem.text)
 
 
 def parse_decimal_formats(data, tree):
     decimal_formats = data.setdefault('decimal_formats', {})
-    for elem in tree.findall('.//decimalFormats/decimalFormatLength'):
-        length_type = elem.attrib.get('type')
-        if _should_skip_elem(elem, length_type, decimal_formats):
+    for df_elem in tree.findall('.//decimalFormats'):
+        if _should_skip_number_elem(data, df_elem):  # TODO: Support other number systems
             continue
-        if elem.findall('./alias'):
-            # TODO map the alias to its target
-            continue
-        for pattern_el in elem.findall('./decimalFormat/pattern'):
-            pattern_type = pattern_el.attrib.get('type')
-            pattern = numbers.parse_pattern(text_type(pattern_el.text))
-            if pattern_type:
-                # This is a compact decimal format, see:
-                # http://www.unicode.org/reports/tr35/tr35-45/tr35-numbers.html#Compact_Number_Formats
-
-                # These are mapped into a `compact_decimal_formats` dictionary
-                # with the format {length: {count: {multiplier: pattern}}}.
-
-                # TODO: Add support for formatting them.
-                compact_decimal_formats = data.setdefault('compact_decimal_formats', {})
-                length_map = compact_decimal_formats.setdefault(length_type, {})
-                length_count_map = length_map.setdefault(pattern_el.attrib['count'], {})
-                length_count_map[pattern_type] = pattern
-            else:
-                # Regular decimal format.
-                decimal_formats[length_type] = pattern
+        for elem in df_elem.findall('./decimalFormatLength'):
+            length_type = elem.attrib.get('type')
+            if _should_skip_elem(elem, length_type, decimal_formats):
+                continue
+            if elem.findall('./alias'):
+                # TODO map the alias to its target
+                continue
+            for pattern_el in elem.findall('./decimalFormat/pattern'):
+                pattern_type = pattern_el.attrib.get('type')
+                pattern = numbers.parse_pattern(text_type(pattern_el.text))
+                if pattern_type:
+                    # This is a compact decimal format, see:
+                    # http://www.unicode.org/reports/tr35/tr35-45/tr35-numbers.html#Compact_Number_Formats
+
+                    # These are mapped into a `compact_decimal_formats` dictionary
+                    # with the format {length: {count: {multiplier: pattern}}}.
+
+                    # TODO: Add support for formatting them.
+                    compact_decimal_formats = data.setdefault('compact_decimal_formats', {})
+                    length_map = compact_decimal_formats.setdefault(length_type, {})
+                    length_count_map = length_map.setdefault(pattern_el.attrib['count'], {})
+                    length_count_map[pattern_type] = pattern
+                else:
+                    # Regular decimal format.
+                    decimal_formats[length_type] = pattern
 
 
 def parse_scientific_formats(data, tree):
     scientific_formats = data.setdefault('scientific_formats', {})
-    for elem in tree.findall('.//scientificFormats/scientificFormatLength'):
-        type = elem.attrib.get('type')
-        if _should_skip_elem(elem, type, scientific_formats):
+    for sf_elem in tree.findall('.//scientificFormats'):
+        if _should_skip_number_elem(data, sf_elem):  # TODO: Support other number systems
             continue
-        pattern = text_type(elem.findtext('scientificFormat/pattern'))
-        scientific_formats[type] = numbers.parse_pattern(pattern)
+        for elem in sf_elem.findall('./scientificFormatLength'):
+            type = elem.attrib.get('type')
+            if _should_skip_elem(elem, type, scientific_formats):
+                continue
+            pattern = text_type(elem.findtext('scientificFormat/pattern'))
+            scientific_formats[type] = numbers.parse_pattern(pattern)
 
 
 def parse_percent_formats(data, tree):
     percent_formats = data.setdefault('percent_formats', {})
-    for elem in tree.findall('.//percentFormats/percentFormatLength'):
-        type = elem.attrib.get('type')
-        if _should_skip_elem(elem, type, percent_formats):
+
+    for pf_elem in tree.findall('.//percentFormats'):
+        if _should_skip_number_elem(data, pf_elem):  # TODO: Support other number systems
             continue
-        pattern = text_type(elem.findtext('percentFormat/pattern'))
-        percent_formats[type] = numbers.parse_pattern(pattern)
+        for elem in pf_elem.findall('.//percentFormatLength'):
+            type = elem.attrib.get('type')
+            if _should_skip_elem(elem, type, percent_formats):
+                continue
+            pattern = text_type(elem.findtext('percentFormat/pattern'))
+            percent_formats[type] = numbers.parse_pattern(pattern)
 
 
 def parse_currency_names(data, tree):
@@ -837,25 +878,29 @@ def parse_interval_formats(data, tree):
 
 def parse_currency_formats(data, tree):
     currency_formats = data.setdefault('currency_formats', {})
-    for length_elem in tree.findall('.//currencyFormats/currencyFormatLength'):
-        curr_length_type = length_elem.attrib.get('type')
-        for elem in length_elem.findall('currencyFormat'):
-            type = elem.attrib.get('type')
-            if curr_length_type:
-                # Handle `<currencyFormatLength type="short">`, etc.
-                # TODO(3.x): use nested dicts instead of colon-separated madness
-                type = '%s:%s' % (type, curr_length_type)
-            if _should_skip_elem(elem, type, currency_formats):
-                continue
-            for child in elem.getiterator():
-                if child.tag == 'alias':
-                    currency_formats[type] = Alias(
-                        _translate_alias(['currency_formats', elem.attrib['type']],
-                                         child.attrib['path'])
-                    )
-                elif child.tag == 'pattern':
-                    pattern = text_type(child.text)
-                    currency_formats[type] = numbers.parse_pattern(pattern)
+    for currency_format in tree.findall('.//currencyFormats'):
+        if _should_skip_number_elem(data, currency_format):  # TODO: Support other number systems
+            continue
+
+        for length_elem in currency_format.findall('./currencyFormatLength'):
+            curr_length_type = length_elem.attrib.get('type')
+            for elem in length_elem.findall('currencyFormat'):
+                type = elem.attrib.get('type')
+                if curr_length_type:
+                    # Handle `<currencyFormatLength type="short">`, etc.
+                    # TODO(3.x): use nested dicts instead of colon-separated madness
+                    type = '%s:%s' % (type, curr_length_type)
+                if _should_skip_elem(elem, type, currency_formats):
+                    continue
+                for child in elem.getiterator():
+                    if child.tag == 'alias':
+                        currency_formats[type] = Alias(
+                            _translate_alias(['currency_formats', elem.attrib['type']],
+                                             child.attrib['path'])
+                        )
+                    elif child.tag == 'pattern':
+                        pattern = text_type(child.text)
+                        currency_formats[type] = numbers.parse_pattern(pattern)
 
 
 def parse_day_period_rules(tree):

From 28797063ac12b6373afe3e9a797a9fd97f675e12 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 12:33:44 +0300
Subject: [PATCH 387/489] test_smoke: use format_decimal instead of
 format_number

---
 tests/test_smoke.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_smoke.py b/tests/test_smoke.py
index 3993f608c..23d82aa13 100644
--- a/tests/test_smoke.py
+++ b/tests/test_smoke.py
@@ -34,4 +34,4 @@ def test_smoke_numbers(locale):
         10,  # Plain old integer
         0,  # Zero
     ):
-        assert numbers.format_number(number, locale=locale)
+        assert numbers.format_decimal(number, locale=locale)

From 3471306e9cd08214d12e6e4af81d8b9dbcd70874 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 12:34:31 +0300
Subject: [PATCH 388/489] frontend, test_frontend: don't use deprecated U read
 mode on Py3

---
 babel/messages/frontend.py      |  7 +++++--
 tests/messages/test_frontend.py | 36 ++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index d848f2dfc..31fbaa46b 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -22,7 +22,7 @@
 
 from babel import __version__ as VERSION
 from babel import Locale, localedata
-from babel._compat import StringIO, string_types, text_type
+from babel._compat import StringIO, string_types, text_type, PY2
 from babel.core import UnknownLocaleError
 from babel.messages.catalog import Catalog
 from babel.messages.extract import DEFAULT_KEYWORDS, DEFAULT_MAPPING, check_and_call_extract_file, extract_from_dir
@@ -39,6 +39,9 @@
     from configparser import RawConfigParser
 
 
+po_file_read_mode = ('rU' if PY2 else 'r')
+
+
 def listify_value(arg, split=None):
     """
     Make a list out of an argument.
@@ -485,7 +488,7 @@ def _get_mappings(self):
         mappings = []
 
         if self.mapping_file:
-            with open(self.mapping_file, 'U') as fileobj:
+            with open(self.mapping_file, po_file_read_mode) as fileobj:
                 method_map, options_map = parse_mapping(fileobj)
             for path in self.input_paths:
                 mappings.append((path, method_map, options_map))
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index d2e9e35cf..3e3cc8bd5 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -28,7 +28,7 @@
 from babel import __version__ as VERSION
 from babel.dates import format_datetime
 from babel.messages import frontend, Catalog
-from babel.messages.frontend import CommandLineInterface, extract_messages, update_catalog
+from babel.messages.frontend import CommandLineInterface, extract_messages, update_catalog, po_file_read_mode
 from babel.util import LOCALTZ
 from babel.messages.pofile import read_po, write_po
 from babel._compat import StringIO
@@ -124,7 +124,7 @@ def test_input_paths_is_treated_as_list(self):
         self.cmd.finalize_options()
         self.cmd.run()
 
-        with open(self._pot_file(), 'U') as f:
+        with open(self._pot_file(), po_file_read_mode) as f:
             catalog = read_po(f)
         msg = catalog.get('bar')
         self.assertEqual(1, len(msg.locations))
@@ -204,7 +204,7 @@ def test_extraction_with_default_mapping(self):
             'year': time.strftime('%Y'),
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(self._pot_file(), 'U') as f:
+        with open(self._pot_file(), po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -257,7 +257,7 @@ def test_extraction_with_mapping_file(self):
             'year': time.strftime('%Y'),
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(self._pot_file(), 'U') as f:
+        with open(self._pot_file(), po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -315,7 +315,7 @@ def test_extraction_with_mapping_dict(self):
             'year': time.strftime('%Y'),
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(self._pot_file(), 'U') as f:
+        with open(self._pot_file(), po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -346,7 +346,7 @@ def test_extraction_add_location_file(self):
 msgstr[1] ""
 
 """
-        with open(self._pot_file(), 'U') as f:
+        with open(self._pot_file(), po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -440,7 +440,7 @@ def test_with_output_dir(self):
 """ % {'version': VERSION,
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(po_file, 'U') as f:
+        with open(po_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -492,7 +492,7 @@ def test_keeps_catalog_non_fuzzy(self):
 """ % {'version': VERSION,
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(po_file, 'U') as f:
+        with open(po_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -546,7 +546,7 @@ def test_correct_init_more_than_2_plurals(self):
 """ % {'version': VERSION,
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(po_file, 'U') as f:
+        with open(po_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -597,7 +597,7 @@ def test_correct_init_singular_plural_forms(self):
 """ % {'version': VERSION,
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='ja_JP')}
-        with open(po_file, 'U') as f:
+        with open(po_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -658,7 +658,7 @@ def test_supports_no_wrap(self):
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en_US'),
             'long_message': long_message}
-        with open(po_file, 'U') as f:
+        with open(po_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -718,7 +718,7 @@ def test_supports_width(self):
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en_US'),
             'long_message': long_message}
-        with open(po_file, 'U') as f:
+        with open(po_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -879,7 +879,7 @@ def test_extract_with_default_mapping(self):
             'year': time.strftime('%Y'),
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(pot_file, 'U') as f:
+        with open(pot_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -930,7 +930,7 @@ def test_extract_with_mapping_file(self):
             'year': time.strftime('%Y'),
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(pot_file, 'U') as f:
+        with open(pot_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -979,7 +979,7 @@ def test_extract_with_exact_file(self):
             'year': time.strftime('%Y'),
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(pot_file, 'U') as f:
+        with open(pot_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -1027,7 +1027,7 @@ def test_init_with_output_dir(self):
 """ % {'version': VERSION,
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(po_file, 'U') as f:
+        with open(po_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -1077,7 +1077,7 @@ def test_init_singular_plural_forms(self):
 """ % {'version': VERSION,
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(po_file, 'U') as f:
+        with open(po_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -1127,7 +1127,7 @@ def test_init_more_than_2_plural_forms(self):
 """ % {'version': VERSION,
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(po_file, 'U') as f:
+        with open(po_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 

From 4a9c634c48e90c01653a96b290fd40eccae34eb7 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 12:37:17 +0300
Subject: [PATCH 389/489] test_support: Don't use deprecated inspect methods

---
 tests/test_support.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/test_support.py b/tests/test_support.py
index 64b60d85f..314c18825 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -24,6 +24,8 @@
 from babel.messages.mofile import write_mo
 from babel._compat import BytesIO, PY2
 
+get_arg_spec = (inspect.getargspec if PY2 else inspect.getfullargspec)
+
 
 @pytest.mark.usefixtures("os_environ")
 class TranslationsTestCase(unittest.TestCase):
@@ -206,9 +208,10 @@ def test_method_signature_compatibility(self):
         for name in self.method_names():
             translations_method = getattr(self.translations, name)
             null_method = getattr(self.null_translations, name)
-            signature = inspect.getargspec
-            self.assertEqual(signature(translations_method),
-                             signature(null_method))
+            self.assertEqual(
+                get_arg_spec(translations_method),
+                get_arg_spec(null_method),
+            )
 
     def test_same_return_values(self):
         data = {
@@ -219,8 +222,8 @@ def test_same_return_values(self):
         for name in self.method_names():
             method = getattr(self.translations, name)
             null_method = getattr(self.null_translations, name)
-            signature = inspect.getargspec(method)
-            parameter_names = [name for name in signature[0] if name != 'self']
+            signature = get_arg_spec(method)
+            parameter_names = [name for name in signature.args if name != 'self']
             values = [data[name] for name in parameter_names]
             self.assertEqual(method(*values), null_method(*values))
 

From 0c6b3c87749dad880fbfdb0ddfbac4997ef04055 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 12:39:11 +0300
Subject: [PATCH 390/489] frontend: use ConfigParser.read_file() on Python 3

---
 babel/messages/frontend.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 31fbaa46b..16cb90054 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -966,7 +966,12 @@ def parse_mapping(fileobj, filename=None):
 
     parser = RawConfigParser()
     parser._sections = odict(parser._sections)  # We need ordered sections
-    parser.readfp(fileobj, filename)
+
+    if PY2:
+        parser.readfp(fileobj, filename)
+    else:
+        parser.read_file(fileobj, filename)
+
     for section in parser.sections():
         if section == 'extractors':
             extractors = dict(parser.items(section))

From 34a6ccce1d93843d53efb5985ff5bbb7ea063e31 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 12:57:45 +0300
Subject: [PATCH 391/489] _compat: add force_text a la Django

---
 babel/_compat.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/babel/_compat.py b/babel/_compat.py
index aea338938..1131f44af 100644
--- a/babel/_compat.py
+++ b/babel/_compat.py
@@ -8,11 +8,12 @@
 
 if not PY2:
     text_type = str
+    binary_type = bytes
     string_types = (str,)
     integer_types = (int, )
-    unichr = chr
 
     text_to_native = lambda s, enc: s
+    unichr = chr
 
     iterkeys = lambda d: iter(d.keys())
     itervalues = lambda d: iter(d.values())
@@ -31,6 +32,7 @@
 
 else:
     text_type = unicode
+    binary_type = str
     string_types = (str, unicode)
     integer_types = (int, long)
 
@@ -57,6 +59,14 @@
 number_types = integer_types + (float,)
 
 
+def force_text(s, encoding='utf-8', errors='strict'):
+    if isinstance(s, text_type):
+        return s
+    if isinstance(s, binary_type):
+        return s.decode(encoding, errors)
+    return text_type(s)
+
+
 #
 # Since Python 3.3, a fast decimal implementation is already included in the
 # standard library.  Otherwise use cdecimal when available

From 9f2be4127a301c0e3145a730bbc4d08afe78614d Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 12:58:09 +0300
Subject: [PATCH 392/489] catalog: fix bytes-to-strings comparisons when
 parsing headers on Py3

---
 babel/messages/catalog.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index f85bfb156..6d61a3826 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -23,7 +23,7 @@
 from babel.dates import format_datetime
 from babel.messages.plurals import get_plural
 from babel.util import odict, distinct, LOCALTZ, FixedOffsetTimezone
-from babel._compat import string_types, number_types, PY2, cmp, text_type
+from babel._compat import string_types, number_types, PY2, cmp, text_type, force_text
 
 __all__ = ['Message', 'Catalog', 'TranslationError']
 
@@ -413,7 +413,8 @@ def _get_mime_headers(self):
 
     def _set_mime_headers(self, headers):
         for name, value in headers:
-            name = name.lower()
+            name = force_text(name.lower(), encoding=self.charset)
+            value = force_text(value, encoding=self.charset)
             if name == 'project-id-version':
                 parts = value.split(' ')
                 self.project = u' '.join(parts[:-1])

From f48219816f92d00d06f6a103cfbc84b7c284b867 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 13:01:28 +0300
Subject: [PATCH 393/489] tox: passenv PYTHON_TEST_FLAGS so one can run `env
 PYTHON_TEST_FLAGS=-bb tox`

---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 925ea7fe0..b46fed704 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,9 +6,10 @@ deps =
     pytest==3.3.2
     pytest-cov==2.5.1
     cdecimal: m3-cdecimal
-    freezegun
+    freezegun==0.3.9
 whitelist_externals = make
 commands = make clean-cldr test
+passenv = PYTHON_TEST_FLAGS
 
 [pep8]
 ignore = E501,E731,W503

From 08864f28460f16035b2ffdfcb9704af0c3faa164 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 16:22:03 +0300
Subject: [PATCH 394/489] Download CLDR 33.0; fix test changes

---
 scripts/download_import_cldr.py | 10 +++++-----
 tests/test_dates.py             | 16 ++++++++--------
 tests/test_numbers.py           |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index 1d3c17bf6..b6e6f4301 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import contextlib
 import os
@@ -13,9 +13,9 @@
     from urllib import urlretrieve
 
 
-URL = 'http://unicode.org/Public/cldr/32.0.1/core.zip'
-FILENAME = 'core-32.0.1.zip'
-FILESUM = '571e33f482543f02ebd06c9b43d127a87c637c8c'
+URL = 'https://unicode.org/Public/cldr/33/core.zip'
+FILENAME = 'core-33.0.zip'
+FILESUM = 'fa3490082c086d21257153609642f54fcf788fcfda4966fe67f3f6daca0d58b9'
 BLKSIZE = 131072
 
 
@@ -53,7 +53,7 @@ def is_good_file(filename):
     if not os.path.isfile(filename):
         log('Local copy \'%s\' not found', filename)
         return False
-    h = hashlib.sha1()
+    h = hashlib.sha256()
     with open(filename, 'rb') as f:
         while 1:
             blk = f.read(BLKSIZE)
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 1cb60f169..b8c293ba6 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -134,16 +134,16 @@ def test_local_day_of_week(self):
         self.assertEqual('7', fmt['e'])  # monday is first day of week
         fmt = dates.DateTimeFormat(d, locale='en_US')
         self.assertEqual('01', fmt['ee'])  # sunday is first day of week
-        fmt = dates.DateTimeFormat(d, locale='bn_BD')
-        self.assertEqual('03', fmt['ee'])  # friday is first day of week
+        fmt = dates.DateTimeFormat(d, locale='ar_BH')
+        self.assertEqual('02', fmt['ee'])  # saturday is first day of week
 
         d = date(2007, 4, 2)  # a monday
         fmt = dates.DateTimeFormat(d, locale='de_DE')
         self.assertEqual('1', fmt['e'])  # monday is first day of week
         fmt = dates.DateTimeFormat(d, locale='en_US')
         self.assertEqual('02', fmt['ee'])  # sunday is first day of week
-        fmt = dates.DateTimeFormat(d, locale='bn_BD')
-        self.assertEqual('04', fmt['ee'])  # friday is first day of week
+        fmt = dates.DateTimeFormat(d, locale='ar_BH')
+        self.assertEqual('03', fmt['ee'])  # saturday is first day of week
 
     def test_local_day_of_week_standalone(self):
         d = date(2007, 4, 1)  # a sunday
@@ -151,16 +151,16 @@ def test_local_day_of_week_standalone(self):
         self.assertEqual('7', fmt['c'])  # monday is first day of week
         fmt = dates.DateTimeFormat(d, locale='en_US')
         self.assertEqual('1', fmt['c'])  # sunday is first day of week
-        fmt = dates.DateTimeFormat(d, locale='bn_BD')
-        self.assertEqual('3', fmt['c'])  # friday is first day of week
+        fmt = dates.DateTimeFormat(d, locale='ar_BH')
+        self.assertEqual('2', fmt['c'])  # saturday is first day of week
 
         d = date(2007, 4, 2)  # a monday
         fmt = dates.DateTimeFormat(d, locale='de_DE')
         self.assertEqual('1', fmt['c'])  # monday is first day of week
         fmt = dates.DateTimeFormat(d, locale='en_US')
         self.assertEqual('2', fmt['c'])  # sunday is first day of week
-        fmt = dates.DateTimeFormat(d, locale='bn_BD')
-        self.assertEqual('4', fmt['c'])  # friday is first day of week
+        fmt = dates.DateTimeFormat(d, locale='ar_BH')
+        self.assertEqual('3', fmt['c'])  # saturday is first day of week
 
     def test_pattern_day_of_week(self):
         dt = datetime(2016, 2, 6)
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index cdbe0663c..493c1a7fe 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -179,7 +179,7 @@ def test_list_currencies():
 
     assert list_currencies(locale='pa_Arab') == {'PKR', 'INR', 'EUR'}
 
-    assert len(list_currencies()) == 299
+    assert len(list_currencies()) == 300
 
 
 def test_validate_currency():

From 5f7b868725fcea817967820d35a4e0ebb02b3756 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 16:32:54 +0300
Subject: [PATCH 395/489] Ignore .*cache, to ignore .pytest_cache

---
 .gitignore | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index e15875ba0..50e5838f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,22 @@
-*~
-*.swp
-.idea
-*.so
-docs/_build
+**/__pycache__
+*.egg
+*.egg-info
 *.pyc
 *.pyo
-*.egg-info
-*.egg
-build
-dist
+*.so
+*.swp
+*~
+.*cache
 .DS_Store
+.idea
 .tox
-.cache
-test-env
-**/__pycache__
+/venv*
 babel/global.dat
 babel/global.dat.json
-tests/messages/data/project/i18n/long_messages.pot
-tests/messages/data/project/i18n/temp*
+build
+dist
+docs/_build
+test-env
 tests/messages/data/project/i18n/en_US
-/venv*
\ No newline at end of file
+tests/messages/data/project/i18n/long_messages.pot
+tests/messages/data/project/i18n/temp*
\ No newline at end of file

From a5ecaa321817d3705cbda1476f6e9f06daa1e847 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 28 May 2018 17:08:31 +0300
Subject: [PATCH 396/489] Become 2.6.0

---
 AUTHORS           |  3 ++-
 CHANGES           | 49 ++++++++++++++++++++++++++++++++++++++++++-----
 babel/__init__.py |  2 +-
 docs/conf.py      |  4 ++--
 4 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 58a9bee28..69e110ecc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,9 @@
 
 Babel is written and maintained by the Babel team and various contributors:
 
+- Aarni Koskela
 - Christopher Lenz
 - Armin Ronacher
-- Aarni Koskela
 - Alex Morega
 - Lasse Schuirmann
 - Felix Schwarz
@@ -41,6 +41,7 @@ Babel is written and maintained by the Babel team and various contributors:
 - Leonardo Pistone
 - Jun Omae
 - Hyunjun Kim
+- PTrottier
 - xmo-odoo
 - StevenJ
 - Jungmo Ku
diff --git a/CHANGES b/CHANGES
index eff75e070..6d9b0e5fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,45 @@
 Babel Changelog
 ===============
 
+Version 2.6.0
+-------------
+
+Possibly incompatible changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These may be backward incompatible in some cases, as some more-or-less internal APIs have changed.
+Please feel free to file issues if you bump into anything strange and we'll try to help!
+
+* Numbers: Refactor decimal handling code and allow bypass of decimal quantization. (@kdeldycke) (PR #538)
+* Messages: allow processing files that are in locales unknown to Babel (@akx) (PR #557)
+* General: Drop support for EOL Python 2.6 and 3.3 (@hugovk) (PR #546)
+
+Other changes
+~~~~~~~~~~~~~
+
+* CLDR: Use CLDR 33 (@akx) (PR #581)
+* Lists: Add support for various list styles other than the default (@akx) (#552)
+* Messages: Add new PoFileError exception (@Bedrock02) (PR #532)
+* Times: Simplify Linux distro specific explicit timezone setting search (@scop) (PR #528)
+
+Bugfixes
+~~~~~~~~
+
+* CLDR: avoid importing alt=narrow currency symbols (@akx) (PR #558)
+* CLDR: ignore non-Latin numbering systems (@akx) (PR #579)
+* Docs: Fix improper example for date formatting (@PTrottier) (PR #574)
+* Tooling: Fix some deprecation warnings (@akx) (PR #580)
+
+Tooling & docs
+~~~~~~~~~~~~~~
+
+* Add explicit signatures to some date autofunctions (@xmo-odoo) (PR #554)
+* Include license file in the generated wheel package (@jdufresne) (PR #539)
+* Python 3.6 invalid escape sequence deprecation fixes (@scop) (PR #528)
+* Test and document all supported Python versions (@jdufresne) (PR #540)
+* Update copyright header years and authors file (@akx) (PR #559)
+
+
 Version 2.5.3
 -------------
 
@@ -210,7 +249,7 @@ Version 2.1
 
 - Parse and honour the locale inheritance exceptions
   (https://github.com/python-babel/babel/issues/97)
-- Fix Locale.parse using ``global.dat`` incompatible types 
+- Fix Locale.parse using ``global.dat`` incompatible types
   (https://github.com/python-babel/babel/issues/174)
 - Fix display of negative offsets in ``FixedOffsetTimezone``
   (https://github.com/python-babel/babel/issues/214)
@@ -218,7 +257,7 @@ Version 2.1
   build, should improve compilation time for large projects
 - Add support for "narrow" format for ``format_timedelta``
 - Add universal wheel support
-- Support 'Language' header field in .PO files 
+- Support 'Language' header field in .PO files
   (fixes https://github.com/python-babel/babel/issues/76)
 - Test suite enhancements (coverage, broken tests fixed, etc)
 - Documentation updated
@@ -313,7 +352,7 @@ Version 1.0
   string does not contain any string formattings (:trac:`150`).
 - Fix Serbian plural forms (:trac:`213`).
 - Small speed improvement in format_date() (:trac:`216`).
-- Fix so frontend.CommandLineInterface.run does not accumulate logging 
+- Fix so frontend.CommandLineInterface.run does not accumulate logging
   handlers (:trac:`227`, reported with initial patch by dfraser)
 - Fix exception if environment contains an invalid locale setting
   (:trac:`200`)
@@ -390,11 +429,11 @@ Version 0.9.6
   string does not contain any string formattings (:trac:`150`).
 - Fix Serbian plural forms (:trac:`213`).
 - Small speed improvement in format_date() (:trac:`216`).
-- Fix number formatting for locales where CLDR specifies alt or draft 
+- Fix number formatting for locales where CLDR specifies alt or draft
   items (:trac:`217`)
 - Fix bad check in format_time (:trac:`257`, reported with patch and tests by
   jomae)
-- Fix so frontend.CommandLineInterface.run does not accumulate logging 
+- Fix so frontend.CommandLineInterface.run does not accumulate logging
   handlers (:trac:`227`, reported with initial patch by dfraser)
 - Fix exception if environment contains an invalid locale setting
   (:trac:`200`)
diff --git a/babel/__init__.py b/babel/__init__.py
index c4e4d20ac..de44ce6c1 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.5.3'
+__version__ = '2.6.0'
diff --git a/docs/conf.py b/docs/conf.py
index 5aebe94d9..47196622a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.5'
+version = '2.6'
 # The full version, including alpha/beta/rc tags.
-release = '2.5.3'
+release = '2.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 772b8402a77dab1ee683e0f715eb9db52fc66936 Mon Sep 17 00:00:00 2001
From: Luke Plant <L.Plant.98@cantab.net>
Date: Mon, 4 Jun 2018 20:53:28 +0300
Subject: [PATCH 397/489] numbers: implement currency formatting with long
 display names.

Fixes #578
---
 babel/numbers.py       | 62 ++++++++++++++++++++++++++++++++++++++++++
 scripts/import_cldr.py |  9 ++++++
 tests/test_numbers.py  | 38 ++++++++++++++++++++++++++
 3 files changed, 109 insertions(+)

diff --git a/babel/numbers.py b/babel/numbers.py
index 564d7ce19..9df19e931 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -442,6 +442,17 @@ def format_currency(
         ...
     UnknownCurrencyFormatError: "'unknown' is not a known currency format type"
 
+    You can also pass format_type='name' to use long display names. The order of
+    the number and currency name, along with the correct localized plural form
+    of the currency name, is chosen according to locale:
+
+    >>> format_currency(1, 'USD', locale='en_US', format_type='name')
+    u'1.00 US dollar'
+    >>> format_currency(1099.98, 'USD', locale='en_US', format_type='name')
+    u'1,099.98 US dollars'
+    >>> format_currency(1099.98, 'USD', locale='ee', format_type='name')
+    u'us ga dollar 1,099.98'
+
     By default the locale is allowed to truncate and round a high-precision
     number by forcing its format pattern onto the decimal part. You can bypass
     this behavior with the `decimal_quantization` parameter:
@@ -459,7 +470,12 @@ def format_currency(
     :param format_type: the currency format type to use
     :param decimal_quantization: Truncate and round high-precision numbers to
                                  the format pattern. Defaults to `True`.
+
     """
+    if format_type == 'name':
+        return _format_currency_long_name(number, currency, format=format,
+                                          locale=locale, currency_digits=currency_digits,
+                                          decimal_quantization=decimal_quantization)
     locale = Locale.parse(locale)
     if format:
         pattern = parse_pattern(format)
@@ -475,6 +491,52 @@ def format_currency(
         decimal_quantization=decimal_quantization)
 
 
+def _format_currency_long_name(
+        number, currency, format=None, locale=LC_NUMERIC, currency_digits=True,
+        format_type='standard', decimal_quantization=True):
+    # Algorithm described here:
+    # https://www.unicode.org/reports/tr35/tr35-numbers.html#Currencies
+    locale = Locale.parse(locale)
+    # Step 1.
+    # There are no examples of items with explicit count (0 or 1) in current
+    # locale data. So there is no point implementing that.
+    # Step 2.
+    if isinstance(number, string_types):
+        plural_category = locale.plural_form(float(number))
+    else:
+        plural_category = locale.plural_form(number)
+
+    # Step 3.
+    try:
+        unit_pattern = locale._data['currency_unit_patterns'][plural_category]
+    except LookupError:
+        unit_pattern = locale._data['currency_unit_patterns']['other']
+
+    # Step 4.
+    try:
+        display_name = locale._data['currency_names_plural'][currency][plural_category]
+    except LookupError:
+        try:
+            display_name = locale._data['currency_names_plural'][currency]['other']
+        except LookupError:
+            try:
+                display_name = locale._data['currency_names'][currency]
+            except LookupError:
+                display_name = currency
+
+    # Step 5.
+    if not format:
+        format = locale.decimal_formats.get(format)
+
+    pattern = parse_pattern(format)
+
+    number_part = pattern.apply(
+        number, locale, currency=currency, currency_digits=currency_digits,
+        decimal_quantization=decimal_quantization)
+
+    return unit_pattern.format(number_part, display_name)
+
+
 def format_percent(
         number, format=None, locale=LC_NUMERIC, decimal_quantization=True):
     """Return formatted percent value for a specific locale.
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 60aa6c280..40887f0d7 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -423,6 +423,7 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
         parse_percent_formats(data, tree)
 
         parse_currency_formats(data, tree)
+        parse_currency_unit_patterns(data, tree)
         parse_currency_names(data, tree)
         parse_unit_patterns(data, tree)
         parse_date_fields(data, tree)
@@ -903,6 +904,14 @@ def parse_currency_formats(data, tree):
                         currency_formats[type] = numbers.parse_pattern(pattern)
 
 
+def parse_currency_unit_patterns(data, tree):
+    currency_unit_patterns = data.setdefault('currency_unit_patterns', {})
+    for unit_pattern_elem in tree.findall('.//currencyFormats/unitPattern'):
+        count = unit_pattern_elem.attrib['count']
+        pattern = text_type(unit_pattern_elem.text)
+        currency_unit_patterns[count] = pattern
+
+
 def parse_day_period_rules(tree):
     """
     Parse dayPeriodRule data into a dict.
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 493c1a7fe..f0239cb3a 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -415,6 +415,44 @@ def test_format_currency_quantization():
             '0.9999999999', 'USD', locale=locale_code, decimal_quantization=False).find('9999999999') > -1
 
 
+def test_format_currency_long_display_name():
+    assert (numbers.format_currency(1099.98, 'USD', locale='en_US', format_type='name')
+            == u'1,099.98 US dollars')
+    assert (numbers.format_currency(1.00, 'USD', locale='en_US', format_type='name')
+            == u'1.00 US dollar')
+    assert (numbers.format_currency(1.00, 'EUR', locale='en_US', format_type='name')
+            == u'1.00 euro')
+    assert (numbers.format_currency(2, 'EUR', locale='en_US', format_type='name')
+            == u'2.00 euros')
+    # This tests that '{1} {0}' unitPatterns are found:
+    assert (numbers.format_currency(1, 'USD', locale='sw', format_type='name')
+            == u'dola ya Marekani 1.00')
+    # This tests unicode chars:
+    assert (numbers.format_currency(1099.98, 'USD', locale='es_GT', format_type='name')
+            == u'dólares estadounidenses 1,099.98')
+    # Test for completely unknown currency, should fallback to currency code
+    assert (numbers.format_currency(1099.98, 'XAB', locale='en_US', format_type='name')
+            == u'1,099.98 XAB')
+
+
+def test_format_currency_long_display_name_all():
+    for locale_code in localedata.locale_identifiers():
+        assert numbers.format_currency(
+            1, 'USD', locale=locale_code, format_type='name').find('1') > -1
+        assert numbers.format_currency(
+            '1', 'USD', locale=locale_code, format_type='name').find('1') > -1
+
+
+def test_format_currency_long_display_name_custom_format():
+    assert (numbers.format_currency(1099.98, 'USD', locale='en_US',
+                                    format_type='name', format='##0')
+            == '1099.98 US dollars')
+    assert (numbers.format_currency(1099.98, 'USD', locale='en_US',
+                                    format_type='name', format='##0',
+                                    currency_digits=False)
+            == '1100 US dollars')
+
+
 def test_format_percent():
     assert numbers.format_percent(0.34, locale='en_US') == u'34%'
     assert numbers.format_percent(0, locale='en_US') == u'0%'

From 4b5097f6064dda281ce7a1c5ef74e047cfdc558c Mon Sep 17 00:00:00 2001
From: Luke Plant <L.Plant.98@cantab.net>
Date: Thu, 7 Jun 2018 14:37:44 +0300
Subject: [PATCH 398/489] Skip non-latn number formats for currency unit
 patterns

---
 scripts/import_cldr.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 40887f0d7..f1dd391be 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -906,10 +906,13 @@ def parse_currency_formats(data, tree):
 
 def parse_currency_unit_patterns(data, tree):
     currency_unit_patterns = data.setdefault('currency_unit_patterns', {})
-    for unit_pattern_elem in tree.findall('.//currencyFormats/unitPattern'):
-        count = unit_pattern_elem.attrib['count']
-        pattern = text_type(unit_pattern_elem.text)
-        currency_unit_patterns[count] = pattern
+    for currency_formats_elem in tree.findall('.//currencyFormats'):
+        if _should_skip_number_elem(data, currency_formats_elem):  # TODO: Support other number systems
+            continue
+        for unit_pattern_elem in currency_formats_elem.findall('./unitPattern'):
+            count = unit_pattern_elem.attrib['count']
+            pattern = text_type(unit_pattern_elem.text)
+            currency_unit_patterns[count] = pattern
 
 
 def parse_day_period_rules(tree):

From 4c7e9b645cfec72672f836e04d8587ca66ba98c3 Mon Sep 17 00:00:00 2001
From: Luke Plant <L.Plant.98@cantab.net>
Date: Thu, 7 Jun 2018 15:21:19 +0300
Subject: [PATCH 399/489] Simplify format_currency code by pulling out/using
 helpers.

In detail:

1. Use the already existing get_currency_name function which does
   the plural form logic already.

2. Create a similar `get_currency_unit_pattern` function.
   This function could be useful if someone wanted to write
   something very similar to the _format_currency_long_name
   functionality but with some different customizations,
   so it is now publicly documented.

3. Simplify the _format_currency_long_name function - it
   is now much flatter.

4. Add more tests to ensure certain cases are really covered.
   (e.g. different unit patterns depending on the count)

An upshot of the changes is that we have reduced (and made more consistent)
the number of places where we need to peek into `Locale._data` -
get_currency_name and get_currency_unit_pattern are the only places that
babel.numbers does this.
---
 babel/numbers.py      | 52 ++++++++++++++++++++++++++++++-------------
 docs/api/numbers.rst  |  2 ++
 tests/test_numbers.py | 21 ++++++++++++++++-
 3 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 9df19e931..cc825c866 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -157,6 +157,36 @@ def get_currency_precision(currency):
     return precisions.get(currency, precisions['DEFAULT'])[0]
 
 
+def get_currency_unit_pattern(currency, count=None, locale=LC_NUMERIC):
+    """
+    Return the unit pattern used for long display of a currency value
+    for a given locale.
+    This is a string containing ``{0}`` where the numeric part
+    should be substituted and ``{1}`` where the currency long display
+    name should be substituted.
+
+    >>> get_currency_unit_pattern('USD', locale='en_US', count=10)
+    u'{0} {1}'
+
+    .. versionadded:: 2.7.0
+
+    :param currency: the currency code.
+    :param count: the optional count.  If provided the unit
+                  pattern for that number will be returned.
+    :param locale: the `Locale` object or locale identifier.
+    """
+    loc = Locale.parse(locale)
+    if count is not None:
+        plural_form = loc.plural_form(count)
+        try:
+            return loc._data['currency_unit_patterns'][plural_form]
+        except LookupError:
+            # Fall back to 'other'
+            pass
+
+    return loc._data['currency_unit_patterns']['other']
+
+
 def get_territory_currencies(territory, start_date=None, end_date=None,
                              tender=True, non_tender=False,
                              include_details=False):
@@ -501,28 +531,18 @@ def _format_currency_long_name(
     # There are no examples of items with explicit count (0 or 1) in current
     # locale data. So there is no point implementing that.
     # Step 2.
+
+    # Correct number to numeric type, important for looking up plural rules:
     if isinstance(number, string_types):
-        plural_category = locale.plural_form(float(number))
+        number_n = float(number)
     else:
-        plural_category = locale.plural_form(number)
+        number_n = number
 
     # Step 3.
-    try:
-        unit_pattern = locale._data['currency_unit_patterns'][plural_category]
-    except LookupError:
-        unit_pattern = locale._data['currency_unit_patterns']['other']
+    unit_pattern = get_currency_unit_pattern(currency, count=number_n, locale=locale)
 
     # Step 4.
-    try:
-        display_name = locale._data['currency_names_plural'][currency][plural_category]
-    except LookupError:
-        try:
-            display_name = locale._data['currency_names_plural'][currency]['other']
-        except LookupError:
-            try:
-                display_name = locale._data['currency_names'][currency]
-            except LookupError:
-                display_name = currency
+    display_name = get_currency_name(currency, count=number_n, locale=locale)
 
     # Step 5.
     if not format:
diff --git a/docs/api/numbers.rst b/docs/api/numbers.rst
index 1b21425ee..758cebaf3 100644
--- a/docs/api/numbers.rst
+++ b/docs/api/numbers.rst
@@ -38,6 +38,8 @@ Data Access
 
 .. autofunction:: get_currency_symbol
 
+.. autofunction:: get_currency_unit_pattern
+
 .. autofunction:: get_decimal_symbol
 
 .. autofunction:: get_plus_sign_symbol
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index f0239cb3a..32f4280e7 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -19,7 +19,7 @@
 from babel import Locale, localedata, numbers
 from babel.numbers import (
     list_currencies, validate_currency, UnknownCurrencyError, is_currency, normalize_currency,
-    get_currency_precision, get_decimal_precision)
+    get_currency_precision, get_decimal_precision, get_currency_unit_pattern)
 from babel.localedata import locale_identifiers
 from babel._compat import decimal
 
@@ -228,6 +228,17 @@ def test_get_currency_precision():
     assert get_currency_precision('JPY') == 0
 
 
+def test_get_currency_unit_pattern():
+    assert get_currency_unit_pattern('USD', locale='en_US') == '{0} {1}'
+    assert get_currency_unit_pattern('USD', locale='es_GT') == '{1} {0}'
+
+    # 'ro' locale various pattern according to count
+    assert get_currency_unit_pattern('USD', locale='ro', count=1) == '{0} {1}'
+    assert get_currency_unit_pattern('USD', locale='ro', count=2) == '{0} {1}'
+    assert get_currency_unit_pattern('USD', locale='ro', count=100) == '{0} de {1}'
+    assert get_currency_unit_pattern('USD', locale='ro') == '{0} de {1}'
+
+
 def test_get_territory_currencies():
     assert numbers.get_territory_currencies('AT', date(1995, 1, 1)) == ['ATS']
     assert numbers.get_territory_currencies('AT', date(2011, 1, 1)) == ['EUR']
@@ -434,6 +445,14 @@ def test_format_currency_long_display_name():
     assert (numbers.format_currency(1099.98, 'XAB', locale='en_US', format_type='name')
             == u'1,099.98 XAB')
 
+    # Test for finding different unit patterns depending on count
+    assert (numbers.format_currency(1, 'USD', locale='ro', format_type='name')
+            == u'1,00 dolar american')
+    assert (numbers.format_currency(2, 'USD', locale='ro', format_type='name')
+            == u'2,00 dolari americani')
+    assert (numbers.format_currency(100, 'USD', locale='ro', format_type='name')
+            == u'100,00 de dolari americani')
+
 
 def test_format_currency_long_display_name_all():
     for locale_code in localedata.locale_identifiers():

From 93e162a3194a8ac7e94ebbd965f705ba31e58318 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 9 Jun 2018 19:30:51 -0700
Subject: [PATCH 400/489] Update all pypi.python.org URLs to pypi.org

For details on the new PyPI, see the blog post:

https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
---
 docs/_templates/sidebar-links.html | 2 +-
 docs/numbers.rst                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_templates/sidebar-links.html b/docs/_templates/sidebar-links.html
index a55b2dd96..99c347420 100644
--- a/docs/_templates/sidebar-links.html
+++ b/docs/_templates/sidebar-links.html
@@ -9,7 +9,7 @@ <h3>Other Formats</h3>
 <h3>Useful Links</h3>
 <ul>
   <li><a href="http://babel.pocoo.org/">Babel Website</a></li>
-  <li><a href="http://pypi.python.org/pypi/Babel">Babel @ PyPI</a></li>
+  <li><a href="https://pypi.org/project/Babel/">Babel @ PyPI</a></li>
   <li><a href="http://github.com/python-babel/babel">Babel @ github</a></li>
   <li><a href="http://github.com/python-babel/babel/issues">Issue Tracker</a></li>
 </ul>
diff --git a/docs/numbers.rst b/docs/numbers.rst
index 1443b7cf5..b2a952281 100644
--- a/docs/numbers.rst
+++ b/docs/numbers.rst
@@ -135,7 +135,7 @@ behaves as desired.
 .. _Decimal: https://docs.python.org/3/library/decimal.html#decimal-objects
 .. _Context: https://docs.python.org/3/library/decimal.html#context-objects
 .. _`UTS #35 section 3.3`: http://www.unicode.org/reports/tr35/tr35-numbers.html#Formatting
-.. _cdecimal: https://pypi.python.org/pypi/cdecimal
+.. _cdecimal: https://pypi.org/project/cdecimal/
 
 
 Parsing Numbers

From 50610283e6d5d43b660c453f20f96f7703f883f7 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 9 Jun 2018 19:44:44 -0700
Subject: [PATCH 401/489] Use https URLs throughout project where available

Updated docs and code comments.
---
 .ci/appveyor.yml                   |  2 +-
 .ci/run_with_env.cmd               |  4 ++--
 CONTRIBUTING.md                    |  2 +-
 babel/dates.py                     | 10 +++++-----
 babel/languages.py                 |  2 +-
 babel/numbers.py                   |  2 +-
 babel/plural.py                    |  4 ++--
 babel/support.py                   |  2 +-
 babel/units.py                     |  8 ++++----
 docs/_templates/sidebar-links.html |  4 ++--
 docs/conf.py                       |  2 +-
 docs/dates.rst                     |  2 +-
 docs/installation.rst              |  2 +-
 docs/intro.rst                     |  2 +-
 docs/locale.rst                    |  4 ++--
 docs/messages.rst                  |  6 +++---
 docs/numbers.rst                   |  4 ++--
 scripts/import_cldr.py             |  4 ++--
 18 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index 816b938f6..f357713f4 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -4,7 +4,7 @@ environment:
   global:
     # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
     # /E:ON and /V:ON options are not enabled in the batch script intepreter
-    # See: http://stackoverflow.com/a/13751649/163740
+    # See: https://stackoverflow.com/a/13751649
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\.ci\\run_with_env.cmd"
 
   matrix:
diff --git a/.ci/run_with_env.cmd b/.ci/run_with_env.cmd
index 3a472bc83..0f5b8e097 100644
--- a/.ci/run_with_env.cmd
+++ b/.ci/run_with_env.cmd
@@ -13,10 +13,10 @@
 ::
 :: More details at:
 :: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
-:: http://stackoverflow.com/a/13751649/163740
+:: https://stackoverflow.com/a/13751649
 ::
 :: Author: Olivier Grisel
-:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
+:: License: CC0 1.0 Universal: https://creativecommons.org/publicdomain/zero/1.0/
 @ECHO OFF
 
 SET COMMAND_TO_RUN=%*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c1b7e6959..079ef06b2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -51,5 +51,5 @@ shall be amended so the history is not cluttered by "fixup commits".
 ## Writing Good Commits
 
 Please see
-http://api.coala.io/en/latest/Developers/Writing_Good_Commits.html
+https://api.coala.io/en/latest/Developers/Writing_Good_Commits.html
 for guidelines on how to write good commits and proper commit messages.
diff --git a/babel/dates.py b/babel/dates.py
index cf58a485d..4bae3eaa0 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -34,7 +34,7 @@
 #  be inherited, the inheritance of this value can be explicitly disabled by
 #  use of the 'no inheritance marker' as the value, which is 3 simultaneous [sic]
 #  empty set characters ( U+2205 )."
-#  - http://www.unicode.org/reports/tr35/tr35-dates.html#Metazone_Names
+#  - https://www.unicode.org/reports/tr35/tr35-dates.html#Metazone_Names
 
 NO_INHERITANCE_MARKER = u'\u2205\u2205\u2205'
 
@@ -592,7 +592,7 @@ def get_timezone_name(dt_or_tzinfo=None, width='long', uncommon=False,
     format.
 
     For more information see `LDML Appendix J: Time Zone Display Names
-    <http://www.unicode.org/reports/tr35/#Time_Zone_Fallback>`_
+    <https://www.unicode.org/reports/tr35/#Time_Zone_Fallback>`_
 
     .. versionadded:: 0.9
 
@@ -1018,7 +1018,7 @@ def format_interval(start, end, skeleton=None, tzinfo=None, fuzzy=True, locale=L
     locale = Locale.parse(locale)
 
     # NB: The quote comments below are from the algorithm description in
-    #     http://www.unicode.org/reports/tr35/tr35-dates.html#intervalFormats
+    #     https://www.unicode.org/reports/tr35/tr35-dates.html#intervalFormats
 
     # > Look for the intervalFormatItem element that matches the "skeleton",
     # > starting in the current locale and then following the locale fallback
@@ -1527,7 +1527,7 @@ def get_week_number(self, day_of_period, day_of_week=None):
 }
 
 #: The pattern characters declared in the Date Field Symbol Table
-#: (http://www.unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table)
+#: (https://www.unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table)
 #: in order of decreasing magnitude.
 PATTERN_CHAR_ORDER = "GyYuUQqMLlwWdDFgEecabBChHKkjJmsSAzZOvVXx"
 
@@ -1675,7 +1675,7 @@ def split_interval_pattern(pattern):
     Split an interval-describing datetime pattern into multiple pieces.
 
     > The pattern is then designed to be broken up into two pieces by determining the first repeating field.
-    - http://www.unicode.org/reports/tr35/tr35-dates.html#intervalFormats
+    - https://www.unicode.org/reports/tr35/tr35-dates.html#intervalFormats
 
     >>> split_interval_pattern(u'E d.M. \u2013 E d.M.')
     [u'E d.M. \u2013 ', 'E d.M.']
diff --git a/babel/languages.py b/babel/languages.py
index 0513d002d..097436705 100644
--- a/babel/languages.py
+++ b/babel/languages.py
@@ -60,7 +60,7 @@ def get_territory_language_info(territory):
 
     .. note:: Note that the format of the dict returned may change between Babel versions.
 
-    See http://www.unicode.org/cldr/charts/latest/supplemental/territory_language_information.html
+    See https://www.unicode.org/cldr/charts/latest/supplemental/territory_language_information.html
 
     :param territory: Territory code
     :type territory: str
diff --git a/babel/numbers.py b/babel/numbers.py
index cc825c866..518d4945e 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -17,7 +17,7 @@
 """
 # TODO:
 #  Padding and rounding increments in pattern:
-#  - http://www.unicode.org/reports/tr35/ (Appendix G.6)
+#  - https://www.unicode.org/reports/tr35/ (Appendix G.6)
 import re
 from datetime import date as date_, datetime as datetime_
 import warnings
diff --git a/babel/plural.py b/babel/plural.py
index 38093fe6e..eb1eef268 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -33,7 +33,7 @@ def extract_operands(source):
     t      visible fractional digits in n, without trailing zeros.
     ====== ===============================================================
 
-    .. _`CLDR rules`: http://www.unicode.org/reports/tr35/tr35-33/tr35-numbers.html#Operands
+    .. _`CLDR rules`: https://www.unicode.org/reports/tr35/tr35-33/tr35-numbers.html#Operands
 
     :param source: A real number
     :type source: int|float|decimal.Decimal
@@ -91,7 +91,7 @@ class PluralRule(object):
     exclusive; for a given numeric value, only one rule should apply (i.e.
     the condition should only be true for one of the plural rule elements.
 
-    .. _`CLDR rules`: http://www.unicode.org/reports/tr35/tr35-33/tr35-numbers.html#Language_Plural_Rules
+    .. _`CLDR rules`: https://www.unicode.org/reports/tr35/tr35-33/tr35-numbers.html#Language_Plural_Rules
     """
 
     __slots__ = ('abstract', '_func')
diff --git a/babel/support.py b/babel/support.py
index 932fcf2bb..87cb05967 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -343,7 +343,7 @@ def udngettext(self, domain, singular, plural, num):
     dungettext = udngettext
 
     # Most of the downwards code, until it get's included in stdlib, from:
-    #    http://bugs.python.org/file10036/gettext-pgettext.patch
+    #    https://bugs.python.org/file10036/gettext-pgettext.patch
     #
     # The encoding of a msgctxt and a msgid in a .mo file is
     # msgctxt + "\x04" + msgid (gettext version >= 0.15)
diff --git a/babel/units.py b/babel/units.py
index 4260b3d56..be851c230 100644
--- a/babel/units.py
+++ b/babel/units.py
@@ -26,7 +26,7 @@ def get_unit_name(measurement_unit, length='long', locale=LC_NUMERIC):
 
     :param measurement_unit: the code of a measurement unit.
                              Known units can be found in the CLDR Unit Validity XML file:
-                             http://unicode.org/repos/cldr/tags/latest/common/validity/unit.xml
+                             https://unicode.org/repos/cldr/tags/latest/common/validity/unit.xml
 
     :param length: "short", "long" or "narrow"
     :param locale: the `Locale` object or locale identifier
@@ -44,7 +44,7 @@ def _find_unit_pattern(unit_id, locale=LC_NUMERIC):
     Expand an unit into a qualified form.
 
     Known units can be found in the CLDR Unit Validity XML file:
-    http://unicode.org/repos/cldr/tags/latest/common/validity/unit.xml
+    https://unicode.org/repos/cldr/tags/latest/common/validity/unit.xml
 
     >>> _find_unit_pattern("radian", locale="en")
     'angle-radian'
@@ -105,7 +105,7 @@ def format_unit(value, measurement_unit, length='long', format=None, locale=LC_N
     :param value: the value to format. If this is a string, no number formatting will be attempted.
     :param measurement_unit: the code of a measurement unit.
                              Known units can be found in the CLDR Unit Validity XML file:
-                             http://unicode.org/repos/cldr/tags/latest/common/validity/unit.xml
+                             https://unicode.org/repos/cldr/tags/latest/common/validity/unit.xml
     :param length: "short", "long" or "narrow"
     :param format: An optional format, as accepted by `format_decimal`.
     :param locale: the `Locale` object or locale identifier
@@ -219,7 +219,7 @@ def format_compound_unit(
     >>> format_compound_unit(format_currency(35, "JPY", locale="de"), denominator_unit="liter", locale="de")
     '35\\xa0\\xa5 pro Liter'
 
-    See http://www.unicode.org/reports/tr35/tr35-general.html#perUnitPatterns
+    See https://www.unicode.org/reports/tr35/tr35-general.html#perUnitPatterns
 
     :param numerator_value: The numerator value. This may be a string,
                             in which case it is considered preformatted and the unit is ignored.
diff --git a/docs/_templates/sidebar-links.html b/docs/_templates/sidebar-links.html
index 99c347420..71d11b850 100644
--- a/docs/_templates/sidebar-links.html
+++ b/docs/_templates/sidebar-links.html
@@ -10,6 +10,6 @@ <h3>Useful Links</h3>
 <ul>
   <li><a href="http://babel.pocoo.org/">Babel Website</a></li>
   <li><a href="https://pypi.org/project/Babel/">Babel @ PyPI</a></li>
-  <li><a href="http://github.com/python-babel/babel">Babel @ github</a></li>
-  <li><a href="http://github.com/python-babel/babel/issues">Issue Tracker</a></li>
+  <li><a href="https://github.com/python-babel/babel">Babel @ github</a></li>
+  <li><a href="https://github.com/python-babel/babel/issues">Issue Tracker</a></li>
 </ul>
diff --git a/docs/conf.py b/docs/conf.py
index 47196622a..63c2d7749 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -253,7 +253,7 @@
 #texinfo_show_urls = 'footnote'
 
 intersphinx_mapping = {
-    'http://docs.python.org/2': None,
+    'https://docs.python.org/2/': None,
 }
 
 extlinks = {
diff --git a/docs/dates.rst b/docs/dates.rst
index 0ddd7bc95..44201877e 100644
--- a/docs/dates.rst
+++ b/docs/dates.rst
@@ -124,7 +124,7 @@ the `Locale Data Markup Language specification`_. The following table is just a
 relatively brief overview.
 
  .. _`Locale Data Markup Language specification`:
-    http://unicode.org/reports/tr35/#Date_Format_Patterns
+    https://unicode.org/reports/tr35/#Date_Format_Patterns
 
 Date Fields
 -----------
diff --git a/docs/installation.rst b/docs/installation.rst
index 0aea3abfe..0a7804e86 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -80,7 +80,7 @@ use a git checkout.
 
 Get the git checkout in a new virtualenv and run in development mode::
 
-    $ git clone http://github.com/python-babel/babel.git
+    $ git clone https://github.com/python-babel/babel
     Initialized empty Git repository in ~/dev/babel/.git/
     $ cd babel
     $ virtualenv venv
diff --git a/docs/intro.rst b/docs/intro.rst
index db36f32d3..7733f70b1 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -43,7 +43,7 @@ of locale data, such as the localized names of countries, languages, or
 time-zones, which are frequently needed in web-based applications.
 
 For these requirements, Babel includes data extracted from the `Common
-Locale Data Repository (CLDR) <http://unicode.org/cldr/>`_, and provides a
+Locale Data Repository (CLDR) <https://unicode.org/cldr/>`_, and provides a
 number of convenient methods for accessing and using this data. See
 :ref:`locale-data`, :ref:`date-and-time`, and :ref:`numbers` for more
 information on this aspect of Babel.
diff --git a/docs/locale.rst b/docs/locale.rst
index cf4f6d5c5..425fb776c 100644
--- a/docs/locale.rst
+++ b/docs/locale.rst
@@ -15,8 +15,8 @@ and you'd like to display the names of those countries in the language the
 user prefers. Instead of translating all those country names yourself in your
 application, you can make use of the translations provided by the locale data
 included with Babel, which is based on the `Common Locale Data Repository
-(CLDR) <http://unicode.org/cldr/>`_ developed and maintained by the `Unicode
-Consortium <http://unicode.org/>`_.
+(CLDR) <https://unicode.org/cldr/>`_ developed and maintained by the `Unicode
+Consortium <https://unicode.org/>`_.
 
 
 The ``Locale`` Class
diff --git a/docs/messages.rst b/docs/messages.rst
index f1f695c24..9c66a42eb 100644
--- a/docs/messages.rst
+++ b/docs/messages.rst
@@ -32,8 +32,8 @@ used in an application. They are commonly stored in PO (Portable Object) and MO
 (Machine Object) files, the formats of which are defined by the GNU `gettext`_
 tools and the GNU `translation project`_.
 
- .. _`gettext`: http://www.gnu.org/software/gettext/
- .. _`translation project`: http://sourceforge.net/projects/translation
+ .. _`gettext`: https://www.gnu.org/software/gettext/
+ .. _`translation project`: https://sourceforge.net/projects/translation/
 
 The general procedure for building message catalogs looks something like this:
 
@@ -81,7 +81,7 @@ extracted from source files can not only depend on the file extension, but
 needs to be controllable in a precise manner.
 
 .. _`Jinja2`: http://jinja.pocoo.org/
-.. _`Genshi`: http://genshi.edgewall.org/
+.. _`Genshi`: https://genshi.edgewall.org/
 
 Babel accepts a configuration file to specify this mapping of files to
 extraction methods, which is described below.
diff --git a/docs/numbers.rst b/docs/numbers.rst
index b2a952281..df834eaf8 100644
--- a/docs/numbers.rst
+++ b/docs/numbers.rst
@@ -47,7 +47,7 @@ The syntax for custom number format patterns is described in detail in the
 the specification. The following table is just a relatively brief overview.
 
  .. _`Locale Data Markup Language specification`:
-    http://unicode.org/reports/tr35/#Number_Format_Patterns
+    https://unicode.org/reports/tr35/#Number_Format_Patterns
 
   +----------+-----------------------------------------------------------------+
   | Symbol   | Description                                                     |
@@ -134,7 +134,7 @@ behaves as desired.
 
 .. _Decimal: https://docs.python.org/3/library/decimal.html#decimal-objects
 .. _Context: https://docs.python.org/3/library/decimal.html#context-objects
-.. _`UTS #35 section 3.3`: http://www.unicode.org/reports/tr35/tr35-numbers.html#Formatting
+.. _`UTS #35 section 3.3`: https://www.unicode.org/reports/tr35/tr35-numbers.html#Formatting
 .. _cdecimal: https://pypi.org/project/cdecimal/
 
 
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index f1dd391be..a3e8f69ea 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -756,7 +756,7 @@ def parse_decimal_formats(data, tree):
                 pattern = numbers.parse_pattern(text_type(pattern_el.text))
                 if pattern_type:
                     # This is a compact decimal format, see:
-                    # http://www.unicode.org/reports/tr35/tr35-45/tr35-numbers.html#Compact_Number_Formats
+                    # https://www.unicode.org/reports/tr35/tr35-45/tr35-numbers.html#Compact_Number_Formats
 
                     # These are mapped into a `compact_decimal_formats` dictionary
                     # with the format {length: {count: {multiplier: pattern}}}.
@@ -861,7 +861,7 @@ def parse_date_fields(data, tree):
 
 
 def parse_interval_formats(data, tree):
-    # http://www.unicode.org/reports/tr35/tr35-dates.html#intervalFormats
+    # https://www.unicode.org/reports/tr35/tr35-dates.html#intervalFormats
     interval_formats = data.setdefault("interval_formats", {})
     for elem in tree.findall("dateTimeFormats/intervalFormats/*"):
         if 'draft' in elem.attrib:

From f7ac6530a70ad3b58a85add5ace83131777beb83 Mon Sep 17 00:00:00 2001
From: Charly C <changaco@changaco.oy.lc>
Date: Sat, 16 Jun 2018 11:09:13 +0200
Subject: [PATCH 402/489] add a `strict` mode to `parse_decimal()`

Fixes https://github.com/python-babel/babel/issues/589
---
 babel/numbers.py      | 25 ++++++++++++++++++++++---
 tests/test_numbers.py | 19 +++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 518d4945e..509150cb9 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -661,7 +661,7 @@ def parse_number(string, locale=LC_NUMERIC):
         raise NumberFormatError('%r is not a valid number' % string)
 
 
-def parse_decimal(string, locale=LC_NUMERIC):
+def parse_decimal(string, locale=LC_NUMERIC, strict=False):
     """Parse localized decimal string into a decimal.
 
     >>> parse_decimal('1,099.98', locale='en_US')
@@ -676,17 +676,36 @@ def parse_decimal(string, locale=LC_NUMERIC):
         ...
     NumberFormatError: '2,109,998' is not a valid decimal number
 
+    If `strict` is set to `True` and the given string contains a number
+    formatted in an irregular way, an exception is raised:
+
+    >>> parse_decimal('30.00', locale='de', strict=True)
+    Traceback (most recent call last):
+        ...
+    NumberFormatError: '30.00' is not a properly formatted decimal number
+
     :param string: the string to parse
     :param locale: the `Locale` object or locale identifier
+    :param strict: controls whether numbers formatted in a weird way are
+                   accepted or rejected
     :raise NumberFormatError: if the string can not be converted to a
                               decimal number
     """
     locale = Locale.parse(locale)
+    group_symbol = get_group_symbol(locale)
+    decimal_symbol = get_decimal_symbol(locale)
     try:
-        return decimal.Decimal(string.replace(get_group_symbol(locale), '')
-                               .replace(get_decimal_symbol(locale), '.'))
+        parsed = decimal.Decimal(string.replace(group_symbol, '')
+                                       .replace(decimal_symbol, '.'))
     except decimal.InvalidOperation:
         raise NumberFormatError('%r is not a valid decimal number' % string)
+    if strict and group_symbol in string:
+        proper = format_decimal(parsed, locale=locale, decimal_quantization=False)
+        if string != proper and string.rstrip('0') != (proper + decimal_symbol):
+            raise NumberFormatError(
+                "%r is not a properly formatted decimal number" % string
+            )
+    return parsed
 
 
 PREFIX_END = r'[^0-9@#.,]'
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 32f4280e7..50c53dec4 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -165,6 +165,25 @@ def test_can_parse_decimals(self):
         self.assertRaises(numbers.NumberFormatError,
                           lambda: numbers.parse_decimal('2,109,998', locale='de'))
 
+    def test_parse_decimal_strict_mode(self):
+        # Numbers with a misplaced grouping symbol should be rejected
+        with self.assertRaises(numbers.NumberFormatError):
+            numbers.parse_decimal('11.11', locale='de', strict=True)
+        # Partially grouped numbers should be rejected
+        with self.assertRaises(numbers.NumberFormatError):
+            numbers.parse_decimal('2000,000', locale='en_US', strict=True)
+        # Numbers with duplicate grouping symbols should be rejected
+        with self.assertRaises(numbers.NumberFormatError):
+            numbers.parse_decimal('0,,000', locale='en_US', strict=True)
+        # Properly formatted numbers should be accepted
+        assert str(numbers.parse_decimal('1.001', locale='de', strict=True)) == '1001'
+        # Trailing zeroes should be accepted
+        assert str(numbers.parse_decimal('3.00', locale='en_US', strict=True)) == '3.00'
+        # Numbers without any grouping symbol should be accepted
+        assert str(numbers.parse_decimal('2000.1', locale='en_US', strict=True)) == '2000.1'
+        # High precision numbers should be accepted
+        assert str(numbers.parse_decimal('5,000001', locale='fr', strict=True)) == '5.000001'
+
 
 def test_list_currencies():
     assert isinstance(list_currencies(), set)

From 6bf8745f6a913af71357583e8e97116fcfd444ca Mon Sep 17 00:00:00 2001
From: Changaco <changaco@changaco.oy.lc>
Date: Sun, 17 Jun 2018 09:17:02 +0200
Subject: [PATCH 403/489] include more information in error message

---
 babel/numbers.py      | 19 +++++++++++++++----
 tests/test_numbers.py |  3 +++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 509150cb9..b0cfe65e7 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -682,7 +682,7 @@ def parse_decimal(string, locale=LC_NUMERIC, strict=False):
     >>> parse_decimal('30.00', locale='de', strict=True)
     Traceback (most recent call last):
         ...
-    NumberFormatError: '30.00' is not a properly formatted decimal number
+    NumberFormatError: '30.00' is not a properly formatted decimal number. Did you mean '3.000'? Or maybe '30,00'?
 
     :param string: the string to parse
     :param locale: the `Locale` object or locale identifier
@@ -702,9 +702,20 @@ def parse_decimal(string, locale=LC_NUMERIC, strict=False):
     if strict and group_symbol in string:
         proper = format_decimal(parsed, locale=locale, decimal_quantization=False)
         if string != proper and string.rstrip('0') != (proper + decimal_symbol):
-            raise NumberFormatError(
-                "%r is not a properly formatted decimal number" % string
-            )
+            try:
+                parsed_alt = decimal.Decimal(string.replace(decimal_symbol, '')
+                                                   .replace(group_symbol, '.'))
+            except decimal.InvalidOperation:
+                raise NumberFormatError(
+                    "%r is not a properly formatted decimal number. Did you mean %r?" %
+                    (string, proper)
+                )
+            else:
+                proper_alt = format_decimal(parsed_alt, locale=locale, decimal_quantization=False)
+                raise NumberFormatError(
+                    "%r is not a properly formatted decimal number. Did you mean %r? Or maybe %r?" %
+                    (string, proper, proper_alt)
+                )
     return parsed
 
 
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 50c53dec4..b9dcb7278 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -169,6 +169,9 @@ def test_parse_decimal_strict_mode(self):
         # Numbers with a misplaced grouping symbol should be rejected
         with self.assertRaises(numbers.NumberFormatError):
             numbers.parse_decimal('11.11', locale='de', strict=True)
+        # Numbers with two misplaced grouping symbols should be rejected
+        with self.assertRaises(numbers.NumberFormatError):
+            numbers.parse_decimal('80.00.00', locale='de', strict=True)
         # Partially grouped numbers should be rejected
         with self.assertRaises(numbers.NumberFormatError):
             numbers.parse_decimal('2000,000', locale='en_US', strict=True)

From b5f6f362440faf862ea887a4157252874c59d910 Mon Sep 17 00:00:00 2001
From: Changaco <changaco@changaco.oy.lc>
Date: Sun, 17 Jun 2018 09:55:02 +0200
Subject: [PATCH 404/489] add a `suggestions` attribute to `NumberFormatError`

---
 babel/numbers.py      | 13 +++++++++----
 docs/api/numbers.rst  |  1 +
 tests/test_numbers.py | 12 ++++++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index b0cfe65e7..d3d223836 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -634,6 +634,11 @@ def format_scientific(
 class NumberFormatError(ValueError):
     """Exception raised when a string cannot be parsed into a number."""
 
+    def __init__(self, message, suggestions=None):
+        super(NumberFormatError, self).__init__(message)
+        #: a list of properly formatted numbers derived from the invalid input
+        self.suggestions = suggestions
+
 
 def parse_number(string, locale=LC_NUMERIC):
     """Parse localized number string into an integer.
@@ -706,16 +711,16 @@ def parse_decimal(string, locale=LC_NUMERIC, strict=False):
                 parsed_alt = decimal.Decimal(string.replace(decimal_symbol, '')
                                                    .replace(group_symbol, '.'))
             except decimal.InvalidOperation:
-                raise NumberFormatError(
+                raise NumberFormatError((
                     "%r is not a properly formatted decimal number. Did you mean %r?" %
                     (string, proper)
-                )
+                ), suggestions=[proper])
             else:
                 proper_alt = format_decimal(parsed_alt, locale=locale, decimal_quantization=False)
-                raise NumberFormatError(
+                raise NumberFormatError((
                     "%r is not a properly formatted decimal number. Did you mean %r? Or maybe %r?" %
                     (string, proper, proper_alt)
-                )
+                ), suggestions=[proper, proper_alt])
     return parsed
 
 
diff --git a/docs/api/numbers.rst b/docs/api/numbers.rst
index 758cebaf3..f9b0833a2 100644
--- a/docs/api/numbers.rst
+++ b/docs/api/numbers.rst
@@ -30,6 +30,7 @@ Exceptions
 ----------
 
 .. autoexception:: NumberFormatError
+    :members:
 
 Data Access
 -----------
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index b9dcb7278..9c3896ce5 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -167,17 +167,21 @@ def test_can_parse_decimals(self):
 
     def test_parse_decimal_strict_mode(self):
         # Numbers with a misplaced grouping symbol should be rejected
-        with self.assertRaises(numbers.NumberFormatError):
+        with self.assertRaises(numbers.NumberFormatError) as info:
             numbers.parse_decimal('11.11', locale='de', strict=True)
+        assert info.exception.suggestions == ['1.111', '11,11']
         # Numbers with two misplaced grouping symbols should be rejected
-        with self.assertRaises(numbers.NumberFormatError):
+        with self.assertRaises(numbers.NumberFormatError) as info:
             numbers.parse_decimal('80.00.00', locale='de', strict=True)
+        assert info.exception.suggestions == ['800.000']
         # Partially grouped numbers should be rejected
-        with self.assertRaises(numbers.NumberFormatError):
+        with self.assertRaises(numbers.NumberFormatError) as info:
             numbers.parse_decimal('2000,000', locale='en_US', strict=True)
+        assert info.exception.suggestions == ['2,000,000', '2,000']
         # Numbers with duplicate grouping symbols should be rejected
-        with self.assertRaises(numbers.NumberFormatError):
+        with self.assertRaises(numbers.NumberFormatError) as info:
             numbers.parse_decimal('0,,000', locale='en_US', strict=True)
+        assert info.exception.suggestions == ['0']
         # Properly formatted numbers should be accepted
         assert str(numbers.parse_decimal('1.001', locale='de', strict=True)) == '1001'
         # Trailing zeroes should be accepted

From 83f959ebf23266b5ae7432589c2f4983f0d817b4 Mon Sep 17 00:00:00 2001
From: Chris <chrisbrake@users.noreply.github.com>
Date: Mon, 18 Jun 2018 14:43:32 -0600
Subject: [PATCH 405/489] Bumped version requirement on pytz

Here you use the utc attribute on the _pytz object: https://github.com/python-babel/babel/blob/23ca4bf2b187748e5e8372c6dae541fbcc5fbe5d/babel/util.py#L304

Which was added in this commit https://github.com/stub42/pytz/commit/ae82fbc71b374a5a5b32bf3bbb38ebb97af6e715

Added the corrected version requirement for it's appearance
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 8e268e16b..27c7541bb 100755
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ def run(self):
         # This version identifier is currently necessary as
         # pytz otherwise does not install on pip 1.4 or
         # higher.
-        'pytz>=0a',
+        'pytz>=2015.7',
     ],
 
     cmdclass={'import_cldr': import_cldr},

From 359ecffca479dfe032d0f7210d5cd8160599c816 Mon Sep 17 00:00:00 2001
From: Bryn Truscott <b.truscott@bboxx.co.uk>
Date: Thu, 19 Jul 2018 15:50:16 +0100
Subject: [PATCH 406/489] Small fixes to avoid stack traces due to badly
 formatted .po file

---
 babel/messages/pofile.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index ea8d7d7e2..fe376318a 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -183,9 +183,12 @@ def _process_message_line(self, lineno, line, obsolete=False):
     def _process_keyword_line(self, lineno, line, obsolete=False):
 
         for keyword in self._keywords:
-            if line.startswith(keyword) and line[len(keyword)] in [' ', '[']:
-                arg = line[len(keyword):]
-                break
+            try:
+                if line.startswith(keyword) and line[len(keyword)] in [' ', '[']:
+                    arg = line[len(keyword):]
+                    break
+            except IndexError:
+                self._invalid_pofile(line, lineno, "Keyword must be followed by a string")
         else:
             self._invalid_pofile(line, lineno, "Start of line didn't match any expected keyword.")
             return
@@ -290,7 +293,7 @@ def _invalid_pofile(self, line, lineno, msg):
         if self.abort_invalid:
             raise PoFileError(msg, self.catalog, line, lineno)
         print("WARNING:", msg)
-        print("WARNING: Problem on line {0}: {1}".format(lineno + 1, line))
+        print(u"WARNING: Problem on line {0}: {1}".format(lineno + 1, line))
 
 
 def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=None, abort_invalid=False):

From 3f1dffbb2dffc88957384fc4af378003299c68db Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 20 Jul 2018 13:36:22 +0300
Subject: [PATCH 407/489] Fix pofile test failure

---
 tests/messages/test_pofile.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 5313329aa..9872e9d54 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -456,16 +456,8 @@ def test_abort_invalid_po_file(self):
             '''
         # Catalog not created, throws Unicode Error
         buf = StringIO(invalid_po)
-        output = None
-
-        # This should only be thrown under py27
-        if sys.version_info.major == 2:
-            with self.assertRaises(UnicodeEncodeError):
-                output = pofile.read_po(buf, locale='fr', abort_invalid=False)
-            assert not output
-        else:
-            output = pofile.read_po(buf, locale='fr', abort_invalid=False)
-            assert isinstance(output, Catalog)
+        output = pofile.read_po(buf, locale='fr', abort_invalid=False)
+        assert isinstance(output, Catalog)
 
         # Catalog not created, throws PoFileError
         buf = StringIO(invalid_po_2)

From 0843782e72376fc44896bc93d50555d278184ddc Mon Sep 17 00:00:00 2001
From: Serban Constantin <serban.constantin@sparkware.ro>
Date: Fri, 3 Aug 2018 16:09:09 +0300
Subject: [PATCH 408/489] don't repeat suggestions in parse_decimal strict

Don't repeat suggestions for `0.00` in languages
which use commas as delimiters combined with strict
mode.
---
 babel/numbers.py      | 19 +++++++++++++++----
 tests/test_numbers.py |  4 ++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index d3d223836..4306e9360 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -689,6 +689,11 @@ def parse_decimal(string, locale=LC_NUMERIC, strict=False):
         ...
     NumberFormatError: '30.00' is not a properly formatted decimal number. Did you mean '3.000'? Or maybe '30,00'?
 
+    >>> parse_decimal('0.00', locale='de', strict=True)
+    Traceback (most recent call last):
+        ...
+    NumberFormatError: '0.00' is not a properly formatted decimal number. Did you mean '0'?
+
     :param string: the string to parse
     :param locale: the `Locale` object or locale identifier
     :param strict: controls whether numbers formatted in a weird way are
@@ -717,10 +722,16 @@ def parse_decimal(string, locale=LC_NUMERIC, strict=False):
                 ), suggestions=[proper])
             else:
                 proper_alt = format_decimal(parsed_alt, locale=locale, decimal_quantization=False)
-                raise NumberFormatError((
-                    "%r is not a properly formatted decimal number. Did you mean %r? Or maybe %r?" %
-                    (string, proper, proper_alt)
-                ), suggestions=[proper, proper_alt])
+                if proper_alt == proper:
+                    raise NumberFormatError((
+                            "%r is not a properly formatted decimal number. Did you mean %r?" %
+                            (string, proper)
+                    ), suggestions=[proper])
+                else:
+                    raise NumberFormatError((
+                        "%r is not a properly formatted decimal number. Did you mean %r? Or maybe %r?" %
+                        (string, proper, proper_alt)
+                    ), suggestions=[proper, proper_alt])
     return parsed
 
 
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 9c3896ce5..d0f24bd54 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -182,6 +182,10 @@ def test_parse_decimal_strict_mode(self):
         with self.assertRaises(numbers.NumberFormatError) as info:
             numbers.parse_decimal('0,,000', locale='en_US', strict=True)
         assert info.exception.suggestions == ['0']
+        # Return only suggestion for 0 on strict
+        with self.assertRaises(numbers.NumberFormatError) as info:
+            numbers.parse_decimal('0.00', locale='de', strict=True)
+        assert info.exception.suggestions == ['0']
         # Properly formatted numbers should be accepted
         assert str(numbers.parse_decimal('1.001', locale='de', strict=True)) == '1001'
         # Trailing zeroes should be accepted

From 41140232602ce150756e417d22f98cac419789d6 Mon Sep 17 00:00:00 2001
From: Brian Cappello <briancappello@gmail.com>
Date: Tue, 14 Aug 2018 19:21:16 -0600
Subject: [PATCH 409/489] add support to util.pathmatch for matching the start
 of a string

---
 babel/util.py      | 21 ++++++++++++++++++++-
 tests/test_util.py |  5 +++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/babel/util.py b/babel/util.py
index 0150827de..fb93f16d5 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -151,6 +151,16 @@ def pathmatch(pattern, filename):
     >>> pathmatch('**.py', 'templates/index.html')
     False
 
+    >>> pathmatch('./foo/**.py', 'foo/bar/baz.py')
+    True
+    >>> pathmatch('./foo/**.py', 'bar/baz.py')
+    False
+
+    >>> pathmatch('^foo/**.py', 'foo/bar/baz.py')
+    True
+    >>> pathmatch('^foo/**.py', 'bar/baz.py')
+    False
+
     >>> pathmatch('**/templates/*.html', 'templates/index.html')
     True
     >>> pathmatch('**/templates/*.html', 'templates/foo/bar.html')
@@ -167,7 +177,16 @@ def pathmatch(pattern, filename):
         '**/': '(?:.+/)*?',
         '**': '(?:.+/)*?[^/]+',
     }
-    buf = []
+
+    if pattern.startswith('^'):
+        buf = ['^']
+        pattern = pattern[1:]
+    elif pattern.startswith('./'):
+        buf = ['^']
+        pattern = pattern[2:]
+    else:
+        buf = []
+
     for idx, part in enumerate(re.split('([?*]+/?)', pattern)):
         if idx % 2:
             buf.append(symbols[part])
diff --git a/tests/test_util.py b/tests/test_util.py
index a3607d5fc..ef591102e 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -31,6 +31,11 @@ def test_pathmatch():
     assert not util.pathmatch('**.py', 'templates/index.html')
     assert util.pathmatch('**/templates/*.html', 'templates/index.html')
     assert not util.pathmatch('**/templates/*.html', 'templates/foo/bar.html')
+    assert util.pathmatch('^foo/**.py', 'foo/bar/baz/blah.py')
+    assert not util.pathmatch('^foo/**.py', 'blah/foo/bar/baz.py')
+    assert util.pathmatch('./foo/**.py', 'foo/bar/baz/blah.py')
+    assert util.pathmatch('./blah.py', 'blah.py')
+    assert not util.pathmatch('./foo/**.py', 'blah/foo/bar/baz.py')
 
 
 def test_odict_pop():

From 85f6587c8556592e969b23a92f7432d24d464532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 19 Aug 2018 18:03:02 +0200
Subject: [PATCH 410/489] Test empty translation uses fallback

---
 tests/messages/test_mofile.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/messages/test_mofile.py b/tests/messages/test_mofile.py
index 5fedc600a..66c41d9a3 100644
--- a/tests/messages/test_mofile.py
+++ b/tests/messages/test_mofile.py
@@ -71,3 +71,26 @@ def test_more_plural_forms(self):
         catalog2.add(('Fuzz', 'Fuzzes'), ('', '', ''))
         buf = BytesIO()
         mofile.write_mo(buf, catalog2)
+
+    def test_empty_translation_with_fallback(self):
+        catalog1 = Catalog(locale='fr_FR')
+        catalog1.add(u'', '''\
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n''')
+        catalog1.add(u'Fuzz', '')
+        buf1 = BytesIO()
+        mofile.write_mo(buf1, catalog1)
+        buf1.seek(0)
+        catalog2 = Catalog(locale='fr')
+        catalog2.add(u'', '''\
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n''')
+        catalog2.add(u'Fuzz', 'Flou')
+        buf2 = BytesIO()
+        mofile.write_mo(buf2, catalog2)
+        buf2.seek(0)
+
+        translations = Translations(fp=buf1)
+        translations.add_fallback(Translations(fp=buf2))
+
+        self.assertEqual(u'Flou', translations.ugettext('Fuzz'))

From 65d6bf39f2a2b4bbbbc02cd1e00c44ce9d7c1c5b Mon Sep 17 00:00:00 2001
From: Julien Palard <julien@palard.fr>
Date: Tue, 30 Oct 2018 23:50:35 +0100
Subject: [PATCH 411/489] Using ABCs from collections instead of
 collections.abc is deprecated.

And it will stop working in Python 3.8 according to the warning.
---
 babel/_compat.py    | 3 ++-
 babel/localedata.py | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/babel/_compat.py b/babel/_compat.py
index 1131f44af..849f749e3 100644
--- a/babel/_compat.py
+++ b/babel/_compat.py
@@ -29,6 +29,7 @@
     cmp = lambda a, b: (a > b) - (a < b)
 
     array_tobytes = array.array.tobytes
+    from collections import abc
 
 else:
     text_type = unicode
@@ -54,7 +55,7 @@
     cmp = cmp
 
     array_tobytes = array.array.tostring
-
+    import collections as abc
 
 number_types = integer_types + (float,)
 
diff --git a/babel/localedata.py b/babel/localedata.py
index a638e58af..2a8c4423d 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -14,10 +14,9 @@
 
 import os
 import threading
-from collections import MutableMapping
 from itertools import chain
 
-from babel._compat import pickle, string_types
+from babel._compat import pickle, string_types, abc
 
 
 _cache = {}
@@ -187,7 +186,7 @@ def resolve(self, data):
         return data
 
 
-class LocaleDataDict(MutableMapping):
+class LocaleDataDict(abc.MutableMapping):
     """Dictionary wrapper that automatically resolves aliases to the actual
     values.
     """

From 8a8a337c153147a6bef5d3d69b854fa8fb9501e6 Mon Sep 17 00:00:00 2001
From: NotAFile <notafile@gmail.com>
Date: Sat, 15 Dec 2018 17:38:17 +0100
Subject: [PATCH 412/489] switch print statement in docs to print function

---
 docs/messages.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/messages.rst b/docs/messages.rst
index 9c66a42eb..3ac035607 100644
--- a/docs/messages.rst
+++ b/docs/messages.rst
@@ -17,13 +17,13 @@ application as subject to localization, by wrapping them in functions such as
 
 .. code-block:: python
 
-    print _("Hello")
+    print(_("Hello"))
 
 instead of just:
 
 .. code-block:: python
 
-    print "Hello"
+    print("Hello")
 
 to make the string "Hello" localizable.
 

From c4f790500fd946f6d00bbc90c32086f881b23ba6 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Thu, 1 Nov 2018 19:05:56 -0700
Subject: [PATCH 413/489] Remove all references to deprecated easy_install

easy_install is deprecated and its use is discouraged by PyPA:

https://setuptools.readthedocs.io/en/latest/easy_install.html

> Warning: Easy Install is deprecated. Do not use it. Instead use pip.

Follow upstream advice and only recommended supported tools.
---
 docs/installation.rst | 53 ++++---------------------------------------
 1 file changed, 5 insertions(+), 48 deletions(-)

diff --git a/docs/installation.rst b/docs/installation.rst
index 0a7804e86..ce778b04c 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -5,8 +5,7 @@ Installation
 
 Babel is distributed as a standard Python package fully set up with all
 the dependencies it needs.  It primarily depends on the excellent `pytz`_
-library for timezone handling.  To install it you can use ``easy_install``
-or ``pip``.
+library for timezone handling.  To install it you can use ``pip``.
 
 .. _pytz: http://pytz.sourceforge.net/
 
@@ -17,17 +16,12 @@ virtualenv
 
 Virtualenv is probably what you want to use during development, and if you
 have shell access to your production machines, you'll probably want to use
-it there, too.
+it there, too.  Use ``pip`` to install it::
 
-If you are on Mac OS X or Linux, chances are that one of the following two
-commands will work for you::
+    $ sudo pip install virtualenv
 
-    $ sudo easy_install virtualenv
-
-If you are on Windows and don't have the `easy_install` command, you must
-install it first.  Check the :ref:`windows-easy-install` section for more
-information about how to do that.  Once you have it installed, run the same
-commands as above, but without the `sudo` prefix.
+If you're on Windows, run it in a command-prompt window with administrator
+privileges, and leave out ``sudo``.
 
 Once you have virtualenv installed, just fire up a shell and create
 your own environment.  I usually create a project folder and a `venv`
@@ -66,8 +60,6 @@ with root privileges::
 
     $ sudo pip install Babel
 
-If `pip` is not available on your system you can use `easy_install`.
-
 (On Windows systems, run it in a command-prompt window with administrator
 privileges, and leave out `sudo`.)
 
@@ -101,38 +93,3 @@ This will pull also in the dependencies and activate the git head as the
 current version inside the virtualenv.  Then all you have to do is run
 ``git pull origin`` to update to the latest version.  If the CLDR data
 changes you will have to re-run ``python setup.py import_cldr``.
-
-.. _windows-easy-install:
-
-`pip` and `distribute` on Windows
------------------------------------
-
-On Windows, installation of `easy_install` is a little bit trickier, but
-still quite easy.  The easiest way to do it is to download the
-`distribute_setup.py`_ file and run it.  The easiest way to run the file
-is to open your downloads folder and double-click on the file.
-
-Next, add the `easy_install` command and other Python scripts to the
-command search path, by adding your Python installation's Scripts folder
-to the `PATH` environment variable.  To do that, right-click on the
-"Computer" icon on the Desktop or in the Start menu, and choose "Properties".
-Then click on "Advanced System settings" (in Windows XP, click on the
-"Advanced" tab instead).  Then click on the "Environment variables" button.
-Finally, double-click on the "Path" variable in the "System variables" section,
-and add the path of your Python interpreter's Scripts folder. Be sure to
-delimit it from existing values with a semicolon.  Assuming you are using
-Python 2.7 on the default path, add the following value::
-
-
-    ;C:\Python27\Scripts
-
-And you are done!  To check that it worked, open the Command Prompt and execute
-``easy_install``.  If you have User Account Control enabled on Windows Vista or
-Windows 7, it should prompt you for administrator privileges.
-
-Now that you have ``easy_install``, you can use it to install ``pip``::
-
-    > easy_install pip
-
-
-.. _distribute_setup.py: http://python-distribute.org/distribute_setup.py

From 5dbc37af339aff21439d007f5ed11e5a2862609e Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 8 Dec 2018 04:50:45 -0800
Subject: [PATCH 414/489] Add testing and document support for Python 3.7

---
 .ci/appveyor.yml | 2 +-
 .travis.yml      | 7 ++++++-
 setup.py         | 1 +
 tox.ini          | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index f357713f4..d4135e080 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -27,7 +27,7 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   # Build data files
-  - "pip install --upgrade pytest==3.3.2 pytest-cov==2.5.1 codecov freezegun==0.3.9"
+  - "pip install --upgrade pytest==3.3.2 pytest-cov==2.5.1 codecov freezegun==0.3.11"
   - "pip install --editable ."
   - "python setup.py import_cldr"
 
diff --git a/.travis.yml b/.travis.yml
index 63dcd3ec0..c9c0a9b7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: xenial
 language: python
 
 # Use travis docker infrastructure for greater speed
@@ -18,8 +19,10 @@ matrix:
       env:
       - CDECIMAL=m3-cdecimal
     - os: linux
+      dist: trusty
       python: pypy
     - os: linux
+      dist: trusty
       python: pypy3
     - os: linux
       python: 3.4
@@ -29,11 +32,13 @@ matrix:
       - PYTHON_TEST_FLAGS=-bb
     - os: linux
       python: 3.6
+    - os: linux
+      python: 3.7
 
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
-  - pip install --upgrade $CDECIMAL pytest==3.3.2 pytest-cov==2.5.1 freezegun==0.3.9
+  - pip install --upgrade $CDECIMAL pytest==3.3.2 pytest-cov==2.5.1 freezegun==0.3.11
   - pip install --editable .
 
 script:
diff --git a/setup.py b/setup.py
index 27c7541bb..0032a3a05 100755
--- a/setup.py
+++ b/setup.py
@@ -50,6 +50,7 @@ def run(self):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules',
diff --git a/tox.ini b/tox.ini
index b46fed704..87a53f0f9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
-envlist = py27, pypy, py34, py35, py36, pypy3, py27-cdecimal
+envlist = py27, pypy, py34, py35, py36, py37, pypy3, py27-cdecimal
 
 [testenv]
 deps =
     pytest==3.3.2
     pytest-cov==2.5.1
     cdecimal: m3-cdecimal
-    freezegun==0.3.9
+    freezegun==0.3.11
 whitelist_externals = make
 commands = make clean-cldr test
 passenv = PYTHON_TEST_FLAGS

From b7dda2a0de98344426359087a3d3c239b74de548 Mon Sep 17 00:00:00 2001
From: mondeja <mondejar1994@gmail.com>
Date: Sat, 13 Oct 2018 14:49:30 +0200
Subject: [PATCH 415/489] Avoid KeyError trying to get data on WindowsXP
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I've found this issue trying to compile documentation with Sphinx on WindowsXP with `make html` command. Some data dictionaries are void on my machine, so using lazy 'get' on those can prevent next `KeyError`:

```
C:\Path\to\my\project\doc>make html
{'MapID': '8,9', 'Index': 165, 'Std': 'Hora estándar árabe', 'Display': '(GMT+04
:00) Abu Dhabi, Muscat', 'TZI': b'\x10\xff\xff\xff\x00\x00\x00\x00\xc4\xff\xff\x
ff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x
00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'Dlt': 'Hora de verano árab
e'}
{'MapID': '-1,71', 'Index': 158, 'Std': 'Hora estándar árabe D', 'Display': '(GM
T+03:00) Baghdad', 'TZI': b'L\xff\xff\xff\x00\x00\x00\x00\xc4\xff\xff\xff\x00\x0
0\n\x00\x00\x00\x01\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\
x01\x00\x03\x00\x00\x00\x00\x00\x00\x00', 'Dlt': 'Hora de verano árabe'}
{'MapID': '12,13', 'Index': 195, 'Std': 'Hora estándar de Asia C.', 'Display': '
(GMT+06:00) Astana, Dhaka', 'TZI': b'\x98\xfe\xff\xff\x00\x00\x00\x00\xc4\xff\xf
f\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0
0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00', 'Dlt': 'Hora de verano d
e Asia C.'}
{}
Traceback (most recent call last):
  File "c:\python34\lib\runpy.py", line 170, in _run_module_as_main
    "__main__", mod_spec)
  File "c:\python34\lib\runpy.py", line 85, in _run_code
    exec(code, run_globals)
  File "C:\Python34\Scripts\sphinx-build.exe\__main__.py", line 5, in <module>
  File "c:\python34\lib\site-packages\sphinx\cmd\build.py", line 25, in <module>

    from sphinx.application import Sphinx
  File "c:\python34\lib\site-packages\sphinx\application.py", line 29, in <modul
e>
    from sphinx.config import Config, check_unicode
  File "c:\python34\lib\site-packages\sphinx\config.py", line 28, in <module>
    from sphinx.util.i18n import format_date
  File "c:\python34\lib\site-packages\sphinx\util\i18n.py", line 20, in <module>

    import babel.dates
  File "c:\python34\lib\site-packages\babel\dates.py", line 29, in <module>
    from babel.util import UTC, LOCALTZ
  File "c:\python34\lib\site-packages\babel\util.py", line 19, in <module>
    from babel import localtime
  File "c:\python34\lib\site-packages\babel\localtime\__init__.py", line 74, in
<module>
    LOCALTZ = get_localzone()
  File "c:\python34\lib\site-packages\babel\localtime\__init__.py", line 70, in
get_localzone
    return _get_localzone()
  File "c:\python34\lib\site-packages\babel\localtime\_win32.py", line 97, in _g
et_localzone
    return pytz.timezone(get_localzone_name())
  File "c:\python34\lib\site-packages\babel\localtime\_win32.py", line 70, in ge
t_localzone_name
    if data['Std'] == tzwin:
KeyError: 'Std'
```
---
 babel/localtime/_win32.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/localtime/_win32.py b/babel/localtime/_win32.py
index 3752dffac..65cc0885d 100644
--- a/babel/localtime/_win32.py
+++ b/babel/localtime/_win32.py
@@ -66,7 +66,7 @@ def get_localzone_name():
             sub = winreg.OpenKey(tzkey, subkey)
             data = valuestodict(sub)
             sub.Close()
-            if data['Std'] == tzwin:
+            if data.get('Std', None) == tzwin:
                 tzkeyname = subkey
                 break
 

From 09528e5e7096ef047b87893ff55f31adffb5d598 Mon Sep 17 00:00:00 2001
From: Alberto Mardegan <mardy@users.sourceforge.net>
Date: Thu, 24 Jan 2019 22:32:25 +0300
Subject: [PATCH 416/489] Download CLDR 34.0

---
 babel/numbers.py                | 2 +-
 babel/units.py                  | 2 +-
 scripts/download_import_cldr.py | 6 +++---
 tests/test_numbers.py           | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 4306e9360..e5650dd52 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -448,7 +448,7 @@ def format_currency(
     >>> format_currency(1099.98, 'JPY', locale='en_US')
     u'\\xa51,100'
     >>> format_currency(1099.98, 'COP', u'#,##0.00', locale='es_ES')
-    u'1.100'
+    u'1.099,98'
 
     However, the number of decimal digits can be overriden from the currency
     information, by setting the last parameter to ``False``:
diff --git a/babel/units.py b/babel/units.py
index be851c230..e58bf81c2 100644
--- a/babel/units.py
+++ b/babel/units.py
@@ -82,7 +82,7 @@ def format_unit(value, measurement_unit, length='long', format=None, locale=LC_N
 
     >>> from babel._compat import decimal
     >>> format_unit(decimal.Decimal("-42.774"), 'temperature-celsius', 'short', format='#.0', locale='fr')
-    u'-42,8 \\xb0C'
+    u'-42,8\\u202f\\xb0C'
 
     The locale's usual pluralization rules are respected.
 
diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index b6e6f4301..f0d9b10bc 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -13,9 +13,9 @@
     from urllib import urlretrieve
 
 
-URL = 'https://unicode.org/Public/cldr/33/core.zip'
-FILENAME = 'core-33.0.zip'
-FILESUM = 'fa3490082c086d21257153609642f54fcf788fcfda4966fe67f3f6daca0d58b9'
+URL = 'https://unicode.org/Public/cldr/34/core.zip'
+FILENAME = 'cldr-core-34.0.zip'
+FILESUM = '1d79f6ce294ff350a3ee59d7dd69451fd24776f7105fd6a55c255ffb813c03ba'
 BLKSIZE = 131072
 
 
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index d0f24bd54..29bdc2447 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -209,7 +209,7 @@ def test_list_currencies():
 
     assert list_currencies(locale='pa_Arab') == {'PKR', 'INR', 'EUR'}
 
-    assert len(list_currencies()) == 300
+    assert len(list_currencies()) == 303
 
 
 def test_validate_currency():
@@ -412,7 +412,7 @@ def test_format_currency_format_type():
     assert (numbers.format_currency(1099.98, 'JPY', locale='en_US')
             == u'\xa51,100')
     assert (numbers.format_currency(1099.98, 'COP', u'#,##0.00', locale='es_ES')
-            == u'1.100')
+            == u'1.099,98')
     assert (numbers.format_currency(1099.98, 'JPY', locale='en_US',
                                     currency_digits=False)
             == u'\xa51,099.98')

From cece931c2fef3a612e5c7da9baccf4eed41b3647 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sun, 30 Dec 2018 08:28:40 -0800
Subject: [PATCH 417/489] Remove unused imports throughout tests

---
 tests/messages/test_pofile.py | 1 -
 tests/test_localedata.py      | 2 +-
 tests/test_numbers.py         | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 9872e9d54..a6973d7ec 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -13,7 +13,6 @@
 
 from datetime import datetime
 import unittest
-import sys
 
 from babel.core import Locale
 from babel.messages.catalog import Catalog, Message
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 37c1304e9..dceb984be 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -15,7 +15,7 @@
 import random
 from operator import methodcaller
 
-from babel import localedata, numbers
+from babel import localedata
 
 class MergeResolveTestCase(unittest.TestCase):
 
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 29bdc2447..99aa96b7e 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -16,11 +16,10 @@
 
 from datetime import date
 
-from babel import Locale, localedata, numbers
+from babel import localedata, numbers
 from babel.numbers import (
     list_currencies, validate_currency, UnknownCurrencyError, is_currency, normalize_currency,
     get_currency_precision, get_decimal_precision, get_currency_unit_pattern)
-from babel.localedata import locale_identifiers
 from babel._compat import decimal
 
 

From e4d834d4c1bffe05e71ee2ec21449b6b0b115e99 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Wed, 10 Oct 2018 20:34:09 -0700
Subject: [PATCH 418/489] Remove unnecessary compat shim 'binary_type'

The bytes type is available on all supported Pythons. On Python 2, it is
an alias of str, same as binary_type. By removing the shim, makes the
code more forward compatible.
---
 babel/_compat.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/babel/_compat.py b/babel/_compat.py
index 849f749e3..11b4d7a6b 100644
--- a/babel/_compat.py
+++ b/babel/_compat.py
@@ -8,7 +8,6 @@
 
 if not PY2:
     text_type = str
-    binary_type = bytes
     string_types = (str,)
     integer_types = (int, )
 
@@ -33,7 +32,6 @@
 
 else:
     text_type = unicode
-    binary_type = str
     string_types = (str, unicode)
     integer_types = (int, long)
 
@@ -63,7 +61,7 @@
 def force_text(s, encoding='utf-8', errors='strict'):
     if isinstance(s, text_type):
         return s
-    if isinstance(s, binary_type):
+    if isinstance(s, bytes):
         return s.decode(encoding, errors)
     return text_type(s)
 

From 60669579a7e3189112ce4ecb983928040af79e73 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sun, 30 Dec 2018 10:54:34 -0500
Subject: [PATCH 419/489] Replace odict with Python's collection.OrderedDict

The odict class duplicates collection.OrderedDict from Python's standard
lib. Simplify the code by using builtin Python features.

https://docs.python.org/3/library/collections.html#collections.OrderedDict
---
 CHANGES                    | 13 +++++++
 babel/messages/catalog.py  |  9 ++---
 babel/messages/frontend.py |  5 +--
 babel/util.py              | 74 ++------------------------------------
 tests/test_util.py         | 14 --------
 5 files changed, 24 insertions(+), 91 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6d9b0e5fa..622b4c573 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,19 @@
 Babel Changelog
 ===============
 
+UNRELEASED
+----------
+
+Possibly incompatible changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These may be backward incompatible in some cases, as some more-or-less internal
+APIs have changed. Please feel free to file issues if you bump into anything
+strange and we'll try to help!
+
+* General: Internal uses of ``babel.util.odict`` have been replaced with
+  ``collections.OrderedDict`` from The Python standard library.
+
 Version 2.6.0
 -------------
 
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 6d61a3826..649d0e2fe 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -13,6 +13,7 @@
 import time
 
 from cgi import parse_header
+from collections import OrderedDict
 from datetime import datetime, time as time_
 from difflib import get_close_matches
 from email import message_from_string
@@ -22,7 +23,7 @@
 from babel.core import Locale, UnknownLocaleError
 from babel.dates import format_datetime
 from babel.messages.plurals import get_plural
-from babel.util import odict, distinct, LOCALTZ, FixedOffsetTimezone
+from babel.util import distinct, LOCALTZ, FixedOffsetTimezone
 from babel._compat import string_types, number_types, PY2, cmp, text_type, force_text
 
 __all__ = ['Message', 'Catalog', 'TranslationError']
@@ -269,7 +270,7 @@ def __init__(self, locale=None, domain=None, header_comment=DEFAULT_HEADER,
         self.domain = domain
         self.locale = locale
         self._header_comment = header_comment
-        self._messages = odict()
+        self._messages = OrderedDict()
 
         self.project = project or 'PROJECT'
         self.version = version or 'VERSION'
@@ -295,7 +296,7 @@ def __init__(self, locale=None, domain=None, header_comment=DEFAULT_HEADER,
         self.revision_date = revision_date
         self.fuzzy = fuzzy
 
-        self.obsolete = odict()  # Dictionary of obsolete messages
+        self.obsolete = OrderedDict()  # Dictionary of obsolete messages
         self._num_plurals = None
         self._plural_expr = None
 
@@ -754,7 +755,7 @@ def update(self, template, no_fuzzy_matching=False, update_header_comment=False)
         """
         messages = self._messages
         remaining = messages.copy()
-        self._messages = odict()
+        self._messages = OrderedDict()
 
         # Prepare for fuzzy matching
         fuzzy_candidates = []
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 16cb90054..9213cca41 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -17,6 +17,7 @@
 import shutil
 import sys
 import tempfile
+from collections import OrderedDict
 from datetime import datetime
 from locale import getpreferredencoding
 
@@ -28,7 +29,7 @@
 from babel.messages.extract import DEFAULT_KEYWORDS, DEFAULT_MAPPING, check_and_call_extract_file, extract_from_dir
 from babel.messages.mofile import write_mo
 from babel.messages.pofile import read_po, write_po
-from babel.util import LOCALTZ, odict
+from babel.util import LOCALTZ
 from distutils import log as distutils_log
 from distutils.cmd import Command as _Command
 from distutils.errors import DistutilsOptionError, DistutilsSetupError
@@ -965,7 +966,7 @@ def parse_mapping(fileobj, filename=None):
     options_map = {}
 
     parser = RawConfigParser()
-    parser._sections = odict(parser._sections)  # We need ordered sections
+    parser._sections = OrderedDict(parser._sections)  # We need ordered sections
 
     if PY2:
         parser.readfp(fileobj, filename)
diff --git a/babel/util.py b/babel/util.py
index fb93f16d5..c443b6902 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -10,6 +10,7 @@
 """
 
 import codecs
+import collections
 from datetime import timedelta, tzinfo
 import os
 import re
@@ -220,77 +221,8 @@ def wraptext(text, width=70, initial_indent='', subsequent_indent=''):
     return wrapper.wrap(text)
 
 
-class odict(dict):
-    """Ordered dict implementation.
-
-    :see: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/107747
-    """
-
-    def __init__(self, data=None):
-        dict.__init__(self, data or {})
-        self._keys = list(dict.keys(self))
-
-    def __delitem__(self, key):
-        dict.__delitem__(self, key)
-        self._keys.remove(key)
-
-    def __setitem__(self, key, item):
-        new_key = key not in self
-        dict.__setitem__(self, key, item)
-        if new_key:
-            self._keys.append(key)
-
-    def __iter__(self):
-        return iter(self._keys)
-    iterkeys = __iter__
-
-    def clear(self):
-        dict.clear(self)
-        self._keys = []
-
-    def copy(self):
-        d = odict()
-        d.update(self)
-        return d
-
-    def items(self):
-        return zip(self._keys, self.values())
-
-    def iteritems(self):
-        return izip(self._keys, self.itervalues())
-
-    def keys(self):
-        return self._keys[:]
-
-    def pop(self, key, default=missing):
-        try:
-            value = dict.pop(self, key)
-            self._keys.remove(key)
-            return value
-        except KeyError as e:
-            if default == missing:
-                raise e
-            else:
-                return default
-
-    def popitem(self, key):
-        self._keys.remove(key)
-        return dict.popitem(key)
-
-    def setdefault(self, key, failobj=None):
-        dict.setdefault(self, key, failobj)
-        if key not in self._keys:
-            self._keys.append(key)
-
-    def update(self, dict):
-        for (key, val) in dict.items():
-            self[key] = val
-
-    def values(self):
-        return map(self.get, self._keys)
-
-    def itervalues(self):
-        return imap(self.get, self._keys)
+# TODO (Babel 3.x): Remove this re-export
+odict = collections.OrderedDict
 
 
 class FixedOffsetTimezone(tzinfo):
diff --git a/tests/test_util.py b/tests/test_util.py
index ef591102e..0fc59e5c4 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -38,20 +38,6 @@ def test_pathmatch():
     assert not util.pathmatch('./foo/**.py', 'blah/foo/bar/baz.py')
 
 
-def test_odict_pop():
-    odict = util.odict()
-    odict[0] = 1
-    value = odict.pop(0)
-    assert 1 == value
-    assert [] == list(odict.items())
-    assert odict.pop(2, None) is None
-    try:
-        odict.pop(2)
-        assert False
-    except KeyError:
-        assert True
-
-
 class FixedOffsetTimezoneTestCase(unittest.TestCase):
 
     def test_zone_negative_offset(self):

From 60af039d9b282b46e37f6f8556005c339f5c24a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 1 Mar 2019 09:43:00 +0100
Subject: [PATCH 420/489] frontend: Add  omit-header to update_catalog

It is the same option as in extract_message but for when updating the
catalog.
---
 babel/messages/frontend.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 9213cca41..f673f900c 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -647,6 +647,8 @@ class update_catalog(Command):
         ('output-file=', 'o',
          "name of the output file (default "
          "'<output_dir>/<locale>/LC_MESSAGES/<domain>.po')"),
+        ('omit-header', None,
+         "do not include msgid "" entry in header"),
         ('locale=', 'l',
          'locale of the catalog to compile'),
         ('width=', 'w',
@@ -661,15 +663,19 @@ class update_catalog(Command):
         ('update-header-comment', None,
          'update target header comment'),
         ('previous', None,
-         'keep previous msgids of translated messages')
+         'keep previous msgids of translated messages'),
+    ]
+    boolean_options = [
+        'omit-header', 'no-wrap', 'ignore-obsolete', 'no-fuzzy-matching',
+        'previous', 'update-header-comment',
     ]
-    boolean_options = ['no-wrap', 'ignore-obsolete', 'no-fuzzy-matching', 'previous', 'update-header-comment']
 
     def initialize_options(self):
         self.domain = 'messages'
         self.input_file = None
         self.output_dir = None
         self.output_file = None
+        self.omit_header = False
         self.locale = None
         self.width = None
         self.no_wrap = False
@@ -740,6 +746,7 @@ def run(self):
             try:
                 with open(tmpname, 'wb') as tmpfile:
                     write_po(tmpfile, catalog,
+                             omit_header=self.omit_header,
                              ignore_obsolete=self.ignore_obsolete,
                              include_previous=self.previous, width=self.width)
             except:

From ea5bc4988bf7c3be84d296eb874aa11ed86c907d Mon Sep 17 00:00:00 2001
From: BT-sschmid <39914536+BT-sschmid@users.noreply.github.com>
Date: Fri, 1 Mar 2019 12:00:44 +0100
Subject: [PATCH 421/489] fixes #619 wrong weeknumber for 31.12.2018 (#621)

The weeknumber was calculated to 53, but by definition the value must compute to 1.

the fix will compute the weeknumber by using date.isocalendar if locale.first_week_day == 0.

Also the computation of the year format 'YYYY' is replaced by isocalendar.
---
 babel/dates.py      | 16 +++++++++++++---
 tests/test_dates.py |  9 +++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/babel/dates.py b/babel/dates.py
index 4bae3eaa0..ec86991a0 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -1319,9 +1319,7 @@ def format_era(self, char, num):
     def format_year(self, char, num):
         value = self.value.year
         if char.isupper():
-            week = self.get_week_number(self.get_day_of_year())
-            if week == 0:
-                value -= 1
+            value = self.value.isocalendar()[0]
         year = self.format(value, num)
         if num == 2:
             year = year[-2:]
@@ -1505,8 +1503,20 @@ def get_week_number(self, day_of_period, day_of_week=None):
         if first_day < 0:
             first_day += 7
         week_number = (day_of_period + first_day - 1) // 7
+
         if 7 - first_day >= self.locale.min_week_days:
             week_number += 1
+        
+        if self.locale.first_week_day == 0:
+            # Correct the weeknumber in case of iso-calendar usage (first_week_day=0). 
+            # If the weeknumber exceeds the maximum number of weeks for the given year
+            # we must count from zero.For example the above calculation gives week 53 
+            # for 2018-12-31. By iso-calender definition 2018 has a max of 52 
+            # weeks, thus the weeknumber must be 53-52=1.
+            max_weeks = date(year=self.value.year, day=28, month=12).isocalendar()[1]
+            if week_number > max_weeks:
+                week_number -= max_weeks
+
         return week_number
 
 
diff --git a/tests/test_dates.py b/tests/test_dates.py
index b8c293ba6..d77c0ea42 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -79,6 +79,15 @@ def test_week_of_year_last_us_extra_week(self):
         fmt = dates.DateTimeFormat(d, locale='en_US')
         self.assertEqual('53', fmt['w'])
 
+    def test_week_of_year_de_first_us_last_with_year(self):
+        d = date(2018,12,31)
+        fmt = dates.DateTimeFormat(d, locale='de_DE')
+        self.assertEqual('1', fmt['w'])
+        self.assertEqual('2019', fmt['YYYY'])
+        fmt = dates.DateTimeFormat(d, locale='en_US')
+        self.assertEqual('53', fmt['w'])
+        self.assertEqual('2018',fmt['yyyy'])
+
     def test_week_of_month_first(self):
         d = date(2006, 1, 8)
         fmt = dates.DateTimeFormat(d, locale='de_DE')

From 69cda1d2082444ed99836d92135f175d20555463 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 1 Mar 2019 13:38:31 +0200
Subject: [PATCH 422/489] Skip alt=... for week data (minDays, firstDay,
 weekendStart, weekendEnd)

Fixes #624
---
 scripts/import_cldr.py | 8 ++++++++
 tests/test_dates.py    | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index a3e8f69ea..ed2e19c04 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -520,18 +520,26 @@ def parse_dates(data, tree, sup, regions, territory):
     week_data = data.setdefault('week_data', {})
     supelem = sup.find('.//weekData')
     for elem in supelem.findall('minDays'):
+        if _should_skip_elem(elem):
+            continue
         territories = elem.attrib['territories'].split()
         if territory in territories or any([r in territories for r in regions]):
             week_data['min_days'] = int(elem.attrib['count'])
     for elem in supelem.findall('firstDay'):
+        if _should_skip_elem(elem):
+            continue
         territories = elem.attrib['territories'].split()
         if territory in territories or any([r in territories for r in regions]):
             week_data['first_day'] = weekdays[elem.attrib['day']]
     for elem in supelem.findall('weekendStart'):
+        if _should_skip_elem(elem):
+            continue
         territories = elem.attrib['territories'].split()
         if territory in territories or any([r in territories for r in regions]):
             week_data['weekend_start'] = weekdays[elem.attrib['day']]
     for elem in supelem.findall('weekendEnd'):
+        if _should_skip_elem(elem):
+            continue
         territories = elem.attrib['territories'].split()
         if territory in territories or any([r in territories for r in regions]):
             week_data['weekend_end'] = weekdays[elem.attrib['day']]
diff --git a/tests/test_dates.py b/tests/test_dates.py
index d77c0ea42..e8592091d 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -799,3 +799,9 @@ def test_russian_week_numbering():
     v = date(2017, 1, 1)
     assert dates.format_date(v, format='YYYY-ww',locale='ru_RU') == '2016-52'  # This would have returned 2017-01 prior to CLDR 32
     assert dates.format_date(v, format='YYYY-ww',locale='de_DE') == '2016-52'
+
+
+def test_en_gb_first_weekday():
+    assert Locale.parse('en').first_week_day == 0  # Monday in general
+    assert Locale.parse('en_US').first_week_day == 6  # Sunday in the US
+    assert Locale.parse('en_GB').first_week_day == 0  # Monday in the UK
\ No newline at end of file

From b33c95530b0d5e717fd36f5b775137c83c3bcf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 14 Mar 2019 19:54:42 +0100
Subject: [PATCH 423/489] Fix conftest.py compatibility with pytest 4.3

While pytest in tox.ini is explicitly set to be 3.3.2, in Fedora 31
we are about to update to a newer version of pytest.
In order to be able to test babel, we need pytest 4.3 support.

This adds support for pytest 4.3 without breaking support for 3.3.2.
---
 tests/conftest.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index be93b2be7..5b14b1ca7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -10,6 +10,9 @@ def os_environ(monkeypatch):
 
 
 def pytest_generate_tests(metafunc):
-    if hasattr(metafunc.function, "all_locales"):
-        from babel.localedata import locale_identifiers
-        metafunc.parametrize("locale", list(locale_identifiers()))
+    if hasattr(metafunc.function, "pytestmark"):
+        for mark in metafunc.function.pytestmark:
+            if mark.name == "all_locales":
+                from babel.localedata import locale_identifiers
+                metafunc.parametrize("locale", list(locale_identifiers()))
+                break

From 897fa81beb6236ff4f4e6402c49e257459dcacb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 14 Mar 2019 20:24:23 +0100
Subject: [PATCH 424/489] Tests: Update pytest and pytest-cov

---
 .ci/appveyor.yml | 2 +-
 .travis.yml      | 2 +-
 tox.ini          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index d4135e080..eb9ba8656 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -27,7 +27,7 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   # Build data files
-  - "pip install --upgrade pytest==3.3.2 pytest-cov==2.5.1 codecov freezegun==0.3.11"
+  - "pip install --upgrade pytest==4.3.1 pytest-cov==2.6.1 codecov freezegun==0.3.11"
   - "pip install --editable ."
   - "python setup.py import_cldr"
 
diff --git a/.travis.yml b/.travis.yml
index c9c0a9b7b..9fad4fc30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ matrix:
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
-  - pip install --upgrade $CDECIMAL pytest==3.3.2 pytest-cov==2.5.1 freezegun==0.3.11
+  - pip install --upgrade $CDECIMAL pytest==4.3.1 pytest-cov==2.6.1 freezegun==0.3.11
   - pip install --editable .
 
 script:
diff --git a/tox.ini b/tox.ini
index 87a53f0f9..b3f8041f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,8 +3,8 @@ envlist = py27, pypy, py34, py35, py36, py37, pypy3, py27-cdecimal
 
 [testenv]
 deps =
-    pytest==3.3.2
-    pytest-cov==2.5.1
+    pytest==4.3.1
+    pytest-cov==2.6.1
     cdecimal: m3-cdecimal
     freezegun==0.3.11
 whitelist_externals = make

From 8c59f09dcde2a22c925613b3ea44be80ccfeafce Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 10:22:24 +0300
Subject: [PATCH 425/489] Travis: test on Python 3.8-dev

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9fad4fc30..174913952 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,8 @@ matrix:
       python: 3.6
     - os: linux
       python: 3.7
+    - os: linux
+      python: 3.8-dev
 
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh

From cfe74846d606493d40f85115170da59ee38d78ce Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 10:29:26 +0300
Subject: [PATCH 426/489] Use CLDR 35.1

---
 scripts/download_import_cldr.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index f0d9b10bc..f118c6900 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -13,9 +13,9 @@
     from urllib import urlretrieve
 
 
-URL = 'https://unicode.org/Public/cldr/34/core.zip'
-FILENAME = 'cldr-core-34.0.zip'
-FILESUM = '1d79f6ce294ff350a3ee59d7dd69451fd24776f7105fd6a55c255ffb813c03ba'
+URL = 'https://unicode.org/Public/cldr/35.1/core.zip'
+FILENAME = 'cldr-core-35.1.zip'
+FILESUM = 'e2ede8cb8f9c29157e281ee9e696ce540a72c598841bed595a406b710eea87b0'
 BLKSIZE = 131072
 
 

From bd2c44b71cf8d22235df4f187c814b3e0e490683 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 10:50:41 +0300
Subject: [PATCH 427/489] Cache locale_identifiers()

Fixes #620
---
 babel/localedata.py      | 17 ++++++++++++++---
 tests/test_localedata.py | 26 ++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/babel/localedata.py b/babel/localedata.py
index 2a8c4423d..03381e2df 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -57,13 +57,24 @@ def locale_identifiers():
     """Return a list of all locale identifiers for which locale data is
     available.
 
+    This data is cached after the first invocation in `locale_identifiers.cache`.
+
+    Removing the `locale_identifiers.cache` attribute or setting it to `None`
+    will cause this function to re-read the list from disk.
+
     .. versionadded:: 0.8.1
 
     :return: a list of locale identifiers (strings)
     """
-    return [stem for stem, extension in [
-        os.path.splitext(filename) for filename in os.listdir(_dirname)
-    ] if extension == '.dat' and stem != 'root']
+    data = getattr(locale_identifiers, 'cache', None)
+    if data is None:
+        locale_identifiers.cache = data = [
+            stem
+            for stem, extension in
+            (os.path.splitext(filename) for filename in os.listdir(_dirname))
+            if extension == '.dat' and stem != 'root'
+        ]
+    return data
 
 
 def load(name, merge_inherited=True):
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index dceb984be..bffe7633f 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -17,6 +17,7 @@
 
 from babel import localedata
 
+
 class MergeResolveTestCase(unittest.TestCase):
 
     def test_merge_items(self):
@@ -78,6 +79,7 @@ def test_locale_identification():
     for l in localedata.locale_identifiers():
         assert localedata.exists(l)
 
+
 def test_unique_ids():
     # Check all locale IDs are uniques.
     all_ids = localedata.locale_identifiers()
@@ -93,6 +95,7 @@ def test_mixedcased_locale():
             methodcaller(random.choice(['lower', 'upper']))(c) for c in l])
         assert localedata.exists(locale_id)
 
+
 def test_locale_argument_acceptance():
     # Testing None input.
     normalized_locale = localedata.normalize_locale(None)
@@ -105,3 +108,26 @@ def test_locale_argument_acceptance():
     assert normalized_locale is None
     locale_exist = localedata.exists(['en_us', None])
     assert locale_exist == False
+
+
+def test_locale_identifiers_cache(monkeypatch):
+    original_listdir = localedata.os.listdir
+    listdir_calls = []
+    def listdir_spy(*args):
+        rv = original_listdir(*args)
+        listdir_calls.append((args, rv))
+        return rv
+    monkeypatch.setattr(localedata.os, 'listdir', listdir_spy)
+
+    # In case we've already run some tests...
+    if hasattr(localedata.locale_identifiers, 'cache'):
+        del localedata.locale_identifiers.cache
+
+    assert not listdir_calls
+    assert localedata.locale_identifiers()
+    assert len(listdir_calls) == 1
+    assert localedata.locale_identifiers() is localedata.locale_identifiers.cache
+    assert len(listdir_calls) == 1
+    localedata.locale_identifiers.cache = None
+    assert localedata.locale_identifiers()
+    assert len(listdir_calls) == 2

From 4fa0c6e5a2d3ae4c10ca160dabe4e3d169dace81 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 11:01:38 +0300
Subject: [PATCH 428/489] get_display_name(): Don't attempt to concatenate
 variant information to None

Fixes #601
---
 babel/core.py      |  2 +-
 tests/test_core.py | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/babel/core.py b/babel/core.py
index d028c07da..211849bce 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -379,7 +379,7 @@ def get_display_name(self, locale=None):
             locale = self
         locale = Locale.parse(locale)
         retval = locale.languages.get(self.language)
-        if self.territory or self.script or self.variant:
+        if retval and (self.territory or self.script or self.variant):
             details = []
             if self.script:
                 details.append(locale.scripts.get(self.script))
diff --git a/tests/test_core.py b/tests/test_core.py
index f22ab309b..fc637d245 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -317,3 +317,13 @@ def find_class(self, module, name):
 
     with open(filename, 'rb') as f:
         return Unpickler(f).load()
+
+
+def test_issue_601_no_language_name_but_has_variant():
+    # kw_GB has a variant for Finnish but no actual language name for Finnish,
+    # so `get_display_name()` previously crashed with a TypeError as it attempted
+    # to concatenate " (Finnish)" to None.
+    # Instead, it's better to return None altogether, as we can't reliably format
+    # part of a language name.
+
+    assert Locale.parse('fi_FI').get_display_name('kw_GB') == None

From 1d7a4da9e1a563e800dc6475bc95e1fa58a07473 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 11:19:08 +0300
Subject: [PATCH 429/489] Add comparison operators to _NormalizedString

Based on @hoangduytranuk's original implementation.

Fixes #612
---
 babel/messages/pofile.py                 | 33 ++++++++++++++++++++++--
 tests/messages/test_normalized_string.py | 17 ++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 tests/messages/test_normalized_string.py

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index fe376318a..2943fa2ec 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -16,8 +16,7 @@
 
 from babel.messages.catalog import Catalog, Message
 from babel.util import wraptext
-from babel._compat import text_type
-
+from babel._compat import text_type, cmp
 
 
 def unescape(string):
@@ -99,6 +98,36 @@ def denormalize(self):
     def __nonzero__(self):
         return bool(self._strs)
 
+    __bool__ = __nonzero__
+
+    def __repr__(self):
+        return os.linesep.join(self._strs)
+
+    def __cmp__(self, other):
+        if not other:
+            return 1
+
+        return cmp(text_type(self), text_type(other))
+
+    def __gt__(self, other):
+        return self.__cmp__(other) > 0
+
+    def __lt__(self, other):
+        return self.__cmp__(other) < 0
+
+    def __ge__(self, other):
+        return self.__cmp__(other) >= 0
+
+    def __le__(self, other):
+        return self.__cmp__(other) <= 0
+
+    def __eq__(self, other):
+        return self.__cmp__(other) == 0
+
+    def __ne__(self, other):
+        return self.__cmp__(other) != 0
+
+
 
 class PoFileParser(object):
     """Support class to  read messages from a ``gettext`` PO (portable object) file
diff --git a/tests/messages/test_normalized_string.py b/tests/messages/test_normalized_string.py
new file mode 100644
index 000000000..9c95672b4
--- /dev/null
+++ b/tests/messages/test_normalized_string.py
@@ -0,0 +1,17 @@
+from babel.messages.pofile import _NormalizedString
+
+
+def test_normalized_string():
+    ab1 = _NormalizedString('a', 'b ')
+    ab2 = _NormalizedString('a', ' b')
+    ac1 = _NormalizedString('a', 'c')
+    ac2 = _NormalizedString('  a', 'c  ')
+    z = _NormalizedString()
+    assert ab1 == ab2 and ac1 == ac2  # __eq__
+    assert ab1 < ac1  # __lt__
+    assert ac1 > ab2  # __gt__
+    assert ac1 >= ac2  # __ge__
+    assert ab1 <= ab2  # __le__
+    assert ab1 != ac1  # __ne__
+    assert not z  # __nonzero__ / __bool__
+    assert sorted([ab1, ab2, ac1])  # the sort order is not stable so we can't really check it, just that we can sort

From 509f20915c18f452d6d2d247289423fc0c4b8686 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 11:24:33 +0300
Subject: [PATCH 430/489] pofile: don't crash when message.locations can't be
 sorted

Fixes #606
---
 babel/messages/pofile.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 2943fa2ec..9eb3a5cb3 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -581,7 +581,16 @@ def _write_message(message, prefix=''):
 
         if not no_location:
             locs = []
-            for filename, lineno in sorted(message.locations):
+
+            # Attempt to sort the locations.  If we can't do that, for instance
+            # because there are mixed integers and Nones or whatnot (see issue #606)
+            # then give up, but also don't just crash.
+            try:
+                locations = sorted(message.locations)
+            except TypeError:  # e.g. "TypeError: unorderable types: NoneType() < int()"
+                locations = message.locations
+
+            for filename, lineno in locations:
                 if lineno and include_lineno:
                     locs.append(u'%s:%d' % (filename.replace(os.sep, '/'), lineno))
                 else:

From 665c2ac12b95267383e726722d861e54f2d04fee Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 13:01:55 +0300
Subject: [PATCH 431/489] test_frontend: DRY out path generation

---
 tests/messages/test_frontend.py | 145 +++++++++++++-------------------
 1 file changed, 60 insertions(+), 85 deletions(-)

diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 3e3cc8bd5..fa0112c2e 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -33,16 +33,22 @@
 from babel.messages.pofile import read_po, write_po
 from babel._compat import StringIO
 
-
 this_dir = os.path.abspath(os.path.dirname(__file__))
+data_dir = os.path.join(this_dir, 'data')
+project_dir = os.path.join(data_dir, 'project')
+i18n_dir = os.path.join(project_dir, 'i18n')
+pot_file = os.path.join(i18n_dir, 'temp.pot')
+
+
+def _po_file(locale):
+    return os.path.join(i18n_dir, locale, 'LC_MESSAGES', 'messages.po')
 
 
 class CompileCatalogTestCase(unittest.TestCase):
 
     def setUp(self):
         self.olddir = os.getcwd()
-        self.datadir = os.path.join(this_dir, 'data')
-        os.chdir(self.datadir)
+        os.chdir(data_dir)
         _global_log.threshold = 5  # shut up distutils logging
 
         self.dist = Distribution(dict(
@@ -71,8 +77,7 @@ class ExtractMessagesTestCase(unittest.TestCase):
 
     def setUp(self):
         self.olddir = os.getcwd()
-        self.datadir = os.path.join(this_dir, 'data')
-        os.chdir(self.datadir)
+        os.chdir(data_dir)
         _global_log.threshold = 5  # shut up distutils logging
 
         self.dist = Distribution(dict(
@@ -84,20 +89,13 @@ def setUp(self):
         self.cmd.initialize_options()
 
     def tearDown(self):
-        pot_file = self._pot_file()
         if os.path.isfile(pot_file):
             os.unlink(pot_file)
 
         os.chdir(self.olddir)
 
-    def _i18n_dir(self):
-        return os.path.join(self.datadir, 'project', 'i18n')
-
-    def _pot_file(self):
-        return os.path.join(self._i18n_dir(), 'temp.pot')
-
     def assert_pot_file_exists(self):
-        assert os.path.isfile(self._pot_file())
+        assert os.path.isfile(pot_file)
 
     def test_neither_default_nor_custom_keywords(self):
         self.cmd.output_file = 'dummy'
@@ -119,27 +117,27 @@ def test_invalid_file_or_dir_input_path(self):
         self.assertRaises(DistutilsOptionError, self.cmd.finalize_options)
 
     def test_input_paths_is_treated_as_list(self):
-        self.cmd.input_paths = self.datadir
-        self.cmd.output_file = self._pot_file()
+        self.cmd.input_paths = data_dir
+        self.cmd.output_file = pot_file
         self.cmd.finalize_options()
         self.cmd.run()
 
-        with open(self._pot_file(), po_file_read_mode) as f:
+        with open(pot_file, po_file_read_mode) as f:
             catalog = read_po(f)
         msg = catalog.get('bar')
         self.assertEqual(1, len(msg.locations))
         self.assertTrue('file1.py' in msg.locations[0][0])
 
     def test_input_paths_handle_spaces_after_comma(self):
-        self.cmd.input_paths = '%s,  %s' % (this_dir, self.datadir)
-        self.cmd.output_file = self._pot_file()
+        self.cmd.input_paths = '%s,  %s' % (this_dir, data_dir)
+        self.cmd.output_file = pot_file
         self.cmd.finalize_options()
 
-        self.assertEqual([this_dir, self.datadir], self.cmd.input_paths)
+        self.assertEqual([this_dir, data_dir], self.cmd.input_paths)
 
     def test_input_dirs_is_alias_for_input_paths(self):
         self.cmd.input_dirs = this_dir
-        self.cmd.output_file = self._pot_file()
+        self.cmd.output_file = pot_file
         self.cmd.finalize_options()
         # Gets listified in `finalize_options`:
         assert self.cmd.input_paths == [self.cmd.input_dirs]
@@ -147,7 +145,7 @@ def test_input_dirs_is_alias_for_input_paths(self):
     def test_input_dirs_is_mutually_exclusive_with_input_paths(self):
         self.cmd.input_dirs = this_dir
         self.cmd.input_paths = this_dir
-        self.cmd.output_file = self._pot_file()
+        self.cmd.output_file = pot_file
         self.assertRaises(DistutilsOptionError, self.cmd.finalize_options)
 
     @freeze_time("1994-11-11")
@@ -204,7 +202,7 @@ def test_extraction_with_default_mapping(self):
             'year': time.strftime('%Y'),
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(self._pot_file(), po_file_read_mode) as f:
+        with open(pot_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -257,7 +255,7 @@ def test_extraction_with_mapping_file(self):
             'year': time.strftime('%Y'),
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(self._pot_file(), po_file_read_mode) as f:
+        with open(pot_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -315,7 +313,7 @@ def test_extraction_with_mapping_dict(self):
             'year': time.strftime('%Y'),
             'date': format_datetime(datetime(1994, 11, 11, 00, 00), 'yyyy-MM-dd HH:mmZ',
                                     tzinfo=LOCALTZ, locale='en')}
-        with open(self._pot_file(), po_file_read_mode) as f:
+        with open(pot_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -346,7 +344,7 @@ def test_extraction_add_location_file(self):
 msgstr[1] ""
 
 """
-        with open(self._pot_file(), po_file_read_mode) as f:
+        with open(pot_file, po_file_read_mode) as f:
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
@@ -355,8 +353,7 @@ class InitCatalogTestCase(unittest.TestCase):
 
     def setUp(self):
         self.olddir = os.getcwd()
-        self.datadir = os.path.join(this_dir, 'data')
-        os.chdir(self.datadir)
+        os.chdir(data_dir)
         _global_log.threshold = 5  # shut up distutils logging
 
         self.dist = Distribution(dict(
@@ -369,19 +366,12 @@ def setUp(self):
 
     def tearDown(self):
         for dirname in ['en_US', 'ja_JP', 'lv_LV']:
-            locale_dir = os.path.join(self._i18n_dir(), dirname)
+            locale_dir = os.path.join(i18n_dir, dirname)
             if os.path.isdir(locale_dir):
                 shutil.rmtree(locale_dir)
 
         os.chdir(self.olddir)
 
-    def _i18n_dir(self):
-        return os.path.join(self.datadir, 'project', 'i18n')
-
-    def _po_file(self, locale):
-        return os.path.join(self._i18n_dir(), locale, 'LC_MESSAGES',
-                            'messages.po')
-
     def test_no_input_file(self):
         self.cmd.locale = 'en_US'
         self.cmd.output_file = 'dummy'
@@ -401,7 +391,7 @@ def test_with_output_dir(self):
         self.cmd.finalize_options()
         self.cmd.run()
 
-        po_file = self._po_file('en_US')
+        po_file = _po_file('en_US')
         assert os.path.isfile(po_file)
 
         expected_content = r"""# English (United States) translations for TestProject.
@@ -453,7 +443,7 @@ def test_keeps_catalog_non_fuzzy(self):
         self.cmd.finalize_options()
         self.cmd.run()
 
-        po_file = self._po_file('en_US')
+        po_file = _po_file('en_US')
         assert os.path.isfile(po_file)
 
         expected_content = r"""# English (United States) translations for TestProject.
@@ -505,7 +495,7 @@ def test_correct_init_more_than_2_plurals(self):
         self.cmd.finalize_options()
         self.cmd.run()
 
-        po_file = self._po_file('lv_LV')
+        po_file = _po_file('lv_LV')
         assert os.path.isfile(po_file)
 
         expected_content = r"""# Latvian (Latvia) translations for TestProject.
@@ -559,7 +549,7 @@ def test_correct_init_singular_plural_forms(self):
         self.cmd.finalize_options()
         self.cmd.run()
 
-        po_file = self._po_file('ja_JP')
+        po_file = _po_file('ja_JP')
         assert os.path.isfile(po_file)
 
         expected_content = r"""# Japanese (Japan) translations for TestProject.
@@ -619,7 +609,7 @@ def test_supports_no_wrap(self):
         self.cmd.finalize_options()
         self.cmd.run()
 
-        po_file = self._po_file('en_US')
+        po_file = _po_file('en_US')
         assert os.path.isfile(po_file)
         expected_content = r"""# English (United States) translations for TestProject.
 # Copyright (C) 2007 FooBar, Inc.
@@ -679,7 +669,7 @@ def test_supports_width(self):
         self.cmd.finalize_options()
         self.cmd.run()
 
-        po_file = self._po_file('en_US')
+        po_file = _po_file('en_US')
         assert os.path.isfile(po_file)
         expected_content = r"""# English (United States) translations for TestProject.
 # Copyright (C) 2007 FooBar, Inc.
@@ -726,7 +716,7 @@ def test_supports_width(self):
 class CommandLineInterfaceTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.datadir = os.path.join(this_dir, 'data')
+        data_dir = os.path.join(this_dir, 'data')
         self.orig_working_dir = os.getcwd()
         self.orig_argv = sys.argv
         self.orig_stdout = sys.stdout
@@ -734,7 +724,7 @@ def setUp(self):
         sys.argv = ['pybabel']
         sys.stdout = StringIO()
         sys.stderr = StringIO()
-        os.chdir(self.datadir)
+        os.chdir(data_dir)
 
         self._remove_log_handlers()
         self.cli = frontend.CommandLineInterface()
@@ -745,7 +735,7 @@ def tearDown(self):
         sys.stdout = self.orig_stdout
         sys.stderr = self.orig_stderr
         for dirname in ['lv_LV', 'ja_JP']:
-            locale_dir = os.path.join(self._i18n_dir(), dirname)
+            locale_dir = os.path.join(i18n_dir, dirname)
             if os.path.isdir(locale_dir):
                 shutil.rmtree(locale_dir)
         self._remove_log_handlers()
@@ -772,8 +762,8 @@ def test_usage(self):
 """, sys.stderr.getvalue().lower())
 
     def _run_init_catalog(self):
-        i18n_dir = os.path.join(self.datadir, 'project', 'i18n')
-        pot_path = os.path.join(self.datadir, 'project', 'i18n', 'messages.pot')
+        i18n_dir = os.path.join(data_dir, 'project', 'i18n')
+        pot_path = os.path.join(data_dir, 'project', 'i18n', 'messages.pot')
         init_argv = sys.argv + ['init', '--locale', 'en_US', '-d', i18n_dir,
                                 '-i', pot_path]
         self.cli.run(init_argv)
@@ -821,15 +811,11 @@ def test_help(self):
   update   update existing message catalogs from a pot file
 """, sys.stdout.getvalue().lower())
 
-    def _pot_file(self):
-        return os.path.join(self._i18n_dir(), 'temp.pot')
-
     def assert_pot_file_exists(self):
-        assert os.path.isfile(self._pot_file())
+        assert os.path.isfile(pot_file)
 
     @freeze_time("1994-11-11")
     def test_extract_with_default_mapping(self):
-        pot_file = self._pot_file()
         self.cli.run(sys.argv + ['extract',
                                  '--copyright-holder', 'FooBar, Inc.',
                                  '--project', 'TestProject', '--version', '0.1',
@@ -885,12 +871,11 @@ def test_extract_with_default_mapping(self):
 
     @freeze_time("1994-11-11")
     def test_extract_with_mapping_file(self):
-        pot_file = self._pot_file()
         self.cli.run(sys.argv + ['extract',
                                  '--copyright-holder', 'FooBar, Inc.',
                                  '--project', 'TestProject', '--version', '0.1',
                                  '--msgid-bugs-address', 'bugs.address@email.tld',
-                                 '--mapping', os.path.join(self.datadir, 'mapping.cfg'),
+                                 '--mapping', os.path.join(data_dir, 'mapping.cfg'),
                                  '-c', 'TRANSLATOR', '-c', 'TRANSLATORS:',
                                  '-o', pot_file, 'project'])
         self.assert_pot_file_exists()
@@ -939,13 +924,12 @@ def test_extract_with_exact_file(self):
         """Tests that we can call extract with a particular file and only
         strings from that file get extracted. (Note the absence of strings from file1.py)
         """
-        pot_file = self._pot_file()
-        file_to_extract = os.path.join(self.datadir, 'project', 'file2.py')
+        file_to_extract = os.path.join(data_dir, 'project', 'file2.py')
         self.cli.run(sys.argv + ['extract',
                                  '--copyright-holder', 'FooBar, Inc.',
                                  '--project', 'TestProject', '--version', '0.1',
                                  '--msgid-bugs-address', 'bugs.address@email.tld',
-                                 '--mapping', os.path.join(self.datadir, 'mapping.cfg'),
+                                 '--mapping', os.path.join(data_dir, 'mapping.cfg'),
                                  '-c', 'TRANSLATOR', '-c', 'TRANSLATORS:',
                                  '-o', pot_file, file_to_extract])
         self.assert_pot_file_exists()
@@ -985,11 +969,11 @@ def test_extract_with_exact_file(self):
 
     @freeze_time("1994-11-11")
     def test_init_with_output_dir(self):
-        po_file = self._po_file('en_US')
+        po_file = _po_file('en_US')
         self.cli.run(sys.argv + ['init',
                                  '--locale', 'en_US',
-                                 '-d', os.path.join(self._i18n_dir()),
-                                 '-i', os.path.join(self._i18n_dir(), 'messages.pot')])
+                                 '-d', os.path.join(i18n_dir),
+                                 '-i', os.path.join(i18n_dir, 'messages.pot')])
         assert os.path.isfile(po_file)
         expected_content = r"""# English (United States) translations for TestProject.
 # Copyright (C) 2007 FooBar, Inc.
@@ -1031,16 +1015,13 @@ def test_init_with_output_dir(self):
             actual_content = f.read()
         self.assertEqual(expected_content, actual_content)
 
-    def _i18n_dir(self):
-        return os.path.join(self.datadir, 'project', 'i18n')
-
     @freeze_time("1994-11-11")
     def test_init_singular_plural_forms(self):
-        po_file = self._po_file('ja_JP')
+        po_file = _po_file('ja_JP')
         self.cli.run(sys.argv + ['init',
                                  '--locale', 'ja_JP',
-                                 '-d', os.path.join(self._i18n_dir()),
-                                 '-i', os.path.join(self._i18n_dir(), 'messages.pot')])
+                                 '-d', os.path.join(i18n_dir),
+                                 '-i', os.path.join(i18n_dir, 'messages.pot')])
         assert os.path.isfile(po_file)
         expected_content = r"""# Japanese (Japan) translations for TestProject.
 # Copyright (C) 2007 FooBar, Inc.
@@ -1083,11 +1064,11 @@ def test_init_singular_plural_forms(self):
 
     @freeze_time("1994-11-11")
     def test_init_more_than_2_plural_forms(self):
-        po_file = self._po_file('lv_LV')
+        po_file = _po_file('lv_LV')
         self.cli.run(sys.argv + ['init',
                                  '--locale', 'lv_LV',
-                                 '-d', self._i18n_dir(),
-                                 '-i', os.path.join(self._i18n_dir(), 'messages.pot')])
+                                 '-d', i18n_dir,
+                                 '-i', os.path.join(i18n_dir, 'messages.pot')])
         assert os.path.isfile(po_file)
         expected_content = r"""# Latvian (Latvia) translations for TestProject.
 # Copyright (C) 2007 FooBar, Inc.
@@ -1132,23 +1113,23 @@ def test_init_more_than_2_plural_forms(self):
         self.assertEqual(expected_content, actual_content)
 
     def test_compile_catalog(self):
-        po_file = self._po_file('de_DE')
+        po_file = _po_file('de_DE')
         mo_file = po_file.replace('.po', '.mo')
         self.cli.run(sys.argv + ['compile',
                                  '--locale', 'de_DE',
-                                 '-d', self._i18n_dir()])
+                                 '-d', i18n_dir])
         assert not os.path.isfile(mo_file), 'Expected no file at %r' % mo_file
         self.assertEqual("""\
 catalog %s is marked as fuzzy, skipping
 """ % po_file, sys.stderr.getvalue())
 
     def test_compile_fuzzy_catalog(self):
-        po_file = self._po_file('de_DE')
+        po_file = _po_file('de_DE')
         mo_file = po_file.replace('.po', '.mo')
         try:
             self.cli.run(sys.argv + ['compile',
                                      '--locale', 'de_DE', '--use-fuzzy',
-                                     '-d', self._i18n_dir()])
+                                     '-d', i18n_dir])
             assert os.path.isfile(mo_file)
             self.assertEqual("""\
 compiling catalog %s to %s
@@ -1157,17 +1138,13 @@ def test_compile_fuzzy_catalog(self):
             if os.path.isfile(mo_file):
                 os.unlink(mo_file)
 
-    def _po_file(self, locale):
-        return os.path.join(self._i18n_dir(), locale, 'LC_MESSAGES',
-                            'messages.po')
-
     def test_compile_catalog_with_more_than_2_plural_forms(self):
-        po_file = self._po_file('ru_RU')
+        po_file = _po_file('ru_RU')
         mo_file = po_file.replace('.po', '.mo')
         try:
             self.cli.run(sys.argv + ['compile',
                                      '--locale', 'ru_RU', '--use-fuzzy',
-                                     '-d', self._i18n_dir()])
+                                     '-d', i18n_dir])
             assert os.path.isfile(mo_file)
             self.assertEqual("""\
 compiling catalog %s to %s
@@ -1177,16 +1154,14 @@ def test_compile_catalog_with_more_than_2_plural_forms(self):
                 os.unlink(mo_file)
 
     def test_compile_catalog_multidomain(self):
-        po_foo = os.path.join(self._i18n_dir(), 'de_DE', 'LC_MESSAGES',
-                              'foo.po')
-        po_bar = os.path.join(self._i18n_dir(), 'de_DE', 'LC_MESSAGES',
-                              'bar.po')
+        po_foo = os.path.join(i18n_dir, 'de_DE', 'LC_MESSAGES', 'foo.po')
+        po_bar = os.path.join(i18n_dir, 'de_DE', 'LC_MESSAGES', 'bar.po')
         mo_foo = po_foo.replace('.po', '.mo')
         mo_bar = po_bar.replace('.po', '.mo')
         try:
             self.cli.run(sys.argv + ['compile',
                                      '--locale', 'de_DE', '--domain', 'foo bar', '--use-fuzzy',
-                                     '-d', self._i18n_dir()])
+                                     '-d', i18n_dir])
             for mo_file in [mo_foo, mo_bar]:
                 assert os.path.isfile(mo_file)
             self.assertEqual("""\
@@ -1204,10 +1179,10 @@ def test_update(self):
         template.add("1")
         template.add("2")
         template.add("3")
-        tmpl_file = os.path.join(self._i18n_dir(), 'temp-template.pot')
+        tmpl_file = os.path.join(i18n_dir, 'temp-template.pot')
         with open(tmpl_file, "wb") as outfp:
             write_po(outfp, template)
-        po_file = os.path.join(self._i18n_dir(), 'temp1.po')
+        po_file = os.path.join(i18n_dir, 'temp1.po')
         self.cli.run(sys.argv + ['init',
                                  '-l', 'fi',
                                  '-o', po_file,

From ceb074a8f94e4a0d33bdab3ba54803488c0ce682 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 12:30:01 +0300
Subject: [PATCH 432/489] pybabel compile: exit with code 1 if errors were
 encountered

Fixes #627
---
 .gitignore                                         |  3 ++-
 babel/messages/frontend.py                         | 14 ++++++++++++--
 .../project/i18n/fi_BUGGY/LC_MESSAGES/messages.po  |  5 +++++
 tests/messages/test_frontend.py                    |  9 +++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 tests/messages/data/project/i18n/fi_BUGGY/LC_MESSAGES/messages.po

diff --git a/.gitignore b/.gitignore
index 50e5838f6..2886dec52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@ docs/_build
 test-env
 tests/messages/data/project/i18n/en_US
 tests/messages/data/project/i18n/long_messages.pot
-tests/messages/data/project/i18n/temp*
\ No newline at end of file
+tests/messages/data/project/i18n/temp*
+tests/messages/data/project/i18n/fi_BUGGY/LC_MESSAGES/*.mo
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index f673f900c..9e7c68ca1 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -182,8 +182,13 @@ def finalize_options(self):
                                        'or the base directory')
 
     def run(self):
+        n_errors = 0
         for domain in self.domain:
-            self._run_domain(domain)
+            for catalog, errors in self._run_domain(domain).items():
+                n_errors += len(errors)
+        if n_errors:
+            self.log.error('%d errors encountered.' % n_errors)
+        return (1 if n_errors else 0)
 
     def _run_domain(self, domain):
         po_files = []
@@ -219,6 +224,8 @@ def _run_domain(self, domain):
         if not po_files:
             raise DistutilsOptionError('no message catalogs found')
 
+        catalogs_and_errors = {}
+
         for idx, (locale, po_file) in enumerate(po_files):
             mo_file = mo_files[idx]
             with open(po_file, 'rb') as infile:
@@ -241,7 +248,8 @@ def _run_domain(self, domain):
                 self.log.info('catalog %s is marked as fuzzy, skipping', po_file)
                 continue
 
-            for message, errors in catalog.check():
+            catalogs_and_errors[catalog] = catalog_errors = list(catalog.check())
+            for message, errors in catalog_errors:
                 for error in errors:
                     self.log.error(
                         'error: %s:%d: %s', po_file, message.lineno, error
@@ -252,6 +260,8 @@ def _run_domain(self, domain):
             with open(mo_file, 'wb') as outfile:
                 write_mo(outfile, catalog, use_fuzzy=self.use_fuzzy)
 
+        return catalogs_and_errors
+
 
 class extract_messages(Command):
     """Message extraction command for use in ``setup.py`` scripts.
diff --git a/tests/messages/data/project/i18n/fi_BUGGY/LC_MESSAGES/messages.po b/tests/messages/data/project/i18n/fi_BUGGY/LC_MESSAGES/messages.po
new file mode 100644
index 000000000..0a0745b42
--- /dev/null
+++ b/tests/messages/data/project/i18n/fi_BUGGY/LC_MESSAGES/messages.po
@@ -0,0 +1,5 @@
+msgid ""
+msgstr ""
+
+msgid "bar %(sign)s"
+msgstr "tanko %(merkki)s"
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index fa0112c2e..deaa66025 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1383,3 +1383,12 @@ def test_extract_add_location():
     assert isinstance(cmdinst, extract_messages)
     assert cmdinst.add_location == 'never'
     assert cmdinst.no_location
+
+
+def test_extract_error_code(monkeypatch, capsys):
+    monkeypatch.chdir(project_dir)
+    cmdinst = configure_cli_command("compile --domain=messages --directory i18n --locale fi_BUGGY")
+    assert cmdinst.run() == 1
+    out, err = capsys.readouterr()
+    # replace hack below for py2/py3 compatibility
+    assert "unknown named placeholder 'merkki'" in err.replace("u'", "'")

From 03215bc33ba4c8ecf7f9966344aae51cc7c420e1 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 13:50:52 +0300
Subject: [PATCH 433/489] Catalog update: keep user comments from destination
 by default

Closes #418
---
 babel/messages/catalog.py      |  6 +++++-
 tests/messages/test_catalog.py | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 649d0e2fe..136ef3623 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -700,7 +700,7 @@ def delete(self, id, context=None):
         if key in self._messages:
             del self._messages[key]
 
-    def update(self, template, no_fuzzy_matching=False, update_header_comment=False):
+    def update(self, template, no_fuzzy_matching=False, update_header_comment=False, keep_user_comments=True):
         """Update the catalog based on the given template catalog.
 
         >>> from babel.messages import Catalog
@@ -780,6 +780,10 @@ def _merge(message, oldkey, newkey):
             else:
                 oldmsg = remaining.pop(oldkey, None)
             message.string = oldmsg.string
+
+            if keep_user_comments:
+                message.user_comments = list(distinct(oldmsg.user_comments))
+
             if isinstance(message.id, (list, tuple)):
                 if not isinstance(message.string, (list, tuple)):
                     fuzzy = True
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index 1b23832a6..f583810c9 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -15,8 +15,9 @@
 import datetime
 import unittest
 
+from babel._compat import StringIO
 from babel.dates import format_datetime, UTC
-from babel.messages import catalog
+from babel.messages import catalog, pofile
 from babel.util import FixedOffsetTimezone
 
 
@@ -475,3 +476,31 @@ def test_datetime_parsing():
     assert val2.month == 6
     assert val2.day == 28
     assert val2.tzinfo is None
+
+
+def test_update_catalog_comments():
+    # Based on https://web.archive.org/web/20100710131029/http://babel.edgewall.org/attachment/ticket/163/cat-update-comments.py
+
+    catalog = pofile.read_po(StringIO('''
+    # A user comment
+    #. An auto comment
+    #: main.py:1
+    #, fuzzy, python-format
+    msgid "foo %(name)s"
+    msgstr "foo %(name)s"
+    '''))
+
+    assert all(message.user_comments and message.auto_comments for message in catalog if message.id)
+
+    # NOTE: in the POT file, there are no comments
+    template = pofile.read_po(StringIO('''
+    #: main.py:1
+    #, fuzzy, python-format
+    msgid "bar %(name)s"
+    msgstr ""
+    '''))
+
+    catalog.update(template)
+
+    # Auto comments will be obliterated here
+    assert all(message.user_comments for message in catalog if message.id)

From d7f2e84dedcce223d73229c79f0f1085d4dc84be Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 14:31:09 +0300
Subject: [PATCH 434/489] py.test: document all_locales marker

---
 setup.cfg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.cfg b/setup.cfg
index 4e877a36f..12585f0d7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,6 +4,8 @@ release = sdist bdist_wheel
 [tool:pytest]
 norecursedirs = venv* .* _* scripts {args}
 doctest_optionflags = ELLIPSIS NORMALIZE_WHITESPACE ALLOW_UNICODE IGNORE_EXCEPTION_DETAIL
+markers =
+    all_locales: parameterize test with all locales
 
 [bdist_wheel]
 universal = 1

From 4b6cd34c5c4436c60747a30d15a915cb2702ca0b Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 14:32:48 +0300
Subject: [PATCH 435/489] parse_decimal(): assume spaces are equivalent to
 non-breaking spaces when not in strict mode

Fixes #637
---
 babel/numbers.py      | 11 +++++++++++
 tests/test_numbers.py | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/babel/numbers.py b/babel/numbers.py
index e5650dd52..3dcd73099 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -673,6 +673,8 @@ def parse_decimal(string, locale=LC_NUMERIC, strict=False):
     Decimal('1099.98')
     >>> parse_decimal('1.099,98', locale='de')
     Decimal('1099.98')
+    >>> parse_decimal('12 345,123', locale='ru')
+    Decimal('12345.123')
 
     When the given string cannot be parsed, an exception is raised:
 
@@ -704,6 +706,15 @@ def parse_decimal(string, locale=LC_NUMERIC, strict=False):
     locale = Locale.parse(locale)
     group_symbol = get_group_symbol(locale)
     decimal_symbol = get_decimal_symbol(locale)
+
+    if not strict and (
+        group_symbol == u'\xa0' and  # if the grouping symbol is U+00A0 NO-BREAK SPACE,
+        group_symbol not in string and  # and the string to be parsed does not contain it,
+        ' ' in string  # but it does contain a space instead,
+    ):
+        # ... it's reasonable to assume it is taking the place of the grouping symbol.
+        string = string.replace(' ', group_symbol)
+
     try:
         parsed = decimal.Decimal(string.replace(group_symbol, '')
                                        .replace(decimal_symbol, '.'))
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 99aa96b7e..27649f841 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -679,3 +679,14 @@ def test_numberpattern_repr():
 def test_parse_static_pattern():
     assert numbers.parse_pattern('Kun')  # in the So locale in CLDR 30
     # TODO: static patterns might not be correctly `apply()`ed at present
+
+
+def test_parse_decimal_nbsp_heuristics():
+    # Re https://github.com/python-babel/babel/issues/637 –
+    #    for locales (of which there are many) that use U+00A0 as the group
+    #    separator in numbers, it's reasonable to assume that input strings
+    #    with plain spaces actually should have U+00A0s instead.
+    #    This heuristic is only applied when strict=False.
+    n = decimal.Decimal("12345.123")
+    assert numbers.parse_decimal("12 345.123", locale="fi") == n
+    assert numbers.parse_decimal(numbers.format_decimal(n, locale="fi"), locale="fi") == n

From b294828b4124548d2c156dfb51ea891af262b10a Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 15:00:21 +0300
Subject: [PATCH 436/489] Update AUTHORS with generate_authors.py

---
 AUTHORS | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 69e110ecc..6374cd650 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,7 @@ Babel is written and maintained by the Babel team and various contributors:
 - Michael Birtwell
 - Jonas Borgström
 - Kevin Deldycke
+- Jon Dufresne
 - Ville Skyttä
 - Hugo
 - Heungsub Lee
@@ -24,10 +25,13 @@ Babel is written and maintained by the Babel team and various contributors:
 - Sachin Paliwal
 - Alex Willmer
 - Daniel Neuhäuser
+- Cédric Krier
+- Luke Plant
 - Jennifer Wang
 - Lukas Balaga
 - sudheesh001
-- Jon Dufresne
+- Miro Hrončok
+- Changaco
 - Xavier Fernandez
 - KO. Mattsson
 - Sébastien Diemer
@@ -41,6 +45,16 @@ Babel is written and maintained by the Babel team and various contributors:
 - Leonardo Pistone
 - Jun Omae
 - Hyunjun Kim
+- BT-sschmid
+- Alberto Mardegan
+- mondeja
+- NotAFile
+- Julien Palard
+- Brian Cappello
+- Serban Constantin
+- Bryn Truscott
+- Chris
+- Charly C
 - PTrottier
 - xmo-odoo
 - StevenJ

From 8fcffaf9abffff2c57e414e8bc2db4481261cc6f Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 15:20:09 +0300
Subject: [PATCH 437/489] Distill changelog from git log

---
 CHANGES | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 622b4c573..3462117fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,8 @@
 Babel Changelog
 ===============
 
-UNRELEASED
-----------
+Version 2.7.0
+-------------
 
 Possibly incompatible changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -14,6 +14,46 @@ strange and we'll try to help!
 * General: Internal uses of ``babel.util.odict`` have been replaced with
   ``collections.OrderedDict`` from The Python standard library.
 
+Improvements
+~~~~~~~~~~~~
+
+* CLDR: Upgrade to CLDR 35.1 - Alberto Mardegan, Aarni Koskela (#626, #643)
+* General: allow anchoring path patterns to the start of a string - Brian Cappello (#600)
+* General: Bumped version requirement on pytz - @chrisbrake (#592)
+* Messages: `pybabel compile`: exit with code 1 if errors were encountered - Aarni Koskela (#647)
+* Messages: Add omit-header to update_catalog - Cédric Krier (#633)
+* Messages: Catalog update: keep user comments from destination by default - Aarni Koskela (#648)
+* Messages: Skip empty message when writing mo file - Cédric Krier (#564)
+* Messages: Small fixes to avoid crashes on badly formatted .po files - Bryn Truscott (#597)
+* Numbers: `parse_decimal()` `strict` argument and `suggestions` - Charly C (#590)
+* Numbers: don't repeat suggestions in parse_decimal strict - Serban Constantin (#599)
+* Numbers: implement currency formatting with long display names - Luke Plant (#585)
+* Numbers: parse_decimal(): assume spaces are equivalent to non-breaking spaces when not in strict mode - Aarni Koskela (#649)
+* Performance: Cache locale_identifiers() - Aarni Koskela (#644)
+
+Bugfixes
+~~~~~~~~
+
+* CLDR: Skip alt=... for week data (minDays, firstDay, weekendStart, weekendEnd) - Aarni Koskela (#634)
+* Dates: Fix wrong weeknumber for 31.12.2018 - BT-sschmid (#621)
+* Locale: Avoid KeyError trying to get data on WindowsXP - mondeja (#604)
+* Locale: get_display_name(): Don't attempt to concatenate variant information to None - Aarni Koskela (#645)
+* Messages: pofile: Add comparison operators to _NormalizedString - Aarni Koskela (#646)
+* Messages: pofile: don't crash when message.locations can't be sorted - Aarni Koskela (#646)
+
+Tooling & docs
+~~~~~~~~~~~~~~
+
+* Docs: Remove all references to deprecated easy_install - Jon Dufresne (#610)
+* Docs: Switch print statement in docs to print function - NotAFile
+* Docs: Update all pypi.python.org URLs to pypi.org - Jon Dufresne (#587)
+* Docs: Use https URLs throughout project where available - Jon Dufresne (#588)
+* Support: Add testing and document support for Python 3.7 - Jon Dufresne (#611)
+* Support: Test on Python 3.8-dev - Aarni Koskela (#642)
+* Support: Using ABCs from collections instead of collections.abc is deprecated. - Julien Palard (#609)
+* Tests: Fix conftest.py compatibility with pytest 4.3 - Miro Hrončok (#635)
+* Tests: Update pytest and pytest-cov - Miro Hrončok (#635)
+
 Version 2.6.0
 -------------
 

From 469cce913c0a7d7f028a3701450dc0d27cc18323 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 15:23:28 +0300
Subject: [PATCH 438/489] Bump version

---
 babel/__init__.py | 2 +-
 docs/conf.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index de44ce6c1..e58942a96 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.6.0'
+__version__ = '2.7.0'
diff --git a/docs/conf.py b/docs/conf.py
index 63c2d7749..183cc725c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.6'
+version = '2.7'
 # The full version, including alpha/beta/rc tags.
-release = '2.6.0'
+release = '2.7.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 6aa30320c2d4173e4475b0dd328e17a1a09767cd Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 27 May 2019 15:24:52 +0300
Subject: [PATCH 439/489] Bump copyright year from 2018 to 2019

---
 LICENSE                         |  2 +-
 babel/__init__.py               |  2 +-
 babel/core.py                   |  2 +-
 babel/dates.py                  | 10 +++++-----
 babel/lists.py                  |  2 +-
 babel/localedata.py             |  2 +-
 babel/localtime/__init__.py     |  2 +-
 babel/messages/__init__.py      |  2 +-
 babel/messages/catalog.py       |  2 +-
 babel/messages/checkers.py      |  2 +-
 babel/messages/extract.py       |  2 +-
 babel/messages/frontend.py      |  2 +-
 babel/messages/jslexer.py       |  2 +-
 babel/messages/mofile.py        |  2 +-
 babel/messages/plurals.py       |  2 +-
 babel/messages/pofile.py        |  2 +-
 babel/numbers.py                |  2 +-
 babel/plural.py                 |  2 +-
 babel/support.py                |  2 +-
 babel/util.py                   |  2 +-
 docs/conf.py                    |  2 +-
 scripts/dump_data.py            |  2 +-
 scripts/dump_global.py          |  2 +-
 scripts/import_cldr.py          |  2 +-
 tests/messages/test_catalog.py  |  2 +-
 tests/messages/test_checkers.py |  2 +-
 tests/messages/test_extract.py  |  2 +-
 tests/messages/test_frontend.py |  2 +-
 tests/messages/test_mofile.py   |  2 +-
 tests/messages/test_plurals.py  |  2 +-
 tests/messages/test_pofile.py   |  2 +-
 tests/test_core.py              |  2 +-
 tests/test_dates.py             |  4 ++--
 tests/test_localedata.py        |  2 +-
 tests/test_numbers.py           |  2 +-
 tests/test_plural.py            |  2 +-
 tests/test_support.py           |  2 +-
 tests/test_util.py              |  2 +-
 38 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/LICENSE b/LICENSE
index b517a5294..10722cc18 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2018 by the Babel Team, see AUTHORS for more information.
+Copyright (c) 2013-2019 by the Babel Team, see AUTHORS for more information.
 
 All rights reserved.
 
diff --git a/babel/__init__.py b/babel/__init__.py
index e58942a96..1132e6f37 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -13,7 +13,7 @@
        access to various locale display names, localized number and date
        formatting, etc.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/core.py b/babel/core.py
index 211849bce..a80807a61 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -5,7 +5,7 @@
 
     Core locale representation and locale data access.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/dates.py b/babel/dates.py
index ec86991a0..f1bd66faf 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -12,7 +12,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
@@ -1506,12 +1506,12 @@ def get_week_number(self, day_of_period, day_of_week=None):
 
         if 7 - first_day >= self.locale.min_week_days:
             week_number += 1
-        
+
         if self.locale.first_week_day == 0:
-            # Correct the weeknumber in case of iso-calendar usage (first_week_day=0). 
+            # Correct the weeknumber in case of iso-calendar usage (first_week_day=0).
             # If the weeknumber exceeds the maximum number of weeks for the given year
-            # we must count from zero.For example the above calculation gives week 53 
-            # for 2018-12-31. By iso-calender definition 2018 has a max of 52 
+            # we must count from zero.For example the above calculation gives week 53
+            # for 2018-12-31. By iso-calender definition 2018 has a max of 52
             # weeks, thus the weeknumber must be 53-52=1.
             max_weeks = date(year=self.value.year, day=28, month=12).isocalendar()[1]
             if week_number > max_weeks:
diff --git a/babel/lists.py b/babel/lists.py
index 329437975..ab5a24c40 100644
--- a/babel/lists.py
+++ b/babel/lists.py
@@ -11,7 +11,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2015, 2018 by the Babel Team.
+    :copyright: (c) 2015-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/localedata.py b/babel/localedata.py
index 03381e2df..e012abbf2 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -8,7 +8,7 @@
     :note: The `Locale` class, which uses this module under the hood, provides a
            more convenient interface for accessing the locale data.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/localtime/__init__.py b/babel/localtime/__init__.py
index bb4341d60..aefd8a3e7 100644
--- a/babel/localtime/__init__.py
+++ b/babel/localtime/__init__.py
@@ -6,7 +6,7 @@
     Babel specific fork of tzlocal to determine the local timezone
     of the system.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/__init__.py b/babel/messages/__init__.py
index 7dd6f8b6d..5b69675f3 100644
--- a/babel/messages/__init__.py
+++ b/babel/messages/__init__.py
@@ -5,7 +5,7 @@
 
     Support for ``gettext`` message catalogs.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 136ef3623..2fcb461a8 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -5,7 +5,7 @@
 
     Data structures for message catalogs.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py
index d04ad70ec..8c1effaf5 100644
--- a/babel/messages/checkers.py
+++ b/babel/messages/checkers.py
@@ -7,7 +7,7 @@
 
     :since: version 0.9
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 009bea2b4..db429b2ea 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -13,7 +13,7 @@
     The main entry points into the extraction functionality are the functions
     `extract_from_dir` and `extract_from_file`.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 9e7c68ca1..475605549 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -5,7 +5,7 @@
 
     Frontends for the message extraction functionality.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 from __future__ import print_function
diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index 04d02761d..ace0b47e0 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -6,7 +6,7 @@
     A simple JavaScript 1.5 lexer which is used for the JavaScript
     extractor.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 from collections import namedtuple
diff --git a/babel/messages/mofile.py b/babel/messages/mofile.py
index 663d93bac..dfd923d23 100644
--- a/babel/messages/mofile.py
+++ b/babel/messages/mofile.py
@@ -5,7 +5,7 @@
 
     Writing of files in the ``gettext`` MO (machine object) format.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
index 067ac9826..81234580d 100644
--- a/babel/messages/plurals.py
+++ b/babel/messages/plurals.py
@@ -5,7 +5,7 @@
 
     Plural form definitions.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 9eb3a5cb3..bbcf7f76c 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -6,7 +6,7 @@
     Reading and writing of files in the ``gettext`` PO (portable object)
     format.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/numbers.py b/babel/numbers.py
index 3dcd73099..6888c9cb4 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -12,7 +12,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 # TODO:
diff --git a/babel/plural.py b/babel/plural.py
index eb1eef268..1e2b2734b 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -5,7 +5,7 @@
 
     CLDR Plural support.  See UTS #35.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 import re
diff --git a/babel/support.py b/babel/support.py
index 87cb05967..efe41d562 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -8,7 +8,7 @@
 
     .. note: the code in this module is not used by Babel itself
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/util.py b/babel/util.py
index c443b6902..73a90516f 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -5,7 +5,7 @@
 
     Various utility classes and functions.
 
-    :copyright: (c) 2013-2018 by the Babel Team.
+    :copyright: (c) 2013-2019 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/docs/conf.py b/docs/conf.py
index 183cc725c..6eed08fe6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,7 +44,7 @@
 
 # General information about the project.
 project = u'Babel'
-copyright = u'2018, The Babel Team'
+copyright = u'2019, The Babel Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/scripts/dump_data.py b/scripts/dump_data.py
index 3bf35f2be..e452248d7 100755
--- a/scripts/dump_data.py
+++ b/scripts/dump_data.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/scripts/dump_global.py b/scripts/dump_global.py
index 641f3c018..8db55f2dc 100755
--- a/scripts/dump_global.py
+++ b/scripts/dump_global.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index ed2e19c04..4188055a6 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index f583810c9..f31dca310 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_checkers.py b/tests/messages/test_checkers.py
index be4afb341..ec845001e 100644
--- a/tests/messages/test_checkers.py
+++ b/tests/messages/test_checkers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index fa50a4c9e..2f41ddc2c 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index deaa66025..ad3ea0df3 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_mofile.py b/tests/messages/test_mofile.py
index 97af7ae93..b1851f297 100644
--- a/tests/messages/test_mofile.py
+++ b/tests/messages/test_mofile.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py
index 2ba15e911..bdca8f6a8 100644
--- a/tests/messages/test_plurals.py
+++ b/tests/messages/test_plurals.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index a6973d7ec..e77fa6e02 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_core.py b/tests/test_core.py
index fc637d245..c146aae9c 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_dates.py b/tests/test_dates.py
index e8592091d..5be0d16a1 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
@@ -804,4 +804,4 @@ def test_russian_week_numbering():
 def test_en_gb_first_weekday():
     assert Locale.parse('en').first_week_day == 0  # Monday in general
     assert Locale.parse('en_US').first_week_day == 6  # Sunday in the US
-    assert Locale.parse('en_GB').first_week_day == 0  # Monday in the UK
\ No newline at end of file
+    assert Locale.parse('en_GB').first_week_day == 0  # Monday in the UK
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index bffe7633f..dbacba0d5 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 27649f841..6e26fe900 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 546e12a14..c54d07a57 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_support.py b/tests/test_support.py
index 314c18825..b4dd823cd 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_util.py b/tests/test_util.py
index 0fc59e5c4..a6a4450cf 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2018 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which

From 38dfc8dc87f869d4837cbe8338db53ae9e293f8f Mon Sep 17 00:00:00 2001
From: Mario Frasca <mfrasca@zonnet.nl>
Date: Mon, 27 May 2019 12:35:28 -0500
Subject: [PATCH 440/489] attempt partial sorting at least

see issue #606.  if one object has anything that doesn't compare to `int`, bring it to the top, and correctly sort the rest.
---
 babel/messages/pofile.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index bbcf7f76c..93b0697c6 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -582,11 +582,13 @@ def _write_message(message, prefix=''):
         if not no_location:
             locs = []
 
-            # Attempt to sort the locations.  If we can't do that, for instance
-            # because there are mixed integers and Nones or whatnot (see issue #606)
-            # then give up, but also don't just crash.
+            # sort locations by filename and lineno.
+            # if there's no <int> as lineno, use `-1`.
+            # if no sorting possible, leave unsorted.
+            # (see issue #606)
             try:
-                locations = sorted(message.locations)
+                locations = sorted(message.locations, 
+                                   key=lambda x: (x[0], isinstance(x[1], int) and x[1] or -1))
             except TypeError:  # e.g. "TypeError: unorderable types: NoneType() < int()"
                 locations = message.locations
 

From 2abad80c9f2fc70bde71f53ab8270ca950100595 Mon Sep 17 00:00:00 2001
From: Romuald Brunet <romuald@gandi.net>
Date: Thu, 18 Jul 2019 14:44:10 +0200
Subject: [PATCH 441/489] Add year along dates in changelog

---
 CHANGES | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3462117fc..ec265c557 100644
--- a/CHANGES
+++ b/CHANGES
@@ -188,7 +188,7 @@ Internal improvements
 Version 2.3.4
 -------------
 
-(Bugfix release, released on April 22th)
+(Bugfix release, released on April 22th 2016)
 
 Bugfixes
 ~~~~~~~~
@@ -199,7 +199,7 @@ Bugfixes
 Version 2.3.3
 -------------
 
-(Bugfix release, released on April 12th)
+(Bugfix release, released on April 12th 2016)
 
 Bugfixes
 ~~~~~~~~
@@ -209,7 +209,7 @@ Bugfixes
 Version 2.3.2
 -------------
 
-(Bugfix release, released on April 9th)
+(Bugfix release, released on April 9th 2016)
 
 Bugfixes
 ~~~~~~~~
@@ -219,12 +219,12 @@ Bugfixes
 Version 2.3.1
 -------------
 
-(Bugfix release because of deployment problems, released on April 8th)
+(Bugfix release because of deployment problems, released on April 8th 2016)
 
 Version 2.3
 -----------
 
-(Feature release, released on April 8th)
+(Feature release, released on April 8th 2016)
 
 Internal improvements
 ~~~~~~~~~~~~~~~~~~~~~

From 9680427a75d3c267df111e2db585b26925a336bf Mon Sep 17 00:00:00 2001
From: "Steve (Gadget) Barnes" <gadgetsteve@hotmail.com>
Date: Fri, 18 Oct 2019 17:07:24 +0100
Subject: [PATCH 442/489] Add install of pytz before import_cldr

closes #670
---
 docs/installation.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/installation.rst b/docs/installation.rst
index ce778b04c..c1b7ab9fe 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -79,15 +79,16 @@ Get the git checkout in a new virtualenv and run in development mode::
     New python executable in venv/bin/python
     Installing distribute............done.
     $ . venv/bin/activate
+    $ pip install pytz
     $ python setup.py import_cldr
     $ pip install --editable .
     ...
     Finished processing dependencies for Babel
 
-Make sure to not forget about the ``import_cldr`` step because otherwise
-you will be missing the locale data.  This custom command will download
-the most appropriate CLDR release from the official website and convert it
-for Babel.
+Make sure to not forget about the ``pip install pytz`` and ``import_cldr`` steps
+because otherwise you will be missing the locale data.  
+The custom setup command will download the most appropriate CLDR release from the
+official website and convert it for Babel but will not work without ``pytz``.
 
 This will pull also in the dependencies and activate the git head as the
 current version inside the virtualenv.  Then all you have to do is run

From 472a3174a7abc314345a914dde6fa2031018d4c4 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 31 Dec 2019 10:13:37 +0200
Subject: [PATCH 443/489] Upgrade freezegun to fix CI failures

---
 .ci/appveyor.yml | 2 +-
 .travis.yml      | 2 +-
 tox.ini          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index eb9ba8656..91758f415 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -27,7 +27,7 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   # Build data files
-  - "pip install --upgrade pytest==4.3.1 pytest-cov==2.6.1 codecov freezegun==0.3.11"
+  - "pip install --upgrade pytest==4.3.1 pytest-cov==2.6.1 codecov freezegun==0.3.12"
   - "pip install --editable ."
   - "python setup.py import_cldr"
 
diff --git a/.travis.yml b/.travis.yml
index 174913952..9564d4c65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ matrix:
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
-  - pip install --upgrade $CDECIMAL pytest==4.3.1 pytest-cov==2.6.1 freezegun==0.3.11
+  - pip install --upgrade $CDECIMAL pytest==4.3.1 pytest-cov==2.6.1 freezegun==0.3.12
   - pip install --editable .
 
 script:
diff --git a/tox.ini b/tox.ini
index b3f8041f4..eccffea94 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ deps =
     pytest==4.3.1
     pytest-cov==2.6.1
     cdecimal: m3-cdecimal
-    freezegun==0.3.11
+    freezegun==0.3.12
 whitelist_externals = make
 commands = make clean-cldr test
 passenv = PYTHON_TEST_FLAGS

From 521fd3a3aa7d5605f5b5a10e9c50d85c7aa7af61 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 31 Dec 2019 10:46:45 +0200
Subject: [PATCH 444/489] Test on released Python 3.8

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9564d4c65..9650f674c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ matrix:
     - os: linux
       python: 3.7
     - os: linux
-      python: 3.8-dev
+      python: 3.8
 
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh

From 49c68d335f8443ba5fee0a5201dd8c2d033e59ff Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 31 Dec 2019 09:37:50 +0200
Subject: [PATCH 445/489] Download CLDR 36.0

---
 scripts/download_import_cldr.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index f118c6900..434b04f80 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -13,9 +13,9 @@
     from urllib import urlretrieve
 
 
-URL = 'https://unicode.org/Public/cldr/35.1/core.zip'
-FILENAME = 'cldr-core-35.1.zip'
-FILESUM = 'e2ede8cb8f9c29157e281ee9e696ce540a72c598841bed595a406b710eea87b0'
+URL = 'http://unicode.org/Public/cldr/36/core.zip'
+FILENAME = 'cldr-core-36.zip'
+FILESUM = '07279e56c1f4266d140b907ef3ec379dce0a99542303a9628562ac5fe460ba43'
 BLKSIZE = 131072
 
 

From fab99b8924ad37e9f04798f464f37e2359ebafeb Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 31 Dec 2019 09:58:03 +0200
Subject: [PATCH 446/489] CLDR import: assume files without revision tags to be
 new

---
 scripts/import_cldr.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 4188055a6..8993b68e4 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -77,8 +77,10 @@ def error(message, *args):
 def need_conversion(dst_filename, data_dict, source_filename):
     with open(source_filename, 'rb') as f:
         blob = f.read(4096)
-        version = int(re.search(b'version number="\\$Revision: (\\d+)',
-                                blob).group(1))
+        version_match = re.search(b'version number="\\$Revision: (\\d+)', blob)
+        if not version_match:  # CLDR 36.0 was shipped without proper revision numbers
+            return True
+        version = int(version_match.group(1))
 
     data_dict['_version'] = version
     if not os.path.isfile(dst_filename):

From d4a7c266ba119ee8564a14575a60948f723a15cb Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 31 Dec 2019 10:02:04 +0200
Subject: [PATCH 447/489] Correct format_unit test based on new Welsh data

---
 babel/units.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/babel/units.py b/babel/units.py
index e58bf81c2..89c491365 100644
--- a/babel/units.py
+++ b/babel/units.py
@@ -88,12 +88,12 @@ def format_unit(value, measurement_unit, length='long', format=None, locale=LC_N
 
     >>> format_unit(1, 'length-meter', locale='ro_RO')
     u'1 metru'
-    >>> format_unit(0, 'length-picometer', locale='cy')
-    u'0 picometr'
-    >>> format_unit(2, 'length-picometer', locale='cy')
-    u'2 bicometr'
-    >>> format_unit(3, 'length-picometer', locale='cy')
-    u'3 phicometr'
+    >>> format_unit(0, 'length-mile', locale='cy')
+    u'0 mi'
+    >>> format_unit(1, 'length-mile', locale='cy')
+    u'1 filltir'
+    >>> format_unit(3, 'length-mile', locale='cy')
+    u'3 milltir'
 
     >>> format_unit(15, 'length-horse', locale='fi')
     Traceback (most recent call last):

From df9c01c6480ef20523418079b6774612e47b8c63 Mon Sep 17 00:00:00 2001
From: He Chen <hchen584@bloomberg.net>
Date: Mon, 19 Aug 2019 16:06:41 -0400
Subject: [PATCH 448/489] fix small decimal with disabled decimal_quantization

---
 babel/numbers.py      | 2 +-
 tests/test_numbers.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index 6888c9cb4..cf819fc9a 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -1063,7 +1063,7 @@ def _format_int(self, value, min, max, locale):
     def _quantize_value(self, value, locale, frac_prec):
         quantum = get_decimal_quantum(frac_prec[1])
         rounded = value.quantize(quantum)
-        a, sep, b = str(rounded).partition(".")
+        a, sep, b = "{:f}".format(rounded).partition(".")
         number = (self._format_int(a, self.int_prec[0],
                                    self.int_prec[1], locale) +
                   self._format_frac(b or '0', locale, frac_prec))
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 6e26fe900..a980a66ad 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -690,3 +690,7 @@ def test_parse_decimal_nbsp_heuristics():
     n = decimal.Decimal("12345.123")
     assert numbers.parse_decimal("12 345.123", locale="fi") == n
     assert numbers.parse_decimal(numbers.format_decimal(n, locale="fi"), locale="fi") == n
+
+
+def test_very_small_decimal_no_quantization():
+    assert numbers.format_decimal(decimal.Decimal('1E-7'), locale='en', decimal_quantization=False) == '0.0000001'

From c42bc9e907d638b368d07a326daa841e4a0bd691 Mon Sep 17 00:00:00 2001
From: sebleblanc <seb@sebleblanc.net>
Date: Tue, 3 Dec 2019 04:45:42 +0000
Subject: [PATCH 449/489] Hardcode "ignore" method

The "ignore" method used to force the opening of the file. Some editors (emacs) create symbolic links to use as synchronization locks. Those links have an extension that matches the opened file, but the links themselves do not point to an existing file, thus causing Babel to attempt to open a file that does not exist.

This fix skips opening of a file altogether when using the method "ignore" in the mapping file.
---
 babel/messages/extract.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index db429b2ea..e7d7ad70f 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -236,9 +236,12 @@ def extract_from_file(method, filename, keywords=DEFAULT_KEYWORDS,
     :returns: list of tuples of the form ``(lineno, message, comments, context)``
     :rtype: list[tuple[int, str|tuple[str], list[str], str|None]
     """
+    if method == 'ignore':
+        return []
+
     with open(filename, 'rb') as fileobj:
-        return list(extract(method, fileobj, keywords, comment_tags, options,
-                            strip_comment_tags))
+        return list(extract(method, fileobj, keywords, comment_tags,
+                            options, strip_comment_tags))
 
 
 def extract(method, fileobj, keywords=DEFAULT_KEYWORDS, comment_tags=(),

From dc012d4961c8a58c761252053a9954ccdbf4afd2 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 31 Dec 2019 14:21:49 +0200
Subject: [PATCH 450/489] Distill changelog from git log

---
 CHANGES | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGES b/CHANGES
index ec265c557..4441f68e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,27 @@
 Babel Changelog
 ===============
 
+Version 2.8.0
+-------------
+
+Improvements
+~~~~~~~~~~~~
+
+* CLDR: Upgrade to CLDR 36.0 - Aarni Koskela (#679)
+* Messages: Don't even open files with the "ignore" extraction method - @sebleblanc (#678)
+
+Bugfixes
+~~~~~~~~
+
+* Numbers: Fix formatting very small decimals when quantization is disabled - Lev Lybin, @miluChen (#662)
+* Messages: Attempt to sort all messages – Mario Frasca (#651, #606)
+
+Docs
+~~~~
+
+* Add years to changelog - Romuald Brunet
+* Note that installation requires pytz - Steve (Gadget) Barnes
+
 Version 2.7.0
 -------------
 

From eb1b24f49760eadb13dee0d505b25f93befa5c97 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 31 Dec 2019 14:22:11 +0200
Subject: [PATCH 451/489] Update authors file

---
 AUTHORS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 6374cd650..31a5cd1be 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,6 +45,11 @@ Babel is written and maintained by the Babel team and various contributors:
 - Leonardo Pistone
 - Jun Omae
 - Hyunjun Kim
+- sebleblanc
+- He Chen
+- Steve (Gadget) Barnes
+- Romuald Brunet
+- Mario Frasca
 - BT-sschmid
 - Alberto Mardegan
 - mondeja

From 692ad094c8fdf1895b7f56a071f38f8e463a2c62 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 31 Dec 2019 14:23:25 +0200
Subject: [PATCH 452/489] Bump version

---
 babel/__init__.py | 2 +-
 docs/conf.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index 1132e6f37..c10a8bd1f 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.7.0'
+__version__ = '2.8.0'
diff --git a/docs/conf.py b/docs/conf.py
index 6eed08fe6..83c5bf206 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.7'
+version = '2.8'
 # The full version, including alpha/beta/rc tags.
-release = '2.7.0'
+release = '2.8.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 4fa749b918810b52a63b312d82e4003e24db0406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 6 Jan 2020 00:37:39 +0100
Subject: [PATCH 453/489] Replace usage of parser.suite with ast.parse

Replaced usage of the long-superseded "parser.suite" module in the
mako.util package for parsing the python magic encoding comment with the
"ast.parse" function introduced many years ago in Python 2.5, as
"parser.suite" is emitting deprecation warnings in Python 3.9.

Fixes https://github.com/sqlalchemy/mako/issues/310
See also https://github.com/sqlalchemy/mako/commit/2dae7d2c3da73653e6de329dc15c55056a0b9ab6
---
 babel/util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/util.py b/babel/util.py
index 73a90516f..c371badbd 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -68,8 +68,8 @@ def parse_encoding(fp):
         m = PYTHON_MAGIC_COMMENT_re.match(line1)
         if not m:
             try:
-                import parser
-                parser.suite(line1.decode('latin-1'))
+                import ast
+                ast.parse(line1.decode('latin-1'))
             except (ImportError, SyntaxError, UnicodeEncodeError):
                 # Either it's a real syntax error, in which case the source is
                 # not valid python source, or line2 is a continuation of line1,

From f4f6653e6aa053724d2c6dc0ee71dcb928013352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 28 Jan 2020 02:46:25 +0100
Subject: [PATCH 454/489] Introduce invariant that _invalid_pofile() takes
 unicode line.

This makes debugging and reasoning about the code easier;
otherwise it is surprising that sometimes `line` is a unicode
and sometimes not.

So far, when it was not, it could either be only `""` or
`'Algo esta mal'`; thus this commit makes those two u"" strings.
In all other cases, it was guaranteed that it's unicode,
because all code paths leading to `_invalid_pofile()` went through

    if not isinstance(line, text_type):
        line = line.decode(self.catalog.charset)

before.
---
 babel/messages/pofile.py      | 3 ++-
 tests/messages/test_pofile.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 93b0697c6..f6771bedf 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -178,7 +178,7 @@ def _add_message(self):
             string = ['' for _ in range(self.catalog.num_plurals)]
             for idx, translation in self.translations:
                 if idx >= self.catalog.num_plurals:
-                    self._invalid_pofile("", self.offset, "msg has more translations than num_plurals of catalog")
+                    self._invalid_pofile(u"", self.offset, "msg has more translations than num_plurals of catalog")
                     continue
                 string[idx] = translation.denormalize()
             string = tuple(string)
@@ -319,6 +319,7 @@ def parse(self, fileobj):
             self._add_message()
 
     def _invalid_pofile(self, line, lineno, msg):
+        assert isinstance(line, text_type)
         if self.abort_invalid:
             raise PoFileError(msg, self.catalog, line, lineno)
         print("WARNING:", msg)
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index e77fa6e02..214ddf5d5 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -480,7 +480,7 @@ def test_abort_invalid_po_file(self):
     def test_invalid_pofile_with_abort_flag(self):
         parser = pofile.PoFileParser(None, abort_invalid=True)
         lineno = 10
-        line = 'Algo esta mal'
+        line = u'Algo esta mal'
         msg = 'invalid file'
         with self.assertRaises(pofile.PoFileError) as e:
             parser._invalid_pofile(line, lineno, msg)

From da7f31143847659b6b74d802618b03438aceb350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 28 Jan 2020 00:37:22 +0100
Subject: [PATCH 455/489] Fix unicode printing error on Python 2 without TTY.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Until now, on Python 2.7, `python setup.py test | cat` crashed in the test
runner with

    ======================================================================
    ERROR: test_abort_invalid_po_file (tests.messages.test_pofile.ReadPoTestCase)
    ----------------------------------------------------------------------
    Traceback (most recent call last):
      File "src/babel/tests/messages/test_pofile.py", line 458, in test_abort_invalid_po_file
        output = pofile.read_po(buf, locale='fr', abort_invalid=False)
      File "src/babel/babel/messages/pofile.py", line 377, in read_po
        parser.parse(fileobj)
      File "src/babel/babel/messages/pofile.py", line 310, in parse
        self._process_message_line(lineno, line)
      File "src/babel/babel/messages/pofile.py", line 210, in _process_message_line
        self._process_keyword_line(lineno, line, obsolete)
      File "src/babel/babel/messages/pofile.py", line 222, in _process_keyword_line
        self._invalid_pofile(line, lineno, "Start of line didn't match any expected keyword.")
      File "src/babel/babel/messages/pofile.py", line 325, in _invalid_pofile
        print(u"WARNING: Problem on line {0}: {1}".format(lineno + 1, line))
    UnicodeEncodeError: 'ascii' codec can't encode character u'\xe0' in position 84: ordinal not in range(128)

The test suite would show this when printing the `à` in the test pofile contents

    Pour toute question, veuillez communiquer avec Fulano  à nadie@blah.com

But this bug is not confined to the test suite only. Any call to `read_po()`
with invalid .po file could trigger it in non-test code when
`sys.stdout.encoding` is `None`, which is the default for Python 2 when
`sys.stdout.isatty()` is false (as induced e.g. by `| cat`).

The fix is to `repr()` the line when printing the WARNING.
---
 babel/messages/pofile.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index f6771bedf..b86dd4052 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -323,7 +323,10 @@ def _invalid_pofile(self, line, lineno, msg):
         if self.abort_invalid:
             raise PoFileError(msg, self.catalog, line, lineno)
         print("WARNING:", msg)
-        print(u"WARNING: Problem on line {0}: {1}".format(lineno + 1, line))
+        # `line` is guaranteed to be unicode so u"{}"-interpolating would always
+        # succeed, but on Python < 2 if not in a TTY, `sys.stdout.encoding`
+        # is `None`, unicode may not be printable so we `repr()` to ASCII.
+        print(u"WARNING: Problem on line {0}: {1}".format(lineno + 1, repr(line)))
 
 
 def read_po(fileobj, locale=None, domain=None, ignore_obsolete=False, charset=None, abort_invalid=False):

From 0cfa69e087a24364ba788ff9d862949b65f0ff12 Mon Sep 17 00:00:00 2001
From: CyanNani123 <f.st@live.de>
Date: Mon, 13 Jan 2020 23:13:01 +0100
Subject: [PATCH 456/489] catalog.rst: Add __iter__ to Catalog documentation

The declaration of __iter__ under the special-members
directive makes it visible in the documentation.
The docstring describing __iter__ already exists.

Closes https://github.com/python-babel/babel/issues/128
---
 docs/api/messages/catalog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/api/messages/catalog.rst b/docs/api/messages/catalog.rst
index 8a905bcd9..8cb6375e3 100644
--- a/docs/api/messages/catalog.rst
+++ b/docs/api/messages/catalog.rst
@@ -12,6 +12,7 @@ Catalogs
 
 .. autoclass:: Catalog
    :members:
+   :special-members: __iter__
 
 Messages
 --------

From 4ce6f13412705949f6d74579f15cad15cf00fed7 Mon Sep 17 00:00:00 2001
From: Tyler Kennedy <tk@tkte.ch>
Date: Tue, 25 Feb 2020 17:05:43 -0500
Subject: [PATCH 457/489] Update license.rst

The documentation refers to the license as the license for _flask_ instead of Babel.
---
 docs/license.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/license.rst b/docs/license.rst
index a619b5746..7c93ab426 100644
--- a/docs/license.rst
+++ b/docs/license.rst
@@ -19,7 +19,7 @@ Authors
 General License Definitions
 ---------------------------
 
-The following section contains the full license texts for Flask and the
+The following section contains the full license texts for Babel and the
 documentation.
 
 -   "AUTHORS" hereby refers to all the authors listed in the

From 167b71421f113e2210e4deefef5020402492e5be Mon Sep 17 00:00:00 2001
From: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
Date: Tue, 5 May 2020 09:58:01 +0200
Subject: [PATCH 458/489] stop using deprecated ElementTree methods
 "getchildren()" and "getiterator()"

Both methods were removed in Python 3.9 as mentioned in the release notes:

> Methods getchildren() and getiterator() of classes ElementTree and Element in
> the ElementTree module have been removed. They were deprecated in Python 3.2.
> Use iter(x) or list(x) instead of x.getchildren() and x.iter() or
> list(x.iter()) instead of x.getiterator().
---
 scripts/import_cldr.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 8993b68e4..2ed3af91e 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -598,7 +598,7 @@ def parse_calendar_months(data, calendar):
         for width in ctxt.findall('monthWidth'):
             width_type = width.attrib['type']
             widths = ctxts.setdefault(width_type, {})
-            for elem in width.getiterator():
+            for elem in width.iter():
                 if elem.tag == 'month':
                     _import_type_text(widths, elem, int(elem.attrib['type']))
                 elif elem.tag == 'alias':
@@ -616,7 +616,7 @@ def parse_calendar_days(data, calendar):
         for width in ctxt.findall('dayWidth'):
             width_type = width.attrib['type']
             widths = ctxts.setdefault(width_type, {})
-            for elem in width.getiterator():
+            for elem in width.iter():
                 if elem.tag == 'day':
                     _import_type_text(widths, elem, weekdays[elem.attrib['type']])
                 elif elem.tag == 'alias':
@@ -634,7 +634,7 @@ def parse_calendar_quarters(data, calendar):
         for width in ctxt.findall('quarterWidth'):
             width_type = width.attrib['type']
             widths = ctxts.setdefault(width_type, {})
-            for elem in width.getiterator():
+            for elem in width.iter():
                 if elem.tag == 'quarter':
                     _import_type_text(widths, elem, int(elem.attrib['type']))
                 elif elem.tag == 'alias':
@@ -649,7 +649,7 @@ def parse_calendar_eras(data, calendar):
     for width in calendar.findall('eras/*'):
         width_type = NAME_MAP[width.tag]
         widths = eras.setdefault(width_type, {})
-        for elem in width.getiterator():
+        for elem in width.iter():
             if elem.tag == 'era':
                 _import_type_text(widths, elem, type=int(elem.attrib.get('type')))
             elif elem.tag == 'alias':
@@ -676,7 +676,7 @@ def parse_calendar_periods(data, calendar):
 def parse_calendar_date_formats(data, calendar):
     date_formats = data.setdefault('date_formats', {})
     for format in calendar.findall('dateFormats'):
-        for elem in format.getiterator():
+        for elem in format.iter():
             if elem.tag == 'dateFormatLength':
                 type = elem.attrib.get('type')
                 if _should_skip_elem(elem, type, date_formats):
@@ -696,7 +696,7 @@ def parse_calendar_date_formats(data, calendar):
 def parse_calendar_time_formats(data, calendar):
     time_formats = data.setdefault('time_formats', {})
     for format in calendar.findall('timeFormats'):
-        for elem in format.getiterator():
+        for elem in format.iter():
             if elem.tag == 'timeFormatLength':
                 type = elem.attrib.get('type')
                 if _should_skip_elem(elem, type, time_formats):
@@ -717,7 +717,7 @@ def parse_calendar_datetime_skeletons(data, calendar):
     datetime_formats = data.setdefault('datetime_formats', {})
     datetime_skeletons = data.setdefault('datetime_skeletons', {})
     for format in calendar.findall('dateTimeFormats'):
-        for elem in format.getiterator():
+        for elem in format.iter():
             if elem.tag == 'dateTimeFormatLength':
                 type = elem.attrib.get('type')
                 if _should_skip_elem(elem, type, datetime_formats):
@@ -880,7 +880,7 @@ def parse_interval_formats(data, tree):
             interval_formats[None] = elem.text
         elif elem.tag == "intervalFormatItem":
             skel_data = interval_formats.setdefault(elem.attrib["id"], {})
-            for item_sub in elem.getchildren():
+            for item_sub in elem:
                 if item_sub.tag == "greatestDifference":
                     skel_data[item_sub.attrib["id"]] = split_interval_pattern(item_sub.text)
                 else:
@@ -903,7 +903,7 @@ def parse_currency_formats(data, tree):
                     type = '%s:%s' % (type, curr_length_type)
                 if _should_skip_elem(elem, type, currency_formats):
                     continue
-                for child in elem.getiterator():
+                for child in elem.iter():
                     if child.tag == 'alias':
                         currency_formats[type] = Alias(
                             _translate_alias(['currency_formats', elem.attrib['type']],

From 7bdaa28a55e8d8228d5434effa4b1473ab7b3669 Mon Sep 17 00:00:00 2001
From: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
Date: Tue, 5 May 2020 08:05:56 +0000
Subject: [PATCH 459/489] fix tests when using Python 3.9a6

In Python 3.9a6 integer values for future flags were changed to prevent
collision with compiler flags. We need to retrieve these at runtime so
the test suite works with Python <= 3.8 as well as Python 3.9.
---
 tests/test_util.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/test_util.py b/tests/test_util.py
index a6a4450cf..b9343aaab 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -11,6 +11,7 @@
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
 
+import __future__
 import unittest
 
 import pytest
@@ -20,6 +21,12 @@
 from babel.util import parse_future_flags
 
 
+class _FF:
+    division         = __future__.division.compiler_flag
+    print_function   = __future__.print_function.compiler_flag
+    with_statement   = __future__.with_statement.compiler_flag
+    unicode_literals = __future__.unicode_literals.compiler_flag
+
 def test_distinct():
     assert list(util.distinct([1, 2, 1, 3, 4, 4])) == [1, 2, 3, 4]
     assert list(util.distinct('foobar')) == ['f', 'o', 'b', 'a', 'r']
@@ -70,25 +77,25 @@ def test_parse_encoding_non_ascii():
 from __future__ import print_function,
     division, with_statement,
     unicode_literals
-''', 0x10000 | 0x2000 | 0x8000 | 0x20000),
+''', _FF.print_function | _FF.division | _FF.with_statement | _FF.unicode_literals),
     ('''
 from __future__ import print_function, division
 print('hello')
-''', 0x10000 | 0x2000),
+''', _FF.print_function | _FF.division),
     ('''
 from __future__ import print_function, division, unknown,,,,,
 print 'hello'
-''', 0x10000 | 0x2000),
+''', _FF.print_function | _FF.division),
     ('''
 from __future__ import (
     print_function,
     division)
-''', 0x10000 | 0x2000),
+''', _FF.print_function | _FF.division),
     ('''
 from __future__ import \\
     print_function, \\
     division
-''', 0x10000 | 0x2000),
+''', _FF.print_function | _FF.division),
 ])
 def test_parse_future(source, result):
     fp = BytesIO(source.encode('latin-1'))

From 2a826bb1ad9996a1c1e2d3e86a493d01d7f12c09 Mon Sep 17 00:00:00 2001
From: Felix Schwarz <felix.schwarz@oss.schwarz.eu>
Date: Tue, 5 May 2020 21:32:52 +0000
Subject: [PATCH 460/489] simplify iteration code in "import_cldr.py"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As Miro Hrončok pointed out we don't need ".iter()" in the script.
---
 scripts/import_cldr.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 2ed3af91e..7ea6481a2 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -598,7 +598,7 @@ def parse_calendar_months(data, calendar):
         for width in ctxt.findall('monthWidth'):
             width_type = width.attrib['type']
             widths = ctxts.setdefault(width_type, {})
-            for elem in width.iter():
+            for elem in width:
                 if elem.tag == 'month':
                     _import_type_text(widths, elem, int(elem.attrib['type']))
                 elif elem.tag == 'alias':
@@ -616,7 +616,7 @@ def parse_calendar_days(data, calendar):
         for width in ctxt.findall('dayWidth'):
             width_type = width.attrib['type']
             widths = ctxts.setdefault(width_type, {})
-            for elem in width.iter():
+            for elem in width:
                 if elem.tag == 'day':
                     _import_type_text(widths, elem, weekdays[elem.attrib['type']])
                 elif elem.tag == 'alias':
@@ -634,7 +634,7 @@ def parse_calendar_quarters(data, calendar):
         for width in ctxt.findall('quarterWidth'):
             width_type = width.attrib['type']
             widths = ctxts.setdefault(width_type, {})
-            for elem in width.iter():
+            for elem in width:
                 if elem.tag == 'quarter':
                     _import_type_text(widths, elem, int(elem.attrib['type']))
                 elif elem.tag == 'alias':
@@ -649,7 +649,7 @@ def parse_calendar_eras(data, calendar):
     for width in calendar.findall('eras/*'):
         width_type = NAME_MAP[width.tag]
         widths = eras.setdefault(width_type, {})
-        for elem in width.iter():
+        for elem in width:
             if elem.tag == 'era':
                 _import_type_text(widths, elem, type=int(elem.attrib.get('type')))
             elif elem.tag == 'alias':
@@ -676,7 +676,7 @@ def parse_calendar_periods(data, calendar):
 def parse_calendar_date_formats(data, calendar):
     date_formats = data.setdefault('date_formats', {})
     for format in calendar.findall('dateFormats'):
-        for elem in format.iter():
+        for elem in format:
             if elem.tag == 'dateFormatLength':
                 type = elem.attrib.get('type')
                 if _should_skip_elem(elem, type, date_formats):
@@ -696,7 +696,7 @@ def parse_calendar_date_formats(data, calendar):
 def parse_calendar_time_formats(data, calendar):
     time_formats = data.setdefault('time_formats', {})
     for format in calendar.findall('timeFormats'):
-        for elem in format.iter():
+        for elem in format:
             if elem.tag == 'timeFormatLength':
                 type = elem.attrib.get('type')
                 if _should_skip_elem(elem, type, time_formats):
@@ -717,7 +717,7 @@ def parse_calendar_datetime_skeletons(data, calendar):
     datetime_formats = data.setdefault('datetime_formats', {})
     datetime_skeletons = data.setdefault('datetime_skeletons', {})
     for format in calendar.findall('dateTimeFormats'):
-        for elem in format.iter():
+        for elem in format:
             if elem.tag == 'dateTimeFormatLength':
                 type = elem.attrib.get('type')
                 if _should_skip_elem(elem, type, datetime_formats):

From e7e4265d9a037ac38bba99f8513fb9e48a1081ba Mon Sep 17 00:00:00 2001
From: Brad Martin <brad.martin@ibotta.com>
Date: Sun, 10 May 2020 12:02:16 -0600
Subject: [PATCH 461/489] docs/numbers.rst : update parse_number comments
 (#708)

* docs/numbers.rst : test format of revised comments

* docs/numbers.rst : test final doc changes

* docs/numbers.rst : refine format/language

* docs/numbers.rst : refine language/format

* docs/numbers.rst : refine language/format

* docs/numbers.rst : experiment with spacing
---
 docs/numbers.rst | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/numbers.rst b/docs/numbers.rst
index df834eaf8..058d79e18 100644
--- a/docs/numbers.rst
+++ b/docs/numbers.rst
@@ -160,4 +160,21 @@ Examples:
       ...
     NumberFormatError: '2,109,998' is not a valid decimal number
 
-.. note:: Number parsing is not properly implemented yet
+Note: as of version 2.8.0, the ``parse_number`` function has limited
+functionality. It can remove group symbols of certain locales from numeric
+strings, but may behave unexpectedly until its logic handles more encoding
+issues and other special cases.
+
+Examples:
+
+.. code-block:: pycon
+
+    >>> parse_number('1,099', locale='en_US')
+    1099
+    >>> parse_number('1.099.024', locale='de')
+    1099024
+    >>> parse_number('123' + u'\xa0' + '4567', locale='ru')
+    1234567
+    >>> parse_number('123 4567', locale='ru')
+      ...
+    NumberFormatError: '123 4567' is not a valid number

From e0e6aa614546855ccb76637b8d910382b6e94dba Mon Sep 17 00:00:00 2001
From: Abdullah Javed Nesar <abduljaved1994@gmail.com>
Date: Tue, 22 Sep 2020 17:44:27 +0530
Subject: [PATCH 462/489] Added group_separator feature in number formatting
 (#726)

---
 babel/numbers.py      | 58 ++++++++++++++++++++++++++++++-------------
 tests/test_numbers.py | 30 ++++++++++++++++++++++
 2 files changed, 71 insertions(+), 17 deletions(-)

diff --git a/babel/numbers.py b/babel/numbers.py
index cf819fc9a..bbc5e2129 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -373,7 +373,7 @@ def get_decimal_quantum(precision):
 
 
 def format_decimal(
-        number, format=None, locale=LC_NUMERIC, decimal_quantization=True):
+        number, format=None, locale=LC_NUMERIC, decimal_quantization=True, group_separator=True):
     u"""Return the given decimal number formatted for a specific locale.
 
     >>> format_decimal(1.2345, locale='en_US')
@@ -401,19 +401,25 @@ def format_decimal(
     u'1.235'
     >>> format_decimal(1.2346, locale='en_US', decimal_quantization=False)
     u'1.2346'
+    >>> format_decimal(12345.67, locale='fr_CA', group_separator=False)
+    u'12345,67'
+    >>> format_decimal(12345.67, locale='en_US', group_separator=True)
+    u'12,345.67'
 
     :param number: the number to format
     :param format:
     :param locale: the `Locale` object or locale identifier
     :param decimal_quantization: Truncate and round high-precision numbers to
                                  the format pattern. Defaults to `True`.
+    :param group_separator: Boolean to switch group separator on/off in a locale's
+                            number format.
     """
     locale = Locale.parse(locale)
     if not format:
         format = locale.decimal_formats.get(format)
     pattern = parse_pattern(format)
     return pattern.apply(
-        number, locale, decimal_quantization=decimal_quantization)
+        number, locale, decimal_quantization=decimal_quantization, group_separator=group_separator)
 
 
 class UnknownCurrencyFormatError(KeyError):
@@ -422,7 +428,7 @@ class UnknownCurrencyFormatError(KeyError):
 
 def format_currency(
         number, currency, format=None, locale=LC_NUMERIC, currency_digits=True,
-        format_type='standard', decimal_quantization=True):
+        format_type='standard', decimal_quantization=True, group_separator=True):
     u"""Return formatted currency value.
 
     >>> format_currency(1099.98, 'USD', locale='en_US')
@@ -472,6 +478,12 @@ def format_currency(
         ...
     UnknownCurrencyFormatError: "'unknown' is not a known currency format type"
 
+    >>> format_currency(101299.98, 'USD', locale='en_US', group_separator=False)
+    u'$101299.98'
+
+    >>> format_currency(101299.98, 'USD', locale='en_US', group_separator=True)
+    u'$101,299.98'
+
     You can also pass format_type='name' to use long display names. The order of
     the number and currency name, along with the correct localized plural form
     of the currency name, is chosen according to locale:
@@ -500,12 +512,14 @@ def format_currency(
     :param format_type: the currency format type to use
     :param decimal_quantization: Truncate and round high-precision numbers to
                                  the format pattern. Defaults to `True`.
+    :param group_separator: Boolean to switch group separator on/off in a locale's
+                            number format.
 
     """
     if format_type == 'name':
         return _format_currency_long_name(number, currency, format=format,
                                           locale=locale, currency_digits=currency_digits,
-                                          decimal_quantization=decimal_quantization)
+                                          decimal_quantization=decimal_quantization, group_separator=group_separator)
     locale = Locale.parse(locale)
     if format:
         pattern = parse_pattern(format)
@@ -518,12 +532,12 @@ def format_currency(
 
     return pattern.apply(
         number, locale, currency=currency, currency_digits=currency_digits,
-        decimal_quantization=decimal_quantization)
+        decimal_quantization=decimal_quantization, group_separator=group_separator)
 
 
 def _format_currency_long_name(
         number, currency, format=None, locale=LC_NUMERIC, currency_digits=True,
-        format_type='standard', decimal_quantization=True):
+        format_type='standard', decimal_quantization=True, group_separator=True):
     # Algorithm described here:
     # https://www.unicode.org/reports/tr35/tr35-numbers.html#Currencies
     locale = Locale.parse(locale)
@@ -552,13 +566,13 @@ def _format_currency_long_name(
 
     number_part = pattern.apply(
         number, locale, currency=currency, currency_digits=currency_digits,
-        decimal_quantization=decimal_quantization)
+        decimal_quantization=decimal_quantization, group_separator=group_separator)
 
     return unit_pattern.format(number_part, display_name)
 
 
 def format_percent(
-        number, format=None, locale=LC_NUMERIC, decimal_quantization=True):
+        number, format=None, locale=LC_NUMERIC, decimal_quantization=True, group_separator=True):
     """Return formatted percent value for a specific locale.
 
     >>> format_percent(0.34, locale='en_US')
@@ -582,18 +596,26 @@ def format_percent(
     >>> format_percent(23.9876, locale='en_US', decimal_quantization=False)
     u'2,398.76%'
 
+    >>> format_percent(229291.1234, locale='pt_BR', group_separator=False)
+    u'22929112%'
+
+    >>> format_percent(229291.1234, locale='pt_BR', group_separator=True)
+    u'22.929.112%'
+
     :param number: the percent number to format
     :param format:
     :param locale: the `Locale` object or locale identifier
     :param decimal_quantization: Truncate and round high-precision numbers to
                                  the format pattern. Defaults to `True`.
+    :param group_separator: Boolean to switch group separator on/off in a locale's
+                            number format.
     """
     locale = Locale.parse(locale)
     if not format:
         format = locale.percent_formats.get(format)
     pattern = parse_pattern(format)
     return pattern.apply(
-        number, locale, decimal_quantization=decimal_quantization)
+        number, locale, decimal_quantization=decimal_quantization, group_separator=group_separator)
 
 
 def format_scientific(
@@ -913,6 +935,7 @@ def apply(
         currency_digits=True,
         decimal_quantization=True,
         force_frac=None,
+        group_separator=True,
     ):
         """Renders into a string a number following the defined pattern.
 
@@ -952,8 +975,8 @@ def apply(
         if self.exp_prec:
             value, exp, exp_sign = self.scientific_notation_elements(value, locale)
 
-        # Adjust the precision of the fractionnal part and force it to the
-        # currency's if neccessary.
+        # Adjust the precision of the fractional part and force it to the
+        # currency's if necessary.
         if force_frac:
             # TODO (3.x?): Remove this parameter
             warnings.warn('The force_frac parameter to NumberPattern.apply() is deprecated.', DeprecationWarning)
@@ -975,7 +998,7 @@ def apply(
         # Render scientific notation.
         if self.exp_prec:
             number = ''.join([
-                self._quantize_value(value, locale, frac_prec),
+                self._quantize_value(value, locale, frac_prec, group_separator),
                 get_exponential_symbol(locale),
                 exp_sign,
                 self._format_int(
@@ -993,7 +1016,7 @@ def apply(
 
         # A normal number pattern.
         else:
-            number = self._quantize_value(value, locale, frac_prec)
+            number = self._quantize_value(value, locale, frac_prec, group_separator)
 
         retval = ''.join([
             self.prefix[is_negative],
@@ -1060,13 +1083,14 @@ def _format_int(self, value, min, max, locale):
             gsize = self.grouping[1]
         return value + ret
 
-    def _quantize_value(self, value, locale, frac_prec):
+    def _quantize_value(self, value, locale, frac_prec, group_separator):
         quantum = get_decimal_quantum(frac_prec[1])
         rounded = value.quantize(quantum)
         a, sep, b = "{:f}".format(rounded).partition(".")
-        number = (self._format_int(a, self.int_prec[0],
-                                   self.int_prec[1], locale) +
-                  self._format_frac(b or '0', locale, frac_prec))
+        integer_part = a
+        if group_separator:
+            integer_part = self._format_int(a, self.int_prec[0], self.int_prec[1], locale)
+        number = integer_part + self._format_frac(b or '0', locale, frac_prec)
         return number
 
     def _format_frac(self, value, locale, force_frac=None):
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index a980a66ad..3db5f3307 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -153,6 +153,36 @@ def test_formatting_of_very_small_decimals(self):
         fmt = numbers.format_decimal(number, format="@@@", locale='en_US')
         self.assertEqual('0.000000700', fmt)
 
+    def test_group_separator(self):
+        self.assertEqual('29567.12', numbers.format_decimal(29567.12,
+                                                                     locale='en_US', group_separator=False))
+        self.assertEqual('29567,12', numbers.format_decimal(29567.12,
+                                                                     locale='fr_CA', group_separator=False))
+        self.assertEqual('29567,12', numbers.format_decimal(29567.12,
+                                                                     locale='pt_BR', group_separator=False))
+        self.assertEqual(u'$1099.98', numbers.format_currency(1099.98, 'USD',
+                                                             locale='en_US', group_separator=False))
+        self.assertEqual(u'101299,98\xa0€', numbers.format_currency(101299.98, 'EUR',
+                                                            locale='fr_CA', group_separator=False))
+        self.assertEqual('101299.98 euros', numbers.format_currency(101299.98, 'EUR',
+                                                            locale='en_US', group_separator=False, format_type='name'))
+        self.assertEqual(u'25123412\xa0%', numbers.format_percent(251234.1234, locale='sv_SE', group_separator=False))
+
+        self.assertEqual(u'29,567.12', numbers.format_decimal(29567.12,
+                                                            locale='en_US', group_separator=True))
+        self.assertEqual(u'29\u202f567,12', numbers.format_decimal(29567.12,
+                                                            locale='fr_CA', group_separator=True))
+        self.assertEqual(u'29.567,12', numbers.format_decimal(29567.12,
+                                                            locale='pt_BR', group_separator=True))
+        self.assertEqual(u'$1,099.98', numbers.format_currency(1099.98, 'USD',
+                                                              locale='en_US', group_separator=True))
+        self.assertEqual(u'101\u202f299,98\xa0\u20ac', numbers.format_currency(101299.98, 'EUR',
+                                                                    locale='fr_CA', group_separator=True))
+        self.assertEqual(u'101,299.98 euros', numbers.format_currency(101299.98, 'EUR',
+                                                                    locale='en_US', group_separator=True,
+                                                                    format_type='name'))
+        self.assertEqual(u'25\xa0123\xa0412\xa0%', numbers.format_percent(251234.1234, locale='sv_SE', group_separator=True))
+
 
 class NumberParsingTestCase(unittest.TestCase):
 

From 044416707f9effbe77582779a09ae9e37a0f6ffd Mon Sep 17 00:00:00 2001
From: Nikiforov Konstantin <kostya.nik.3854@gmail.com>
Date: Wed, 30 Sep 2020 20:17:16 +0500
Subject: [PATCH 463/489] LazyProxy: Handle AttributeError in specified func
 (#724)

Fixes #723

Co-authored-by: Aarni Koskela <akx@iki.fi>
---
 babel/support.py      | 12 ++++++++++--
 tests/test_support.py | 11 +++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/babel/support.py b/babel/support.py
index efe41d562..47f812d8a 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -165,7 +165,7 @@ class LazyProxy(object):
     Hello, universe!
     Hello, world!
     """
-    __slots__ = ['_func', '_args', '_kwargs', '_value', '_is_cache_enabled']
+    __slots__ = ['_func', '_args', '_kwargs', '_value', '_is_cache_enabled', '_attribute_error']
 
     def __init__(self, func, *args, **kwargs):
         is_cache_enabled = kwargs.pop('enable_cache', True)
@@ -175,11 +175,17 @@ def __init__(self, func, *args, **kwargs):
         object.__setattr__(self, '_kwargs', kwargs)
         object.__setattr__(self, '_is_cache_enabled', is_cache_enabled)
         object.__setattr__(self, '_value', None)
+        object.__setattr__(self, '_attribute_error', None)
 
     @property
     def value(self):
         if self._value is None:
-            value = self._func(*self._args, **self._kwargs)
+            try:
+                value = self._func(*self._args, **self._kwargs)
+            except AttributeError as error:
+                object.__setattr__(self, '_attribute_error', error)
+                raise
+
             if not self._is_cache_enabled:
                 return value
             object.__setattr__(self, '_value', value)
@@ -249,6 +255,8 @@ def __delattr__(self, name):
         delattr(self.value, name)
 
     def __getattr__(self, name):
+        if self._attribute_error is not None:
+            raise self._attribute_error
         return getattr(self.value, name)
 
     def __setattr__(self, name, value):
diff --git a/tests/test_support.py b/tests/test_support.py
index b4dd823cd..1b74ae8bc 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -279,6 +279,17 @@ def first(xs):
         self.assertEqual(2, proxy.value)
         self.assertEqual(1, proxy_deepcopy.value)
 
+    def test_handle_attribute_error(self):
+
+        def raise_attribute_error():
+            raise AttributeError('message')
+
+        proxy = support.LazyProxy(raise_attribute_error)
+        with pytest.raises(AttributeError) as exception:
+            proxy.value
+
+        self.assertEqual('message', str(exception.value))
+
 
 def test_format_date():
     fmt = support.Format('en_US')

From 3e6d9a70e11041ad6737630281098866462ed1e3 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 1 Oct 2020 15:54:08 +0300
Subject: [PATCH 464/489] Switch downloader to CLDR 37

---
 scripts/download_import_cldr.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index 434b04f80..531a04c62 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -13,9 +13,9 @@
     from urllib import urlretrieve
 
 
-URL = 'http://unicode.org/Public/cldr/36/core.zip'
-FILENAME = 'cldr-core-36.zip'
-FILESUM = '07279e56c1f4266d140b907ef3ec379dce0a99542303a9628562ac5fe460ba43'
+URL = 'http://unicode.org/Public/cldr/37/core.zip'
+FILENAME = 'cldr-core-37.zip'
+FILESUM = 'ba93f5ba256a61a6f8253397c6c4b1a9b9e77531f013cc7ffa7977b5f7e4da57'
 BLKSIZE = 131072
 
 

From 462444f35756551f83809dab7f7424a907033a9e Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 1 Oct 2020 16:27:02 +0300
Subject: [PATCH 465/489] Adapt things to new compound pattern format

---
 babel/units.py         |  9 ++++++---
 scripts/import_cldr.py | 20 +++++++++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/babel/units.py b/babel/units.py
index 89c491365..07637358c 100644
--- a/babel/units.py
+++ b/babel/units.py
@@ -75,8 +75,10 @@ def format_unit(value, measurement_unit, length='long', format=None, locale=LC_N
     u'12 metri'
     >>> format_unit(15.5, 'length-mile', locale='fi_FI')
     u'15,5 mailia'
-    >>> format_unit(1200, 'pressure-inch-hg', locale='nb')
-    u'1\\xa0200 tommer kvikks\\xf8lv'
+    >>> format_unit(1200, 'pressure-millimeter-ofhg', locale='nb')
+    u'1\\xa0200 millimeter kvikks\\xf8lv'
+    >>> format_unit(270, 'ton', locale='en')
+    u'270 tons'
 
     Number formats may be overridden with the ``format`` parameter.
 
@@ -271,6 +273,7 @@ def format_compound_unit(
     else:  # Bare denominator
         formatted_denominator = format_decimal(denominator_value, format=format, locale=locale)
 
-    per_pattern = locale._data["compound_unit_patterns"].get("per", {}).get(length, "{0}/{1}")
+    # TODO: this doesn't support "compound_variations" (or "prefix"), and will fall back to the "x/y" representation
+    per_pattern = locale._data["compound_unit_patterns"].get("per", {}).get(length, {}).get("compound", "{0}/{1}")
 
     return per_pattern.format(formatted_numerator, formatted_denominator)
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 7ea6481a2..aab2888e1 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -853,9 +853,23 @@ def parse_unit_patterns(data, tree):
 
         for unit in elem.findall('compoundUnit'):
             unit_type = unit.attrib['type']
-            compound_patterns.setdefault(unit_type, {})[unit_length_type] = (
-                _text(unit.find('compoundUnitPattern'))
-            )
+            compound_unit_info = {}
+            compound_variations = {}
+            for child in unit.getchildren():
+                if child.tag == "unitPrefixPattern":
+                    compound_unit_info['prefix'] = _text(child)
+                elif child.tag == "compoundUnitPattern":
+                    compound_variations[None] = _text(child)
+                elif child.tag == "compoundUnitPattern1":
+                    compound_variations[child.attrib.get('count')] = _text(child)
+            if compound_variations:
+                compound_variation_values = set(compound_variations.values())
+                if len(compound_variation_values) == 1:
+                    # shortcut: if all compound variations are the same, only store one
+                    compound_unit_info['compound'] = next(iter(compound_variation_values))
+                else:
+                    compound_unit_info['compound_variations'] = compound_variations
+            compound_patterns.setdefault(unit_type, {})[unit_length_type] = compound_unit_info
 
 
 def parse_date_fields(data, tree):

From 31abefa1009ee8f176a7fcd9311935ea806bc1a0 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 2 Oct 2020 10:56:37 +0300
Subject: [PATCH 466/489] Correct default timedelta format to 'long'

Augments 9327e0824a1bbed538e73d42b971988f8214b490
---
 babel/support.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/support.py b/babel/support.py
index 47f812d8a..8d905ed64 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -79,7 +79,7 @@ def time(self, time=None, format='medium'):
         return format_time(time, format, tzinfo=self.tzinfo, locale=self.locale)
 
     def timedelta(self, delta, granularity='second', threshold=.85,
-                  format='medium', add_direction=False):
+                  format='long', add_direction=False):
         """Return a time delta according to the rules of the given locale.
 
         >>> from datetime import timedelta

From acf1caeed35c180ce7c14f822a23ab297931feab Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 2 Oct 2020 10:56:59 +0300
Subject: [PATCH 467/489] Skip deprecated l*gettext functions on Python 3.8+

---
 tests/test_support.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/test_support.py b/tests/test_support.py
index 1b74ae8bc..966cb4e62 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -17,6 +17,7 @@
 import tempfile
 import unittest
 import pytest
+import sys
 from datetime import date, datetime, timedelta
 
 from babel import support
@@ -26,6 +27,7 @@
 
 get_arg_spec = (inspect.getargspec if PY2 else inspect.getfullargspec)
 
+SKIP_LGETTEXT = sys.version_info >= (3, 8)
 
 @pytest.mark.usefixtures("os_environ")
 class TranslationsTestCase(unittest.TestCase):
@@ -76,6 +78,7 @@ def test_upgettext(self):
         self.assertEqualTypeToo(u'VohCTX', self.translations.upgettext('foo',
                                                                        'foo'))
 
+    @pytest.mark.skipif(SKIP_LGETTEXT, reason="lgettext is deprecated")
     def test_lpgettext(self):
         self.assertEqualTypeToo(b'Voh', self.translations.lgettext('foo'))
         self.assertEqualTypeToo(b'VohCTX', self.translations.lpgettext('foo',
@@ -105,6 +108,7 @@ def test_unpgettext(self):
                                 self.translations.unpgettext('foo', 'foo1',
                                                              'foos1', 2))
 
+    @pytest.mark.skipif(SKIP_LGETTEXT, reason="lgettext is deprecated")
     def test_lnpgettext(self):
         self.assertEqualTypeToo(b'Voh1',
                                 self.translations.lngettext('foo1', 'foos1', 1))
@@ -129,6 +133,7 @@ def test_dupgettext(self):
         self.assertEqualTypeToo(
             u'VohCTXD', self.translations.dupgettext('messages1', 'foo', 'foo'))
 
+    @pytest.mark.skipif(SKIP_LGETTEXT, reason="lgettext is deprecated")
     def test_ldpgettext(self):
         self.assertEqualTypeToo(
             b'VohD', self.translations.ldgettext('messages1', 'foo'))
@@ -159,6 +164,7 @@ def test_dunpgettext(self):
             u'VohsCTXD1', self.translations.dunpgettext('messages1', 'foo', 'foo1',
                                                         'foos1', 2))
 
+    @pytest.mark.skipif(SKIP_LGETTEXT, reason="lgettext is deprecated")
     def test_ldnpgettext(self):
         self.assertEqualTypeToo(
             b'VohD1', self.translations.ldngettext('messages1', 'foo1', 'foos1', 1))
@@ -197,7 +203,11 @@ def setUp(self):
         self.null_translations = support.NullTranslations(fp=fp)
 
     def method_names(self):
-        return [name for name in dir(self.translations) if 'gettext' in name]
+        names = [name for name in dir(self.translations) if 'gettext' in name]
+        if SKIP_LGETTEXT:
+            # Remove deprecated l*gettext functions
+            names = [name for name in names if not name.startswith('l')]
+        return names
 
     def test_same_methods(self):
         for name in self.method_names():

From 2b615f7ea7d3c1383e26d1cea402f43895750843 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 2 Oct 2020 12:29:48 +0300
Subject: [PATCH 468/489] Ignore lack of coverage on lines that e.g. raise
 warnings

---
 .coveragerc | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 000000000..a3d8ae65e
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,5 @@
+[report]
+exclude_lines =
+    NotImplemented
+    pragma: no cover
+    warnings.warn
\ No newline at end of file

From 78c42824a61427aa73ebfa6ad5e35da16030671d Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 2 Oct 2020 12:35:56 +0300
Subject: [PATCH 469/489] Use 'if not' instead of 'if ... is False' for
 no_fuzzy_matching

Matches the behavior elsewhere in the same function

Fixes #698
---
 babel/messages/catalog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 2fcb461a8..ed9e9a062 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -807,7 +807,7 @@ def _merge(message, oldkey, newkey):
                 if key in messages:
                     _merge(message, key, key)
                 else:
-                    if no_fuzzy_matching is False:
+                    if not no_fuzzy_matching:
                         # do some fuzzy matching with difflib
                         if isinstance(key, tuple):
                             matchkey = key[0]  # just the msgid, no context

From 77a3d2f2a4b897c5a9d09a2cbe7159bf7ef37f0c Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sun, 1 Nov 2020 12:37:36 -0800
Subject: [PATCH 470/489] Remove deprecated 'sudo: false' from Travis
 configuraiton

https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9650f674c..0aebbf982 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,6 @@
 dist: xenial
 language: python
 
-# Use travis docker infrastructure for greater speed
-sudo: false
-
 cache:
   directories:
   - cldr

From 53153419972aef6e5c06c6cc1c58896de6b2a281 Mon Sep 17 00:00:00 2001
From: Alessio Bogon <youtux@users.noreply.github.com>
Date: Tue, 10 Nov 2020 10:34:57 +0100
Subject: [PATCH 471/489] Handle ZoneInfo objects in get_timezone_location,
 get_timezone_name (#741)

Fixes #740
---
 .travis.yml         |   2 +-
 babel/dates.py      |  26 +++++----
 tests/test_dates.py | 129 ++++++++++++++++++++++++++++++--------------
 tox.ini             |   1 +
 4 files changed, 108 insertions(+), 50 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0aebbf982..e7401cc4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ matrix:
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
-  - pip install --upgrade $CDECIMAL pytest==4.3.1 pytest-cov==2.6.1 freezegun==0.3.12
+  - pip install --upgrade $CDECIMAL pytest==4.3.1 pytest-cov==2.6.1 freezegun==0.3.12 'backports.zoneinfo;python_version>="3.6" and python_version<"3.9"'
   - pip install --editable .
 
 script:
diff --git a/babel/dates.py b/babel/dates.py
index f1bd66faf..1775029fa 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -76,6 +76,21 @@ def _get_dt_and_tzinfo(dt_or_tzinfo):
     return dt, tzinfo
 
 
+def _get_tz_name(dt_or_tzinfo):
+    """
+    Get the timezone name out of a time, datetime, or tzinfo object.
+
+    :rtype: str
+    """
+    dt, tzinfo = _get_dt_and_tzinfo(dt_or_tzinfo)
+    if hasattr(tzinfo, 'zone'):  # pytz object
+        return tzinfo.zone
+    elif hasattr(tzinfo, 'key') and tzinfo.key is not None:  # ZoneInfo object
+        return tzinfo.key
+    else:
+        return tzinfo.tzname(dt or datetime.utcnow())
+
+
 def _get_datetime(instant):
     """
     Get a datetime out of an "instant" (date, time, datetime, number).
@@ -500,13 +515,9 @@ def get_timezone_location(dt_or_tzinfo=None, locale=LC_TIME, return_city=False):
     :return: the localized timezone name using location format
 
     """
-    dt, tzinfo = _get_dt_and_tzinfo(dt_or_tzinfo)
     locale = Locale.parse(locale)
 
-    if hasattr(tzinfo, 'zone'):
-        zone = tzinfo.zone
-    else:
-        zone = tzinfo.tzname(dt or datetime.utcnow())
+    zone = _get_tz_name(dt_or_tzinfo)
 
     # Get the canonical time-zone code
     zone = get_global('zone_aliases').get(zone, zone)
@@ -619,10 +630,7 @@ def get_timezone_name(dt_or_tzinfo=None, width='long', uncommon=False,
     dt, tzinfo = _get_dt_and_tzinfo(dt_or_tzinfo)
     locale = Locale.parse(locale)
 
-    if hasattr(tzinfo, 'zone'):
-        zone = tzinfo.zone
-    else:
-        zone = tzinfo.tzname(dt)
+    zone = _get_tz_name(dt_or_tzinfo)
 
     if zone_variant is None:
         if dt is None:
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 5be0d16a1..423f737de 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -24,6 +24,23 @@
 from babel.util import FixedOffsetTimezone
 
 
+@pytest.fixture(params=["pytz.timezone", "zoneinfo.ZoneInfo"])
+def timezone_getter(request):
+    if request.param == "pytz.timezone":
+        return timezone
+    elif request.param == "zoneinfo.ZoneInfo":
+        try:
+            import zoneinfo
+        except ImportError:
+            try:
+                from backports import zoneinfo
+            except ImportError:
+                pytest.skip("zoneinfo not available")
+        return zoneinfo.ZoneInfo
+    else:
+        raise NotImplementedError
+
+
 class DateTimeFormatTestCase(unittest.TestCase):
 
     def test_quarter_format(self):
@@ -583,8 +600,8 @@ def test_get_timezone_gmt():
     assert dates.get_timezone_gmt(dt, 'long', locale='fr_FR') == u'UTC-07:00'
 
 
-def test_get_timezone_location():
-    tz = timezone('America/St_Johns')
+def test_get_timezone_location(timezone_getter):
+    tz = timezone_getter('America/St_Johns')
     assert (dates.get_timezone_location(tz, locale='de_DE') ==
             u"Kanada (St. John\u2019s) Zeit")
     assert (dates.get_timezone_location(tz, locale='en') ==
@@ -592,51 +609,83 @@ def test_get_timezone_location():
     assert (dates.get_timezone_location(tz, locale='en', return_city=True) ==
             u'St. John’s')
 
-    tz = timezone('America/Mexico_City')
+    tz = timezone_getter('America/Mexico_City')
     assert (dates.get_timezone_location(tz, locale='de_DE') ==
             u'Mexiko (Mexiko-Stadt) Zeit')
 
-    tz = timezone('Europe/Berlin')
+    tz = timezone_getter('Europe/Berlin')
     assert (dates.get_timezone_location(tz, locale='de_DE') ==
             u'Deutschland (Berlin) Zeit')
 
 
-def test_get_timezone_name():
-    dt = time(15, 30, tzinfo=timezone('America/Los_Angeles'))
-    assert (dates.get_timezone_name(dt, locale='en_US') ==
-            u'Pacific Standard Time')
-    assert (dates.get_timezone_name(dt, locale='en_US', return_zone=True) ==
-            u'America/Los_Angeles')
-    assert dates.get_timezone_name(dt, width='short', locale='en_US') == u'PST'
-
-    tz = timezone('America/Los_Angeles')
-    assert dates.get_timezone_name(tz, locale='en_US') == u'Pacific Time'
-    assert dates.get_timezone_name(tz, 'short', locale='en_US') == u'PT'
-
-    tz = timezone('Europe/Berlin')
-    assert (dates.get_timezone_name(tz, locale='de_DE') ==
-            u'Mitteleurop\xe4ische Zeit')
-    assert (dates.get_timezone_name(tz, locale='pt_BR') ==
-            u'Hor\xe1rio da Europa Central')
-
-    tz = timezone('America/St_Johns')
-    assert dates.get_timezone_name(tz, locale='de_DE') == u'Neufundland-Zeit'
-
-    tz = timezone('America/Los_Angeles')
-    assert dates.get_timezone_name(tz, locale='en', width='short',
-                                   zone_variant='generic') == u'PT'
-    assert dates.get_timezone_name(tz, locale='en', width='short',
-                                   zone_variant='standard') == u'PST'
-    assert dates.get_timezone_name(tz, locale='en', width='short',
-                                   zone_variant='daylight') == u'PDT'
-    assert dates.get_timezone_name(tz, locale='en', width='long',
-                                   zone_variant='generic') == u'Pacific Time'
-    assert dates.get_timezone_name(tz, locale='en', width='long',
-                                   zone_variant='standard') == u'Pacific Standard Time'
-    assert dates.get_timezone_name(tz, locale='en', width='long',
-                                   zone_variant='daylight') == u'Pacific Daylight Time'
-
-    localnow = datetime.utcnow().replace(tzinfo=timezone('UTC')).astimezone(dates.LOCALTZ)
+@pytest.mark.parametrize(
+    "tzname, params, expected",
+    [
+        ("America/Los_Angeles", {"locale": "en_US"}, u"Pacific Time"),
+        ("America/Los_Angeles", {"width": "short", "locale": "en_US"}, u"PT"),
+        ("Europe/Berlin", {"locale": "de_DE"}, u"Mitteleurop\xe4ische Zeit"),
+        ("Europe/Berlin", {"locale": "pt_BR"}, u"Hor\xe1rio da Europa Central"),
+        ("America/St_Johns", {"locale": "de_DE"}, u"Neufundland-Zeit"),
+        (
+            "America/Los_Angeles",
+            {"locale": "en", "width": "short", "zone_variant": "generic"},
+            u"PT",
+        ),
+        (
+            "America/Los_Angeles",
+            {"locale": "en", "width": "short", "zone_variant": "standard"},
+            u"PST",
+        ),
+        (
+            "America/Los_Angeles",
+            {"locale": "en", "width": "short", "zone_variant": "daylight"},
+            u"PDT",
+        ),
+        (
+            "America/Los_Angeles",
+            {"locale": "en", "width": "long", "zone_variant": "generic"},
+            u"Pacific Time",
+        ),
+        (
+            "America/Los_Angeles",
+            {"locale": "en", "width": "long", "zone_variant": "standard"},
+            u"Pacific Standard Time",
+        ),
+        (
+            "America/Los_Angeles",
+            {"locale": "en", "width": "long", "zone_variant": "daylight"},
+            u"Pacific Daylight Time",
+        ),
+        ("Europe/Berlin", {"locale": "en_US"}, u"Central European Time"),
+    ],
+)
+def test_get_timezone_name_tzinfo(timezone_getter, tzname, params, expected):
+    tz = timezone_getter(tzname)
+    assert dates.get_timezone_name(tz, **params) == expected
+
+
+@pytest.mark.parametrize("timezone_getter", ["pytz.timezone"], indirect=True)
+@pytest.mark.parametrize(
+    "tzname, params, expected",
+    [
+        ("America/Los_Angeles", {"locale": "en_US"}, u"Pacific Standard Time"),
+        (
+            "America/Los_Angeles",
+            {"locale": "en_US", "return_zone": True},
+            u"America/Los_Angeles",
+        ),
+        ("America/Los_Angeles", {"width": "short", "locale": "en_US"}, u"PST"),
+    ],
+)
+def test_get_timezone_name_time_pytz(timezone_getter, tzname, params, expected):
+    """pytz (by design) can't determine if the time is in DST or not,
+    so it will always return Standard time"""
+    dt = time(15, 30, tzinfo=timezone_getter(tzname))
+    assert dates.get_timezone_name(dt, **params) == expected
+
+
+def test_get_timezone_name_misc(timezone_getter):
+    localnow = datetime.utcnow().replace(tzinfo=timezone_getter('UTC')).astimezone(dates.LOCALTZ)
     assert (dates.get_timezone_name(None, locale='en_US') ==
             dates.get_timezone_name(localnow, locale='en_US'))
 
diff --git a/tox.ini b/tox.ini
index eccffea94..c069c5942 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ deps =
     pytest-cov==2.6.1
     cdecimal: m3-cdecimal
     freezegun==0.3.12
+    backports.zoneinfo;python_version>"3.6" and python_version<"3.9"
 whitelist_externals = make
 commands = make clean-cldr test
 passenv = PYTHON_TEST_FLAGS

From 6e29f11234a046fca4716b8804f8cd62c7b51166 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 10:35:35 +0200
Subject: [PATCH 472/489] Py.test 6 support (#752)

* Support Py.test 6+

* Run CI on Py.test 6 on new Pythons
---
 .travis.yml | 18 +++++++++++++++++-
 conftest.py |  3 +++
 tox.ini     |  5 +++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e7401cc4f..7f7331be5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,33 +11,49 @@ matrix:
   include:
     - os: linux
       python: 2.7
+      env:
+      - PYTEST_VERSION=4.3.1
     - os: linux
       python: 2.7
       env:
       - CDECIMAL=m3-cdecimal
+      - PYTEST_VERSION=4.3.1
     - os: linux
       dist: trusty
       python: pypy
+      env:
+      - PYTEST_VERSION=4.3.1
     - os: linux
       dist: trusty
       python: pypy3
+      env:
+      - PYTEST_VERSION=6.1.2
     - os: linux
       python: 3.4
+      env:
+      - PYTEST_VERSION=4.3.1
     - os: linux
       python: 3.5
       env:
       - PYTHON_TEST_FLAGS=-bb
+      - PYTEST_VERSION=6.1.2
     - os: linux
       python: 3.6
+      env:
+      - PYTEST_VERSION=6.1.2
     - os: linux
       python: 3.7
+      env:
+      - PYTEST_VERSION=6.1.2
     - os: linux
       python: 3.8
+      env:
+      - PYTEST_VERSION=6.1.2
 
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
-  - pip install --upgrade $CDECIMAL pytest==4.3.1 pytest-cov==2.6.1 freezegun==0.3.12 'backports.zoneinfo;python_version>="3.6" and python_version<"3.9"'
+  - pip install --upgrade $CDECIMAL pytest==$PYTEST_VERSION pytest-cov freezegun==0.3.12 'backports.zoneinfo;python_version>="3.6" and python_version<"3.9"'
   - pip install --editable .
 
 script:
diff --git a/conftest.py b/conftest.py
index 32bd1362a..bd9f2d32d 100644
--- a/conftest.py
+++ b/conftest.py
@@ -8,4 +8,7 @@
 def pytest_collect_file(path, parent):
     if babel_path.common(path) == babel_path:
         if path.ext == ".py":
+            # TODO: remove check when dropping support for old Pytest
+            if hasattr(DoctestModule, "from_parent"):
+                return DoctestModule.from_parent(parent, fspath=path)
             return DoctestModule(path, parent)
diff --git a/tox.ini b/tox.ini
index c069c5942..27faf5bbb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,8 +3,9 @@ envlist = py27, pypy, py34, py35, py36, py37, pypy3, py27-cdecimal
 
 [testenv]
 deps =
-    pytest==4.3.1
-    pytest-cov==2.6.1
+    pytest==4.3.1;python_version<"3.5"
+    pytest==6.1.2;python_version>="3.5"
+    pytest-cov
     cdecimal: m3-cdecimal
     freezegun==0.3.12
     backports.zoneinfo;python_version>"3.6" and python_version<"3.9"

From 99cc2c6fba08939dc8693ac0ae53c6046cc92459 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 10:35:35 +0200
Subject: [PATCH 473/489] Py.test 6 support (#752)

* Support Py.test 6+

* Run CI on Py.test 6 on new Pythons

Cherry-pick of commit 6e29f11
---
 .travis.yml | 18 +++++++++++++++++-
 conftest.py |  3 +++
 tox.ini     |  5 +++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9650f674c..495aa2721 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,33 +14,49 @@ matrix:
   include:
     - os: linux
       python: 2.7
+      env:
+      - PYTEST_VERSION=4.3.1
     - os: linux
       python: 2.7
       env:
       - CDECIMAL=m3-cdecimal
+      - PYTEST_VERSION=4.3.1
     - os: linux
       dist: trusty
       python: pypy
+      env:
+      - PYTEST_VERSION=4.3.1
     - os: linux
       dist: trusty
       python: pypy3
+      env:
+      - PYTEST_VERSION=6.1.2
     - os: linux
       python: 3.4
+      env:
+      - PYTEST_VERSION=4.3.1
     - os: linux
       python: 3.5
       env:
       - PYTHON_TEST_FLAGS=-bb
+      - PYTEST_VERSION=6.1.2
     - os: linux
       python: 3.6
+      env:
+      - PYTEST_VERSION=6.1.2
     - os: linux
       python: 3.7
+      env:
+      - PYTEST_VERSION=6.1.2
     - os: linux
       python: 3.8
+      env:
+      - PYTEST_VERSION=6.1.2
 
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip
-  - pip install --upgrade $CDECIMAL pytest==4.3.1 pytest-cov==2.6.1 freezegun==0.3.12
+  - pip install --upgrade $CDECIMAL pytest==$PYTEST_VERSION pytest-cov freezegun==0.3.12
   - pip install --editable .
 
 script:
diff --git a/conftest.py b/conftest.py
index 32bd1362a..bd9f2d32d 100644
--- a/conftest.py
+++ b/conftest.py
@@ -8,4 +8,7 @@
 def pytest_collect_file(path, parent):
     if babel_path.common(path) == babel_path:
         if path.ext == ".py":
+            # TODO: remove check when dropping support for old Pytest
+            if hasattr(DoctestModule, "from_parent"):
+                return DoctestModule.from_parent(parent, fspath=path)
             return DoctestModule(path, parent)
diff --git a/tox.ini b/tox.ini
index eccffea94..cda03a292 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,8 +3,9 @@ envlist = py27, pypy, py34, py35, py36, py37, pypy3, py27-cdecimal
 
 [testenv]
 deps =
-    pytest==4.3.1
-    pytest-cov==2.6.1
+    pytest==4.3.1;python_version<"3.5"
+    pytest==6.1.2;python_version>="3.5"
+    pytest-cov
     cdecimal: m3-cdecimal
     freezegun==0.3.12
 whitelist_externals = make

From d77fe5d3275f5cf9774fa6c9bf097b466ddb6473 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 11:27:00 +0200
Subject: [PATCH 474/489] Distill changelog

---
 CHANGES | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES b/CHANGES
index 4441f68e7..c694ec8c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,16 @@
 Babel Changelog
 ===============
 
+Version 2.8.1
+-------------
+
+This is solely a patch release to make running tests on Py.test 6+ possible.
+
+Bugfixes
+~~~~~~~~
+
+* Support Py.test 6 - Aarni Koskela (#747, #750, #752)
+
 Version 2.8.0
 -------------
 

From bd836a4ac51958c083ff13ea02f8c18b7c0f4e2d Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 11:27:58 +0200
Subject: [PATCH 475/489] Bump copyright year from 2019 to 2020

---
 LICENSE                         | 2 +-
 babel/__init__.py               | 2 +-
 babel/core.py                   | 2 +-
 babel/dates.py                  | 2 +-
 babel/lists.py                  | 2 +-
 babel/localedata.py             | 2 +-
 babel/localtime/__init__.py     | 2 +-
 babel/messages/__init__.py      | 2 +-
 babel/messages/catalog.py       | 2 +-
 babel/messages/checkers.py      | 2 +-
 babel/messages/extract.py       | 2 +-
 babel/messages/frontend.py      | 2 +-
 babel/messages/jslexer.py       | 2 +-
 babel/messages/mofile.py        | 2 +-
 babel/messages/plurals.py       | 2 +-
 babel/messages/pofile.py        | 2 +-
 babel/numbers.py                | 2 +-
 babel/plural.py                 | 2 +-
 babel/support.py                | 2 +-
 babel/util.py                   | 2 +-
 docs/conf.py                    | 2 +-
 scripts/dump_data.py            | 2 +-
 scripts/dump_global.py          | 2 +-
 scripts/import_cldr.py          | 2 +-
 tests/messages/test_catalog.py  | 2 +-
 tests/messages/test_checkers.py | 2 +-
 tests/messages/test_extract.py  | 2 +-
 tests/messages/test_frontend.py | 2 +-
 tests/messages/test_mofile.py   | 2 +-
 tests/messages/test_plurals.py  | 2 +-
 tests/messages/test_pofile.py   | 2 +-
 tests/test_core.py              | 2 +-
 tests/test_dates.py             | 2 +-
 tests/test_localedata.py        | 2 +-
 tests/test_numbers.py           | 2 +-
 tests/test_plural.py            | 2 +-
 tests/test_support.py           | 2 +-
 tests/test_util.py              | 2 +-
 38 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/LICENSE b/LICENSE
index 10722cc18..7e2f12e46 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2019 by the Babel Team, see AUTHORS for more information.
+Copyright (c) 2013-2020 by the Babel Team, see AUTHORS for more information.
 
 All rights reserved.
 
diff --git a/babel/__init__.py b/babel/__init__.py
index c10a8bd1f..12674e051 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -13,7 +13,7 @@
        access to various locale display names, localized number and date
        formatting, etc.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/core.py b/babel/core.py
index a80807a61..a0c35b4ea 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -5,7 +5,7 @@
 
     Core locale representation and locale data access.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/dates.py b/babel/dates.py
index f1bd66faf..dea365a7f 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -12,7 +12,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/lists.py b/babel/lists.py
index ab5a24c40..e0bd7ed7f 100644
--- a/babel/lists.py
+++ b/babel/lists.py
@@ -11,7 +11,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2015-2019 by the Babel Team.
+    :copyright: (c) 2015-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/localedata.py b/babel/localedata.py
index e012abbf2..f4771d1fd 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -8,7 +8,7 @@
     :note: The `Locale` class, which uses this module under the hood, provides a
            more convenient interface for accessing the locale data.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/localtime/__init__.py b/babel/localtime/__init__.py
index aefd8a3e7..8c9203a7b 100644
--- a/babel/localtime/__init__.py
+++ b/babel/localtime/__init__.py
@@ -6,7 +6,7 @@
     Babel specific fork of tzlocal to determine the local timezone
     of the system.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/__init__.py b/babel/messages/__init__.py
index 5b69675f3..77c79621b 100644
--- a/babel/messages/__init__.py
+++ b/babel/messages/__init__.py
@@ -5,7 +5,7 @@
 
     Support for ``gettext`` message catalogs.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 2fcb461a8..b9961086c 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -5,7 +5,7 @@
 
     Data structures for message catalogs.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py
index 8c1effaf5..29add9fce 100644
--- a/babel/messages/checkers.py
+++ b/babel/messages/checkers.py
@@ -7,7 +7,7 @@
 
     :since: version 0.9
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index e7d7ad70f..8f53fa298 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -13,7 +13,7 @@
     The main entry points into the extraction functionality are the functions
     `extract_from_dir` and `extract_from_file`.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 475605549..0b65a7c6b 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -5,7 +5,7 @@
 
     Frontends for the message extraction functionality.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 from __future__ import print_function
diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index ace0b47e0..f56c80d98 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -6,7 +6,7 @@
     A simple JavaScript 1.5 lexer which is used for the JavaScript
     extractor.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 from collections import namedtuple
diff --git a/babel/messages/mofile.py b/babel/messages/mofile.py
index dfd923d23..1ab3e4e9c 100644
--- a/babel/messages/mofile.py
+++ b/babel/messages/mofile.py
@@ -5,7 +5,7 @@
 
     Writing of files in the ``gettext`` MO (machine object) format.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
index 81234580d..4755cfcf9 100644
--- a/babel/messages/plurals.py
+++ b/babel/messages/plurals.py
@@ -5,7 +5,7 @@
 
     Plural form definitions.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index 93b0697c6..aff886d8e 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -6,7 +6,7 @@
     Reading and writing of files in the ``gettext`` PO (portable object)
     format.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/numbers.py b/babel/numbers.py
index cf819fc9a..e246baed7 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -12,7 +12,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 # TODO:
diff --git a/babel/plural.py b/babel/plural.py
index 1e2b2734b..3c9a3e614 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -5,7 +5,7 @@
 
     CLDR Plural support.  See UTS #35.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 import re
diff --git a/babel/support.py b/babel/support.py
index efe41d562..a8709e46d 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -8,7 +8,7 @@
 
     .. note: the code in this module is not used by Babel itself
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/util.py b/babel/util.py
index 73a90516f..35039c41f 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -5,7 +5,7 @@
 
     Various utility classes and functions.
 
-    :copyright: (c) 2013-2019 by the Babel Team.
+    :copyright: (c) 2013-2020 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/docs/conf.py b/docs/conf.py
index 83c5bf206..41d1049b8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,7 +44,7 @@
 
 # General information about the project.
 project = u'Babel'
-copyright = u'2019, The Babel Team'
+copyright = u'2020, The Babel Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/scripts/dump_data.py b/scripts/dump_data.py
index e452248d7..57439b98f 100755
--- a/scripts/dump_data.py
+++ b/scripts/dump_data.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/scripts/dump_global.py b/scripts/dump_global.py
index 8db55f2dc..a27b31617 100755
--- a/scripts/dump_global.py
+++ b/scripts/dump_global.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 8993b68e4..f0558c239 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index f31dca310..2d9e31d00 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_checkers.py b/tests/messages/test_checkers.py
index ec845001e..bf813bc05 100644
--- a/tests/messages/test_checkers.py
+++ b/tests/messages/test_checkers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 2f41ddc2c..38979cd30 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index ad3ea0df3..38165b354 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_mofile.py b/tests/messages/test_mofile.py
index b1851f297..395b9fb1a 100644
--- a/tests/messages/test_mofile.py
+++ b/tests/messages/test_mofile.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py
index bdca8f6a8..62c770870 100644
--- a/tests/messages/test_plurals.py
+++ b/tests/messages/test_plurals.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index e77fa6e02..c8125f9d6 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_core.py b/tests/test_core.py
index c146aae9c..53b9d1875 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 5be0d16a1..16fda9cbc 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index dbacba0d5..83cd66994 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index a980a66ad..bda7bffba 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_plural.py b/tests/test_plural.py
index c54d07a57..1a9fbe507 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_support.py b/tests/test_support.py
index b4dd823cd..f9a552d16 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_util.py b/tests/test_util.py
index a6a4450cf..5b897aa7d 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2019 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which

From efa0d6d3d7f632ff398705d4f767d953226c16fd Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 11:28:06 +0200
Subject: [PATCH 476/489] Bump version to 2.8.1

---
 babel/__init__.py | 2 +-
 docs/conf.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index 12674e051..cbcb4fb2f 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.8.0'
+__version__ = '2.8.1'
diff --git a/docs/conf.py b/docs/conf.py
index 41d1049b8..7b5584a1a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '2.8'
 # The full version, including alpha/beta/rc tags.
-release = '2.8.0'
+release = '2.8.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From cef9189ce68c35f5790bf9ebb3ca13719bded696 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 14:42:18 +0200
Subject: [PATCH 477/489] Distill changelog

---
 AUTHORS |  9 ++++++++-
 CHANGES | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 31a5cd1be..9cf8f4e7d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,12 +25,13 @@ Babel is written and maintained by the Babel team and various contributors:
 - Sachin Paliwal
 - Alex Willmer
 - Daniel Neuhäuser
+- Miro Hrončok
 - Cédric Krier
 - Luke Plant
 - Jennifer Wang
 - Lukas Balaga
 - sudheesh001
-- Miro Hrončok
+- Niklas Hambüchen
 - Changaco
 - Xavier Fernandez
 - KO. Mattsson
@@ -45,6 +46,12 @@ Babel is written and maintained by the Babel team and various contributors:
 - Leonardo Pistone
 - Jun Omae
 - Hyunjun Kim
+- Alessio Bogon
+- Nikiforov Konstantin
+- Abdullah Javed Nesar
+- Brad Martin
+- Tyler Kennedy
+- CyanNani123
 - sebleblanc
 - He Chen
 - Steve (Gadget) Barnes
diff --git a/CHANGES b/CHANGES
index c694ec8c7..fbc73801f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,41 @@
 Babel Changelog
 ===============
 
+Version 2.9.0
+-------------
+
+Upcoming version support changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* This version, Babel 2.9, is the last version of Babel to support Python 2.7, Python 3.4, and Python 3.5.
+
+Improvements
+~~~~~~~~~~~~
+
+* CLDR: Use CLDR 37 – Aarni Koskela (#734)
+* Dates: Handle ZoneInfo objects in get_timezone_location, get_timezone_name - Alessio Bogon (#741)
+* Numbers: Add group_separator feature in number formatting - Abdullah Javed Nesar (#726)
+
+Bugfixes
+~~~~~~~~
+
+* Dates: Correct default Format().timedelta format to 'long' to mute deprecation warnings – Aarni Koskela
+* Import: Simplify iteration code in "import_cldr.py" – Felix Schwarz
+* Import: Stop using deprecated ElementTree methods "getchildren()" and "getiterator()" – Felix Schwarz
+* Messages: Fix unicode printing error on Python 2 without TTY. – Niklas Hambüchen
+* Messages: Introduce invariant that _invalid_pofile() takes unicode line. – Niklas Hambüchen
+* Tests: fix tests when using Python 3.9 – Felix Schwarz
+* Tests: Remove deprecated 'sudo: false' from Travis configuration – Jon Dufresne
+* Tests: Support Py.test 6.x – Aarni Koskela
+* Utilities: LazyProxy: Handle AttributeError in specified func – Nikiforov Konstantin (#724)
+* Utilities: Replace usage of parser.suite with ast.parse – Miro Hrončok
+
+Documentation
+~~~~~~~~~~~~~
+
+* Update parse_number comments – Brad Martin (#708)
+* Add __iter__ to Catalog documentation – @CyanNani123
+
 Version 2.8.1
 -------------
 

From 04090802f404ceca98844279750a1db0b0a4636d Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 15:14:52 +0200
Subject: [PATCH 478/489] Fix deprecated .getchildren() call

Augments 167b71421f113e2210e4deefef5020402492e5be
---
 scripts/import_cldr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 2977c6e40..8e5eebb95 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -855,7 +855,7 @@ def parse_unit_patterns(data, tree):
             unit_type = unit.attrib['type']
             compound_unit_info = {}
             compound_variations = {}
-            for child in unit.getchildren():
+            for child in unit:
                 if child.tag == "unitPrefixPattern":
                     compound_unit_info['prefix'] = _text(child)
                 elif child.tag == "compoundUnitPattern":

From 49e20930995a9feab35c918abe0cae2554e7e408 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 14:42:51 +0200
Subject: [PATCH 479/489] Travis: Test on Python 3.9

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7f7331be5..1bebe7f87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,10 @@ matrix:
       python: 3.8
       env:
       - PYTEST_VERSION=6.1.2
-
+    - os: linux
+      python: 3.9
+      env:
+      - PYTEST_VERSION=6.1.2
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
   - pip install --upgrade pip

From 9f6ea69f49fad04ece0611b856e0debfac2ae805 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 14:43:28 +0200
Subject: [PATCH 480/489] Bump version to 2.9.0

---
 babel/__init__.py | 2 +-
 docs/conf.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/babel/__init__.py b/babel/__init__.py
index cbcb4fb2f..ecb18b546 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.8.1'
+__version__ = '2.9.0'
diff --git a/docs/conf.py b/docs/conf.py
index 7b5584a1a..1c21c67cc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.8'
+version = '2.9'
 # The full version, including alpha/beta/rc tags.
-release = '2.8.1'
+release = '2.9.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 9a9d3c60ec05b346e87f2241b7ce976ed1a6bf0b Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 14:11:38 +0200
Subject: [PATCH 481/489] Use Freezegun in test_format_current_moment

The earlier patch resulted in `unsupported operand type(s) for -: 'datetime' and 'datetime'` on Pypy3.
---
 tests/test_dates.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/tests/test_dates.py b/tests/test_dates.py
index 48ed05c49..8e693d34c 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -15,6 +15,7 @@
 from datetime import date, datetime, time, timedelta
 import unittest
 
+import freezegun
 import pytest
 import pytz
 from pytz import timezone
@@ -809,19 +810,10 @@ def test_zh_TW_format():
     assert dates.format_time(datetime(2016, 4, 8, 12, 34, 56), locale='zh_TW') == u'\u4e0b\u534812:34:56'
 
 
-def test_format_current_moment(monkeypatch):
-    import datetime as datetime_module
+def test_format_current_moment():
     frozen_instant = datetime.utcnow()
-
-    class frozen_datetime(datetime):
-
-        @classmethod
-        def utcnow(cls):
-            return frozen_instant
-
-    # Freeze time! Well, some of it anyway.
-    monkeypatch.setattr(datetime_module, "datetime", frozen_datetime)
-    assert dates.format_datetime(locale="en_US") == dates.format_datetime(frozen_instant, locale="en_US")
+    with freezegun.freeze_time(time_to_freeze=frozen_instant):
+        assert dates.format_datetime(locale="en_US") == dates.format_datetime(frozen_instant, locale="en_US")
 
 
 @pytest.mark.all_locales

From 613dc1700f91c3d40b081948c0dd6023d8ece057 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 10 Nov 2020 14:54:31 +0200
Subject: [PATCH 482/489] Make the import warnings about unsupported number
 systems less verbose

---
 scripts/import_cldr.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 8e5eebb95..32e6abcb4 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -392,6 +392,7 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
         ]))
 
         data['locale_id'] = locale_id
+        data['unsupported_number_systems'] = set()
 
         if locale_id in plural_rules:
             data['plural_form'] = plural_rules[locale_id]
@@ -432,6 +433,13 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
         parse_character_order(data, tree)
         parse_measurement_systems(data, tree)
 
+        unsupported_number_systems_string = ', '.join(sorted(data.pop('unsupported_number_systems')))
+        if unsupported_number_systems_string:
+            log('%s: unsupported number systems were ignored: %s' % (
+                locale_id,
+                unsupported_number_systems_string,
+            ))
+
         write_datafile(data_filename, data, dump_json=dump_json)
 
 
@@ -440,21 +448,14 @@ def _should_skip_number_elem(data, elem):
     Figure out whether the numbering-containing element `elem` is in a currently
     non-supported (i.e. currently non-Latin) numbering system.
 
-    If it is, a warning is raised.
-
-    :param data: The root data element, for formatting the warning.
+    :param data: The root data element, for stashing the warning.
     :param elem: Element with `numberSystem` key
     :return: Boolean
     """
     number_system = elem.get('numberSystem', 'latn')
 
     if number_system != 'latn':
-        log('%s: Unsupported number system "%s" in <%s numberSystem="%s">' % (
-            data['locale_id'],
-            number_system,
-            elem.tag,
-            number_system,
-        ))
+        data['unsupported_number_systems'].add(number_system)
         return True
 
     return False

From 156b7fb9f377ccf58c71cf01dc69fb10c7b69314 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 15:24:16 +0200
Subject: [PATCH 483/489] Quiesce CLDR download progress bar if requested (or
 not a TTY)

---
 scripts/download_import_cldr.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/download_import_cldr.py b/scripts/download_import_cldr.py
index 531a04c62..805772a16 100755
--- a/scripts/download_import_cldr.py
+++ b/scripts/download_import_cldr.py
@@ -75,12 +75,13 @@ def main():
     cldr_path = os.path.join(repo, 'cldr', os.path.splitext(FILENAME)[0])
     zip_path = os.path.join(cldr_dl_path, FILENAME)
     changed = False
+    show_progress = (False if os.environ.get("BABEL_CLDR_NO_DOWNLOAD_PROGRESS") else sys.stdout.isatty())
 
     while not is_good_file(zip_path):
         log('Downloading \'%s\'', FILENAME)
         if os.path.isfile(zip_path):
             os.remove(zip_path)
-        urlretrieve(URL, zip_path, reporthook)
+        urlretrieve(URL, zip_path, (reporthook if show_progress else None))
         changed = True
         print()
     common_path = os.path.join(cldr_path, 'common')

From d1bbc08e845d03d8e1f0dfa0e04983d755f39cb5 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 11 Nov 2020 15:59:41 +0200
Subject: [PATCH 484/489] import_cldr: use logging; add -q option

---
 scripts/import_cldr.py | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 32e6abcb4..0dbd39369 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -17,6 +17,7 @@
 import os
 import re
 import sys
+import logging
 
 try:
     from xml.etree import cElementTree as ElementTree
@@ -62,16 +63,7 @@ def _text(elem):
     'timeFormats': 'time_formats'
 }
 
-
-def log(message, *args):
-    if args:
-        message = message % args
-    sys.stderr.write(message + '\r\n')
-    sys.stderr.flush()
-
-
-def error(message, *args):
-    log('ERROR: %s' % message, *args)
+log = logging.getLogger("import_cldr")
 
 
 def need_conversion(dst_filename, data_dict, source_filename):
@@ -182,10 +174,19 @@ def main():
         '-j', '--json', dest='dump_json', action='store_true', default=False,
         help='also export debugging JSON dumps of locale data'
     )
+    parser.add_option(
+        '-q', '--quiet', dest='quiet', action='store_true', default=bool(os.environ.get('BABEL_CLDR_QUIET')),
+        help='quiesce info/warning messages',
+    )
 
     options, args = parser.parse_args()
     if len(args) != 1:
         parser.error('incorrect number of arguments')
+
+    logging.basicConfig(
+        level=(logging.ERROR if options.quiet else logging.INFO),
+    )
+
     return process_data(
         srcdir=args[0],
         destdir=BABEL_PACKAGE_ROOT,
@@ -383,8 +384,10 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
             territory = '001'  # world
         regions = territory_containment.get(territory, [])
 
-        log('Processing %s (Language = %s; Territory = %s)',
-            filename, language, territory)
+        log.info(
+            'Processing %s (Language = %s; Territory = %s)',
+            filename, language, territory,
+        )
 
         locale_id = '_'.join(filter(None, [
             language,
@@ -435,7 +438,7 @@ def _process_local_datas(sup, srcdir, destdir, force=False, dump_json=False):
 
         unsupported_number_systems_string = ', '.join(sorted(data.pop('unsupported_number_systems')))
         if unsupported_number_systems_string:
-            log('%s: unsupported number systems were ignored: %s' % (
+            log.warning('%s: unsupported number systems were ignored: %s' % (
                 locale_id,
                 unsupported_number_systems_string,
             ))
@@ -687,7 +690,7 @@ def parse_calendar_date_formats(data, calendar):
                         text_type(elem.findtext('dateFormat/pattern'))
                     )
                 except ValueError as e:
-                    error(e)
+                    log.error(e)
             elif elem.tag == 'alias':
                 date_formats = Alias(_translate_alias(
                     ['date_formats'], elem.attrib['path'])
@@ -707,7 +710,7 @@ def parse_calendar_time_formats(data, calendar):
                         text_type(elem.findtext('timeFormat/pattern'))
                     )
                 except ValueError as e:
-                    error(e)
+                    log.error(e)
             elif elem.tag == 'alias':
                 time_formats = Alias(_translate_alias(
                     ['time_formats'], elem.attrib['path'])
@@ -726,7 +729,7 @@ def parse_calendar_datetime_skeletons(data, calendar):
                 try:
                     datetime_formats[type] = text_type(elem.findtext('dateTimeFormat/pattern'))
                 except ValueError as e:
-                    error(e)
+                    log.error(e)
             elif elem.tag == 'alias':
                 datetime_formats = Alias(_translate_alias(
                     ['datetime_formats'], elem.attrib['path'])

From 58de8342f865df88697a4a166191e880e3c84d82 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 10 Nov 2020 16:19:04 +0200
Subject: [PATCH 485/489] Replace Travis + Appveyor with GitHub Actions (WIP)

---
 .ci/appveyor.yml           | 38 --------------------
 .ci/deploy.linux.sh        |  4 ---
 .ci/deploy.osx.sh          |  4 ---
 .ci/deps.linux.sh          |  4 ---
 .ci/deps.osx.sh            | 11 ------
 .ci/run_with_env.cmd       | 47 ------------------------
 .github/workflows/test.yml | 38 ++++++++++++++++++++
 .travis.yml                | 74 --------------------------------------
 setup.py                   |  8 ++---
 tox.ini                    | 29 ++++++++-------
 10 files changed, 58 insertions(+), 199 deletions(-)
 delete mode 100644 .ci/appveyor.yml
 delete mode 100644 .ci/deploy.linux.sh
 delete mode 100644 .ci/deploy.osx.sh
 delete mode 100644 .ci/deps.linux.sh
 delete mode 100644 .ci/deps.osx.sh
 delete mode 100644 .ci/run_with_env.cmd
 create mode 100644 .github/workflows/test.yml
 delete mode 100644 .travis.yml

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
deleted file mode 100644
index 91758f415..000000000
--- a/.ci/appveyor.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-# From https://github.com/ogrisel/python-appveyor-demo/blob/master/appveyor.yml
-
-environment:
-  global:
-    # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
-    # /E:ON and /V:ON options are not enabled in the batch script intepreter
-    # See: https://stackoverflow.com/a/13751649
-    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\.ci\\run_with_env.cmd"
-
-  matrix:
-    - PYTHON: "C:\\Python35"
-      PYTHON_VERSION: "3.5.x"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python35-x64"
-      PYTHON_VERSION: "3.5.x"
-      PYTHON_ARCH: "64"
-
-branches:  # Only build official branches, PRs are built anyway.
-  only:
-    - master
-    - /release.*/
-
-install:
-  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  # Check that we have the expected version and architecture for Python
-  - "python --version"
-  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
-  # Build data files
-  - "pip install --upgrade pytest==4.3.1 pytest-cov==2.6.1 codecov freezegun==0.3.12"
-  - "pip install --editable ."
-  - "python setup.py import_cldr"
-
-build: false  # Not a C# project, build stuff at the test step instead.
-
-test_script:
-  - "%CMD_IN_ENV% python -m pytest --cov=babel"
-  - "codecov"
diff --git a/.ci/deploy.linux.sh b/.ci/deploy.linux.sh
deleted file mode 100644
index 4d59382d7..000000000
--- a/.ci/deploy.linux.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-set -x
-set -e
-
-bash <(curl -s https://codecov.io/bash)
diff --git a/.ci/deploy.osx.sh b/.ci/deploy.osx.sh
deleted file mode 100644
index c44550eff..000000000
--- a/.ci/deploy.osx.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-set -x
-set -e
-
-echo "Due to a bug in codecov, coverage cannot be deployed for Mac builds."
diff --git a/.ci/deps.linux.sh b/.ci/deps.linux.sh
deleted file mode 100644
index 13cc9e1ef..000000000
--- a/.ci/deps.linux.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-set -x
-set -e
-
-echo "No dependencies to install for linux."
diff --git a/.ci/deps.osx.sh b/.ci/deps.osx.sh
deleted file mode 100644
index b52a84f6d..000000000
--- a/.ci/deps.osx.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-set -e
-set -x
-
-# Install packages with brew
-brew update >/dev/null
-brew outdated pyenv || brew upgrade --quiet pyenv
-
-# Install required python version for this build
-pyenv install -ks $PYTHON_VERSION
-pyenv global $PYTHON_VERSION
-python --version
diff --git a/.ci/run_with_env.cmd b/.ci/run_with_env.cmd
deleted file mode 100644
index 0f5b8e097..000000000
--- a/.ci/run_with_env.cmd
+++ /dev/null
@@ -1,47 +0,0 @@
-:: To build extensions for 64 bit Python 3, we need to configure environment
-:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
-::
-:: To build extensions for 64 bit Python 2, we need to configure environment
-:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
-:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
-::
-:: 32 bit builds do not require specific environment configurations.
-::
-:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
-:: cmd interpreter, at least for (SDK v7.0)
-::
-:: More details at:
-:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
-:: https://stackoverflow.com/a/13751649
-::
-:: Author: Olivier Grisel
-:: License: CC0 1.0 Universal: https://creativecommons.org/publicdomain/zero/1.0/
-@ECHO OFF
-
-SET COMMAND_TO_RUN=%*
-SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
-
-SET MAJOR_PYTHON_VERSION="%PYTHON_VERSION:~0,1%"
-IF %MAJOR_PYTHON_VERSION% == "2" (
-    SET WINDOWS_SDK_VERSION="v7.0"
-) ELSE IF %MAJOR_PYTHON_VERSION% == "3" (
-    SET WINDOWS_SDK_VERSION="v7.1"
-) ELSE (
-    ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
-    EXIT 1
-)
-
-IF "%PYTHON_ARCH%"=="64" (
-    ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
-    SET DISTUTILS_USE_SDK=1
-    SET MSSdk=1
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
-    "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-) ELSE (
-    ECHO Using default MSVC build environment for 32 bit architecture
-    ECHO Executing: %COMMAND_TO_RUN%
-    call %COMMAND_TO_RUN% || EXIT 1
-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..e9c411862
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,38 @@
+name: Test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, windows-2019, macos-10.15]
+        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        exclude:
+          - os: windows-2019
+            python-version: pypy3
+            # TODO: Remove this; see:
+            #       https://github.com/actions/setup-python/issues/151
+            #       https://github.com/tox-dev/tox/issues/1704
+            #       https://foss.heptapod.net/pypy/pypy/-/issues/3331
+    env:
+      BABEL_CLDR_NO_DOWNLOAD_PROGRESS: "1"
+      BABEL_CLDR_QUIET: "1"
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools wheel
+        python -m pip install tox tox-gh-actions==2.1.0
+    - name: Run test via Tox
+      run: tox --skip-missing-interpreters
+    - uses: codecov/codecov-action@v1
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 1bebe7f87..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-dist: xenial
-language: python
-
-cache:
-  directories:
-  - cldr
-  - "$HOME/.cache/pip"
-  - "$HOME/.pyenv"
-
-matrix:
-  include:
-    - os: linux
-      python: 2.7
-      env:
-      - PYTEST_VERSION=4.3.1
-    - os: linux
-      python: 2.7
-      env:
-      - CDECIMAL=m3-cdecimal
-      - PYTEST_VERSION=4.3.1
-    - os: linux
-      dist: trusty
-      python: pypy
-      env:
-      - PYTEST_VERSION=4.3.1
-    - os: linux
-      dist: trusty
-      python: pypy3
-      env:
-      - PYTEST_VERSION=6.1.2
-    - os: linux
-      python: 3.4
-      env:
-      - PYTEST_VERSION=4.3.1
-    - os: linux
-      python: 3.5
-      env:
-      - PYTHON_TEST_FLAGS=-bb
-      - PYTEST_VERSION=6.1.2
-    - os: linux
-      python: 3.6
-      env:
-      - PYTEST_VERSION=6.1.2
-    - os: linux
-      python: 3.7
-      env:
-      - PYTEST_VERSION=6.1.2
-    - os: linux
-      python: 3.8
-      env:
-      - PYTEST_VERSION=6.1.2
-    - os: linux
-      python: 3.9
-      env:
-      - PYTEST_VERSION=6.1.2
-install:
-  - bash .ci/deps.${TRAVIS_OS_NAME}.sh
-  - pip install --upgrade pip
-  - pip install --upgrade $CDECIMAL pytest==$PYTEST_VERSION pytest-cov freezegun==0.3.12 'backports.zoneinfo;python_version>="3.6" and python_version<"3.9"'
-  - pip install --editable .
-
-script:
-  - make test-cov
-  - bash .ci/deploy.${TRAVIS_OS_NAME}.sh
-
-notifications:
-  email: false
-  irc:
-    channels:
-      - "chat.freenode.net#pocoo"
-    on_success: change
-    on_failure: always
-    use_notice: true
-    skip_join: true
diff --git a/setup.py b/setup.py
index 0032a3a05..adf3bb5d9 100755
--- a/setup.py
+++ b/setup.py
@@ -44,18 +44,16 @@ def run(self):
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
-    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+    python_requires='>=3.6',
     packages=['babel', 'babel.messages', 'babel.localtime'],
     include_package_data=True,
     install_requires=[
diff --git a/tox.ini b/tox.ini
index 27faf5bbb..14b450ff8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,25 @@
 [tox]
-envlist = py27, pypy, py34, py35, py36, py37, pypy3, py27-cdecimal
+envlist =
+    py{36,37,38,39}
+    pypy3
 
 [testenv]
 deps =
-    pytest==4.3.1;python_version<"3.5"
-    pytest==6.1.2;python_version>="3.5"
+    pytest
     pytest-cov
-    cdecimal: m3-cdecimal
     freezegun==0.3.12
-    backports.zoneinfo;python_version>"3.6" and python_version<"3.9"
+    backports.zoneinfo;python_version<"3.9"
+    tzdata;sys_platform == 'win32'
 whitelist_externals = make
-commands = make clean-cldr test
-passenv = PYTHON_TEST_FLAGS
+commands = make clean-cldr test-cov
+passenv =
+    BABEL_*
+    PYTHON_*
 
-[pep8]
-ignore = E501,E731,W503
-
-[flake8]
-ignore = E501,E731,W503
+[gh-actions]
+python =
+    pypy3: pypy3
+    3.6: py36
+    3.7: py37
+    3.8: py38
+    3.9: py39

From 3a700b5b8b53606fd98ef8294a56f9510f7290f8 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 28 Apr 2021 10:33:40 +0300
Subject: [PATCH 486/489] Run locale identifiers through `os.path.basename()`

---
 babel/localedata.py      |  2 ++
 tests/test_localedata.py | 30 +++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/babel/localedata.py b/babel/localedata.py
index f4771d1fd..11085490a 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -47,6 +47,7 @@ def exists(name):
     """
     if not name or not isinstance(name, string_types):
         return False
+    name = os.path.basename(name)
     if name in _cache:
         return True
     file_found = os.path.exists(os.path.join(_dirname, '%s.dat' % name))
@@ -102,6 +103,7 @@ def load(name, merge_inherited=True):
     :raise `IOError`: if no locale data file is found for the given locale
                       identifer, or one of the locales it inherits from
     """
+    name = os.path.basename(name)
     _cache_lock.acquire()
     try:
         data = _cache.get(name)
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 83cd66994..9cb4282e4 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -11,11 +11,17 @@
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://babel.edgewall.org/log/.
 
+import os
+import pickle
+import sys
+import tempfile
 import unittest
 import random
 from operator import methodcaller
 
-from babel import localedata
+import pytest
+
+from babel import localedata, Locale, UnknownLocaleError
 
 
 class MergeResolveTestCase(unittest.TestCase):
@@ -131,3 +137,25 @@ def listdir_spy(*args):
     localedata.locale_identifiers.cache = None
     assert localedata.locale_identifiers()
     assert len(listdir_calls) == 2
+
+
+def test_locale_name_cleanup():
+    """
+    Test that locale identifiers are cleaned up to avoid directory traversal.
+    """
+    no_exist_name = os.path.join(tempfile.gettempdir(), "babel%d.dat" % random.randint(1, 99999))
+    with open(no_exist_name, "wb") as f:
+        pickle.dump({}, f)
+
+    try:
+        name = os.path.splitext(os.path.relpath(no_exist_name, localedata._dirname))[0]
+    except ValueError:
+        if sys.platform == "win32":
+            pytest.skip("unable to form relpath")
+        raise
+
+    assert not localedata.exists(name)
+    with pytest.raises(IOError):
+        localedata.load(name)
+    with pytest.raises(UnknownLocaleError):
+        Locale(name)

From 5caf717ceca4bd235552362b4fbff88983c75d8c Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 28 Apr 2021 11:47:42 +0300
Subject: [PATCH 487/489] Disallow special filenames on Windows

---
 babel/localedata.py      | 24 +++++++++++++++++++++---
 tests/test_localedata.py |  9 +++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/babel/localedata.py b/babel/localedata.py
index 11085490a..782b7afa0 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -13,6 +13,8 @@
 """
 
 import os
+import re
+import sys
 import threading
 from itertools import chain
 
@@ -22,6 +24,7 @@
 _cache = {}
 _cache_lock = threading.RLock()
 _dirname = os.path.join(os.path.dirname(__file__), 'locale-data')
+_windows_reserved_name_re = re.compile("^(con|prn|aux|nul|com[0-9]|lpt[0-9])$", re.I)
 
 
 def normalize_locale(name):
@@ -38,6 +41,22 @@ def normalize_locale(name):
             return locale_id
 
 
+def resolve_locale_filename(name):
+    """
+    Resolve a locale identifier to a `.dat` path on disk.
+    """
+
+    # Clean up any possible relative paths.
+    name = os.path.basename(name)
+
+    # Ensure we're not left with one of the Windows reserved names.
+    if sys.platform == "win32" and _windows_reserved_name_re.match(os.path.splitext(name)[0]):
+        raise ValueError("Name %s is invalid on Windows" % name)
+
+    # Build the path.
+    return os.path.join(_dirname, '%s.dat' % name)
+
+
 def exists(name):
     """Check whether locale data is available for the given locale.
 
@@ -47,10 +66,9 @@ def exists(name):
     """
     if not name or not isinstance(name, string_types):
         return False
-    name = os.path.basename(name)
     if name in _cache:
         return True
-    file_found = os.path.exists(os.path.join(_dirname, '%s.dat' % name))
+    file_found = os.path.exists(resolve_locale_filename(name))
     return True if file_found else bool(normalize_locale(name))
 
 
@@ -121,7 +139,7 @@ def load(name, merge_inherited=True):
                     else:
                         parent = '_'.join(parts[:-1])
                 data = load(parent).copy()
-            filename = os.path.join(_dirname, '%s.dat' % name)
+            filename = resolve_locale_filename(name)
             with open(filename, 'rb') as fileobj:
                 if name != 'root' and merge_inherited:
                     merge(data, pickle.load(fileobj))
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index 9cb4282e4..c852c1b69 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -159,3 +159,12 @@ def test_locale_name_cleanup():
         localedata.load(name)
     with pytest.raises(UnknownLocaleError):
         Locale(name)
+
+
+@pytest.mark.skipif(sys.platform != "win32", reason="windows-only test")
+def test_reserved_locale_names():
+    for name in ("con", "aux", "nul", "prn", "com8", "lpt5"):
+        with pytest.raises(ValueError):
+            localedata.load(name)
+        with pytest.raises(ValueError):
+            Locale(name)

From 60b33e083801109277cb068105251e76d0b7c14e Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 28 Apr 2021 22:04:48 +0300
Subject: [PATCH 488/489] Become 2.9.1

* Update copyright year
* Update changelog
---
 CHANGES                         | 9 +++++++++
 LICENSE                         | 2 +-
 babel/__init__.py               | 4 ++--
 babel/core.py                   | 2 +-
 babel/dates.py                  | 2 +-
 babel/lists.py                  | 2 +-
 babel/localedata.py             | 2 +-
 babel/localtime/__init__.py     | 2 +-
 babel/messages/__init__.py      | 2 +-
 babel/messages/catalog.py       | 2 +-
 babel/messages/checkers.py      | 2 +-
 babel/messages/extract.py       | 2 +-
 babel/messages/frontend.py      | 2 +-
 babel/messages/jslexer.py       | 2 +-
 babel/messages/mofile.py        | 2 +-
 babel/messages/plurals.py       | 2 +-
 babel/messages/pofile.py        | 2 +-
 babel/numbers.py                | 2 +-
 babel/plural.py                 | 2 +-
 babel/support.py                | 2 +-
 babel/util.py                   | 2 +-
 docs/conf.py                    | 4 ++--
 scripts/dump_data.py            | 2 +-
 scripts/dump_global.py          | 2 +-
 scripts/import_cldr.py          | 2 +-
 tests/messages/test_catalog.py  | 2 +-
 tests/messages/test_checkers.py | 2 +-
 tests/messages/test_extract.py  | 2 +-
 tests/messages/test_frontend.py | 2 +-
 tests/messages/test_mofile.py   | 2 +-
 tests/messages/test_plurals.py  | 2 +-
 tests/messages/test_pofile.py   | 2 +-
 tests/test_core.py              | 2 +-
 tests/test_dates.py             | 2 +-
 tests/test_localedata.py        | 2 +-
 tests/test_numbers.py           | 2 +-
 tests/test_plural.py            | 2 +-
 tests/test_support.py           | 2 +-
 tests/test_util.py              | 2 +-
 39 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/CHANGES b/CHANGES
index fbc73801f..e3c54bfc8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,15 @@
 Babel Changelog
 ===============
 
+Version 2.9.1
+-------------
+
+Bugfixes
+~~~~~~~~
+
+* The internal locale-data loading functions now validate the name of the locale file to be loaded and only
+  allow files within Babel's data directory.  Thank you to Chris Lyne of Tenable, Inc. for discovering the issue!
+
 Version 2.9.0
 -------------
 
diff --git a/LICENSE b/LICENSE
index 7e2f12e46..693e1a187 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2020 by the Babel Team, see AUTHORS for more information.
+Copyright (c) 2013-2021 by the Babel Team, see AUTHORS for more information.
 
 All rights reserved.
 
diff --git a/babel/__init__.py b/babel/__init__.py
index ecb18b546..3e20e4bd1 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -13,7 +13,7 @@
        access to various locale display names, localized number and date
        formatting, etc.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
@@ -21,4 +21,4 @@
     negotiate_locale, parse_locale, get_locale_identifier
 
 
-__version__ = '2.9.0'
+__version__ = '2.9.1'
diff --git a/babel/core.py b/babel/core.py
index a0c35b4ea..a323a7295 100644
--- a/babel/core.py
+++ b/babel/core.py
@@ -5,7 +5,7 @@
 
     Core locale representation and locale data access.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/dates.py b/babel/dates.py
index d62d00ba4..75e8f3501 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -12,7 +12,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/lists.py b/babel/lists.py
index e0bd7ed7f..8368b27a6 100644
--- a/babel/lists.py
+++ b/babel/lists.py
@@ -11,7 +11,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2015-2020 by the Babel Team.
+    :copyright: (c) 2015-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/localedata.py b/babel/localedata.py
index 782b7afa0..438afb643 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -8,7 +8,7 @@
     :note: The `Locale` class, which uses this module under the hood, provides a
            more convenient interface for accessing the locale data.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/localtime/__init__.py b/babel/localtime/__init__.py
index 8c9203a7b..bd3954951 100644
--- a/babel/localtime/__init__.py
+++ b/babel/localtime/__init__.py
@@ -6,7 +6,7 @@
     Babel specific fork of tzlocal to determine the local timezone
     of the system.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/__init__.py b/babel/messages/__init__.py
index 77c79621b..7d2587f63 100644
--- a/babel/messages/__init__.py
+++ b/babel/messages/__init__.py
@@ -5,7 +5,7 @@
 
     Support for ``gettext`` message catalogs.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index af1b6573c..a19a3e6d8 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -5,7 +5,7 @@
 
     Data structures for message catalogs.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/checkers.py b/babel/messages/checkers.py
index 29add9fce..cba911d72 100644
--- a/babel/messages/checkers.py
+++ b/babel/messages/checkers.py
@@ -7,7 +7,7 @@
 
     :since: version 0.9
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/extract.py b/babel/messages/extract.py
index 8f53fa298..64497762c 100644
--- a/babel/messages/extract.py
+++ b/babel/messages/extract.py
@@ -13,7 +13,7 @@
     The main entry points into the extraction functionality are the functions
     `extract_from_dir` and `extract_from_file`.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/frontend.py b/babel/messages/frontend.py
index 0b65a7c6b..c5eb1dea9 100644
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -5,7 +5,7 @@
 
     Frontends for the message extraction functionality.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 from __future__ import print_function
diff --git a/babel/messages/jslexer.py b/babel/messages/jslexer.py
index f56c80d98..c57b1213f 100644
--- a/babel/messages/jslexer.py
+++ b/babel/messages/jslexer.py
@@ -6,7 +6,7 @@
     A simple JavaScript 1.5 lexer which is used for the JavaScript
     extractor.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 from collections import namedtuple
diff --git a/babel/messages/mofile.py b/babel/messages/mofile.py
index 1ab3e4e9c..8d3cfc905 100644
--- a/babel/messages/mofile.py
+++ b/babel/messages/mofile.py
@@ -5,7 +5,7 @@
 
     Writing of files in the ``gettext`` MO (machine object) format.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/plurals.py b/babel/messages/plurals.py
index 4755cfcf9..91ba9e1b1 100644
--- a/babel/messages/plurals.py
+++ b/babel/messages/plurals.py
@@ -5,7 +5,7 @@
 
     Plural form definitions.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/messages/pofile.py b/babel/messages/pofile.py
index b8cb46976..be33b831d 100644
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -6,7 +6,7 @@
     Reading and writing of files in the ``gettext`` PO (portable object)
     format.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/numbers.py b/babel/numbers.py
index 0303f0542..0fcc07e15 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -12,7 +12,7 @@
      * ``LC_ALL``, and
      * ``LANG``
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 # TODO:
diff --git a/babel/plural.py b/babel/plural.py
index 3c9a3e614..e705e9b8d 100644
--- a/babel/plural.py
+++ b/babel/plural.py
@@ -5,7 +5,7 @@
 
     CLDR Plural support.  See UTS #35.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 import re
diff --git a/babel/support.py b/babel/support.py
index d6fc56cfb..4be9ed37f 100644
--- a/babel/support.py
+++ b/babel/support.py
@@ -8,7 +8,7 @@
 
     .. note: the code in this module is not used by Babel itself
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/babel/util.py b/babel/util.py
index a5d40c5de..a8fbac1d9 100644
--- a/babel/util.py
+++ b/babel/util.py
@@ -5,7 +5,7 @@
 
     Various utility classes and functions.
 
-    :copyright: (c) 2013-2020 by the Babel Team.
+    :copyright: (c) 2013-2021 by the Babel Team.
     :license: BSD, see LICENSE for more details.
 """
 
diff --git a/docs/conf.py b/docs/conf.py
index 1c21c67cc..962792fbd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,7 +44,7 @@
 
 # General information about the project.
 project = u'Babel'
-copyright = u'2020, The Babel Team'
+copyright = u'2021, The Babel Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '2.9'
 # The full version, including alpha/beta/rc tags.
-release = '2.9.0'
+release = '2.9.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/scripts/dump_data.py b/scripts/dump_data.py
index 57439b98f..ac295b2d7 100755
--- a/scripts/dump_data.py
+++ b/scripts/dump_data.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/scripts/dump_global.py b/scripts/dump_global.py
index a27b31617..c9e1d3008 100755
--- a/scripts/dump_global.py
+++ b/scripts/dump_global.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 0dbd39369..7876d5208 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_catalog.py b/tests/messages/test_catalog.py
index 2d9e31d00..661999648 100644
--- a/tests/messages/test_catalog.py
+++ b/tests/messages/test_catalog.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_checkers.py b/tests/messages/test_checkers.py
index bf813bc05..49abb51b0 100644
--- a/tests/messages/test_checkers.py
+++ b/tests/messages/test_checkers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_extract.py b/tests/messages/test_extract.py
index 38979cd30..ac7f0a642 100644
--- a/tests/messages/test_extract.py
+++ b/tests/messages/test_extract.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_frontend.py b/tests/messages/test_frontend.py
index 38165b354..70580215e 100644
--- a/tests/messages/test_frontend.py
+++ b/tests/messages/test_frontend.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_mofile.py b/tests/messages/test_mofile.py
index 395b9fb1a..fb672a80c 100644
--- a/tests/messages/test_mofile.py
+++ b/tests/messages/test_mofile.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_plurals.py b/tests/messages/test_plurals.py
index 62c770870..5e490f374 100644
--- a/tests/messages/test_plurals.py
+++ b/tests/messages/test_plurals.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/messages/test_pofile.py b/tests/messages/test_pofile.py
index 2db7f6715..be1172a88 100644
--- a/tests/messages/test_pofile.py
+++ b/tests/messages/test_pofile.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_core.py b/tests/test_core.py
index 53b9d1875..558322e00 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 8e693d34c..44efa7fbc 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_localedata.py b/tests/test_localedata.py
index c852c1b69..735678f80 100644
--- a/tests/test_localedata.py
+++ b/tests/test_localedata.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 739fd1fb7..11e61d37d 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_plural.py b/tests/test_plural.py
index 1a9fbe507..bea8115ce 100644
--- a/tests/test_plural.py
+++ b/tests/test_plural.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_support.py b/tests/test_support.py
index 456425e3e..a683591dc 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which
diff --git a/tests/test_util.py b/tests/test_util.py
index dbd6378a0..b29278e00 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2011 Edgewall Software, 2013-2020 the Babel team
+# Copyright (C) 2007-2011 Edgewall Software, 2013-2021 the Babel team
 # All rights reserved.
 #
 # This software is licensed as described in the file LICENSE, which

From a99fa2474c808b51ebdabea18db871e389751559 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Wed, 28 Apr 2021 22:26:16 +0300
Subject: [PATCH 489/489] Use 2.9.0's setup.py for 2.9.1

---
 setup.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index adf3bb5d9..0032a3a05 100755
--- a/setup.py
+++ b/setup.py
@@ -44,16 +44,18 @@ def run(self):
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
-    python_requires='>=3.6',
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     packages=['babel', 'babel.messages', 'babel.localtime'],
     include_package_data=True,
     install_requires=[