Become 2.9.1

* Update copyright year
* Update changelog

diff --git a/CHANGES b/CHANGES
index fbc73801f1871df1092a589aa20f23c7b5d2b326..e3c54bfc8d1cc32ea9ab9b0241ec578ec98eb159 100644 (file)
--- 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 7e2f12e46dbb049b8d43d4379fff78544c227c87..693e1a18721bd3c146dbca672da9aa77ede9c065 100644 (file)
--- 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 ecb18b546e0aa7a7d7ab6009592ad47a1cc93b3b..3e20e4bd1a34675fe585c5d98a07a55b1975b08e 100644 (file)
--- 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 a0c35b4ea40f95e62d2ef5dca861ff25e0923b8e..a323a7295de911e9dce38eb155123f76829f2b68 100644 (file)
--- 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 d62d00ba429f70262de8e74ec1c929a07064ab93..75e8f3501c1bf0bbf702549856ac81fd99028368 100644 (file)
--- 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 e0bd7ed7f1474fc65b0a4f9662784067d06c8236..8368b27a6945ca5776106fd5789ef66ccebbffff 100644 (file)
--- 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 782b7afa090c76445695d0ecc7657693cbcb0a4a..438afb6431dc551b2daf55ee0419a079c6aae85a 100644 (file)
--- 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 8c9203a7bb8c106b9e5f34527e049f5212b664ff..bd395495185484d4181bb3fdb53db9f81f8ab126 100644 (file)
--- 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 77c79621ba44eefe90383253366b9c5b83ba510a..7d2587f63b1aa7f2c92b5a5fc2a62815953011ad 100644 (file)
--- 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 af1b6573cf23b3b251bb0669ec7f5ca3b423ea67..a19a3e6d8a6c5f32a705053d1e21187984d86e40 100644 (file)
--- 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 29add9fce24ffb4d221d0907a799ba3e6361c6d9..cba911d723adedc148d24177ca6d8f21e7484830 100644 (file)
--- 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 8f53fa2988258a40506b4dedf786a96b3afd0ad6..64497762c2e7ea23383108294e98abc095c051e9 100644 (file)
--- 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 0b65a7c6bec787679594c48056ec6fb83507f075..c5eb1dea9ac7ef2bc0fd3a718d624540826586a1 100644 (file)
--- 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 f56c80d98d869dffcf689478deb57ea9624c7b17..c57b1213f57d1e8d076579331875146b72e7ead0 100644 (file)
--- 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 1ab3e4e9c67b3bed4ec08a505178a964972734a6..8d3cfc9057bbb99610b1c4bb24fb88bf5ca95d79 100644 (file)
--- 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 4755cfcf9a475541eb6983230e0a0b97b27725aa..91ba9e1b15c6a2966d3fb8dcef36e99b31847917 100644 (file)
--- 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 b8cb469765d047cd37391b33670cc77ec1eaf9b1..be33b831dbab794c613b89cee96222fea57fe89e 100644 (file)
--- 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 0303f05427c61bfd99ceb4ade797d8e9c81a50f7..0fcc07e15ca72ffcce7db4cc31183529f09b2aa9 100644 (file)
--- 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 3c9a3e614ba053d631a09f9f99eb218d0c32a27d..e705e9b8d548d6f91b320c775b3392cd5fb7abe0 100644 (file)
--- 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 d6fc56cfb18ff4bd56756e5199fc7df7b276fb07..4be9ed37ff1d2cba06e61ca1bff440989c28d930 100644 (file)
--- 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 a5d40c5dedab88b58ddea15ca4f59262d7b8e1d2..a8fbac1d986cbb0f5ad8015f0e9cd1d365ee0867 100644 (file)
--- 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 1c21c67cc0c78d9265d207fbcb3a8d15ab6dd3a9..962792fbd19ecafeca59ce7f3d55fcdc2a510d87 100644 (file)
--- 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 57439b98faffc2a017755557f7b3965a1a9cc9c1..ac295b2d79fcca045f8aee2939874bf8616eb186 100755 (executable)
--- 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 a27b31617ac3917d67cfbdb28f6f84e51cf4f6d8..c9e1d3008ef2722764f18f685a164ab4596e9904 100755 (executable)
--- 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 0dbd393698c69fe887263ac9b7a7ca535668861b..7876d520822e4a2d86cc9fd9faecf055422a86e7 100755 (executable)
--- 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 2d9e31d00b009411d56b79bdb7c61b6890e42f4d..661999648a581079ca8e9fdd9cd2db8f39a4bb1e 100644 (file)
--- 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 bf813bc052c6b129cd4e0433703f1419067793b8..49abb51b049b37a50ad38d7d1ef78e7012df22e1 100644 (file)
--- 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 38979cd30a430232a4dec9a6c692cdca26d17c7d..ac7f0a6424c0fab9a89b8c5ae3be1ecbe577e22b 100644 (file)
--- 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 38165b354ab39d649f064a65239db476953b638c..70580215ed0aed9558d565f3c45eefe5e9a7c096 100644 (file)
--- 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 395b9fb1ac6eb1f049a652db9c5bf45f541b83a9..fb672a80caad0ca719907e9df309f038c0ec0d98 100644 (file)
--- 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 62c770870c181f7d939bfb35af5066cc6498ed8c..5e490f374173379d617ca9aa8667483ac1b334a0 100644 (file)
--- 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 2db7f6715963b05b7f7ea3e011e487077f39adc1..be1172a88c5fa7ee32e9c0b2c61dc0ba072db09e 100644 (file)
--- 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 53b9d1875141721a319cc42d38ae3cc0275166e4..558322e00b68c15a2bf53916510a7f59f0b90445 100644 (file)
--- 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 8e693d34c66304042245fe588f1b615d0a448a75..44efa7fbc6a98527d88537d1e5e88cebf84aef7e 100644 (file)
--- 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 c852c1b69735a79876a2fa3ea255963cefa6252e..735678f8051fef1b61bc061c1cf0396cb231ccbd 100644 (file)
--- 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 739fd1fb78f257d240fb6c7f079ade4aac097bc5..11e61d37d89f4531a8077d8fc4c38b0d0c133ebd 100644 (file)
--- 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 1a9fbe5076b75f5b414c1df11a48a3758031e3e8..bea8115ce420600b02b16d3a4bc3d93a38b8e6c7 100644 (file)
--- 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 456425e3eaa2a6782924870b23dcd04d4052ba2a..a683591dc5950a8c180f6872c2bb8cfa0116db7a 100644 (file)
--- 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 dbd6378a02c229e575f02922054afa383b8e5e00..b29278e00305d670eaf8287f6eac268f7e3b4306 100644 (file)
--- 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