summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES9
-rw-r--r--LICENSE2
-rw-r--r--babel/__init__.py4
-rw-r--r--babel/core.py2
-rw-r--r--babel/dates.py2
-rw-r--r--babel/lists.py2
-rw-r--r--babel/localedata.py2
-rw-r--r--babel/localtime/__init__.py2
-rw-r--r--babel/messages/__init__.py2
-rw-r--r--babel/messages/catalog.py2
-rw-r--r--babel/messages/checkers.py2
-rw-r--r--babel/messages/extract.py2
-rw-r--r--babel/messages/frontend.py2
-rw-r--r--babel/messages/jslexer.py2
-rw-r--r--babel/messages/mofile.py2
-rw-r--r--babel/messages/plurals.py2
-rw-r--r--babel/messages/pofile.py2
-rw-r--r--babel/numbers.py2
-rw-r--r--babel/plural.py2
-rw-r--r--babel/support.py2
-rw-r--r--babel/util.py2
-rw-r--r--docs/conf.py4
-rwxr-xr-xscripts/dump_data.py2
-rwxr-xr-xscripts/dump_global.py2
-rwxr-xr-xscripts/import_cldr.py2
-rw-r--r--tests/messages/test_catalog.py2
-rw-r--r--tests/messages/test_checkers.py2
-rw-r--r--tests/messages/test_extract.py2
-rw-r--r--tests/messages/test_frontend.py2
-rw-r--r--tests/messages/test_mofile.py2
-rw-r--r--tests/messages/test_plurals.py2
-rw-r--r--tests/messages/test_pofile.py2
-rw-r--r--tests/test_core.py2
-rw-r--r--tests/test_dates.py2
-rw-r--r--tests/test_localedata.py2
-rw-r--r--tests/test_numbers.py2
-rw-r--r--tests/test_plural.py2
-rw-r--r--tests/test_support.py2
-rw-r--r--tests/test_util.py2
39 files changed, 49 insertions, 40 deletions
diff --git a/CHANGES b/CHANGES
index fbc7380..e3c54bf 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 7e2f12e..693e1a1 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 ecb18b5..3e20e4b 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 @@ from babel.core import UnknownLocaleError, Locale, default_locale, \
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 a0c35b4..a323a72 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 d62d00b..75e8f35 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 e0bd7ed..8368b27 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 782b7af..438afb6 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 8c9203a..bd39549 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 77c7962..7d2587f 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 af1b657..a19a3e6 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 29add9f..cba911d 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 8f53fa2..6449776 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 0b65a7c..c5eb1de 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 f56c80d..c57b121 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 1ab3e4e..8d3cfc9 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 4755cfc..91ba9e1 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 b8cb469..be33b83 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 0303f05..0fcc07e 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 3c9a3e6..e705e9b 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 d6fc56c..4be9ed3 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 a5d40c5..a8fbac1 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 1c21c67..962792f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,7 +44,7 @@ master_doc = 'index'
# 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 @@ copyright = u'2020, The Babel Team'
# 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 57439b9..ac295b2 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 a27b316..c9e1d30 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 0dbd393..7876d52 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 2d9e31d..6619996 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 bf813bc..49abb51 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 38979cd..ac7f0a6 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 38165b3..7058021 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 395b9fb..fb672a8 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 62c7708..5e490f3 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 2db7f67..be1172a 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 53b9d18..558322e 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 8e693d3..44efa7f 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 c852c1b..735678f 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 739fd1f..11e61d3 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 1a9fbe5..bea8115 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 456425e..a683591 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 dbd6378..b29278e 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