rebase fixes

Author: DenverCoder1

babel/core.py

@@ -308,7 +308,7 @@ def parse(
                                        there is a locale ``en`` that can exist
                                        by itself.
         :raise `ValueError`: if the string does not appear to be a valid locale
-                             identifier or ``None`` is passed
+                             identifier
         :raise `UnknownLocaleError`: if no locale data is available for the
                                      requested locale
         :raise `TypeError`: if the identifier is not a string or a `Locale`
@@ -505,7 +505,7 @@ def get_territory_name(self, locale: Locale | str | None = None) -> str | None:
         if locale is None:
             locale = self
         locale = Locale.parse(locale)
-        return locale.territories.get(self.territory)
+        return locale.territories.get(self.territory or '')
 
     territory_name = property(get_territory_name, doc="""\
         The localized territory name of the locale if available.
@@ -519,7 +519,7 @@ def get_script_name(self, locale: Locale | str | None = None) -> str | None:
         if locale is None:
             locale = self
         locale = Locale.parse(locale)
-        return locale.scripts.get(self.script)
+        return locale.scripts.get(self.script or '')
 
     script_name = property(get_script_name, doc="""\
         The localized script name of the locale if available.

babel/localedata.py

@@ -18,7 +18,7 @@
 import re
 import sys
 import threading
-from collections.abc import Iterator, Mapping, MutableMapping
+from collections.abc import Iterator, Mapping
 from functools import lru_cache
 from itertools import chain
 from typing import TYPE_CHECKING, Any, MutableMapping, TypeVar