Support @euro modifiers. Fixes #554676.

diff --git a/Lib/locale.py b/Lib/locale.py
index d3c0eb1f9245c3f127f6c7b728a7ce0dea703e72..8b6b3e4889af4e2e5edf8a3d9bc62b12efc21d87 100644 (file)
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -264,6 +264,15 @@ def _parse_localename(localename):
 
     """
     code = normalize(localename)
+    if '@' in localename:
+        # Deal with locale modifiers
+        code, modifier = code.split('@')
+        if modifier == 'euro' and '.' not in code:
+            # Assume Latin-9 for @euro locales. This is bogus,
+            # since some systems may use other encodings for these
+            # locales. Also, we ignore other modifiers.
+            return code, 'iso-8859-15'
+            
     if '.' in code:
         return code.split('.')[:2]
     elif code == 'C':