Adjust tests for CLDR 42

The space changes around English seem to be on purpose, see:

* https://unicode-org.atlassian.net/browse/CLDR-14032
* https://github.com/unicode-org/cldr/commit/a83026ab8c8fa6ed88f1047c4d0c6089f88b7e5d

5 files changed, 27 insertions, 23 deletions

diff --git a/tests/test_core.py b/tests/test_core.py
index d315018..2a7e605 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -228,11 +228,11 @@ class TestLocaleClass:
         assert Locale('fr', 'FR').date_formats['long'].pattern == 'd MMMM y'
 
     def test_time_formats_property(self):
-        assert Locale('en', 'US').time_formats['short'].pattern == 'h:mm a'
+        assert Locale('en', 'US').time_formats['short'].pattern == 'h:mm\u202fa'
         assert Locale('fr', 'FR').time_formats['long'].pattern == 'HH:mm:ss z'
 
     def test_datetime_formats_property(self):
-        assert Locale('en').datetime_formats['full'] == "{1} 'at' {0}"
+        assert Locale('en').datetime_formats['full'] == "{1}, {0}"
         assert Locale('th').datetime_formats['medium'] == '{1} {0}'
 
     def test_datetime_skeleton_property(self):
diff --git a/tests/test_date_intervals.py b/tests/test_date_intervals.py
index 5565854..55992b5 100644
--- a/tests/test_date_intervals.py
+++ b/tests/test_date_intervals.py
@@ -13,7 +13,7 @@ def test_format_interval_same_instant_1():
 
 
 def test_format_interval_same_instant_2():
-    assert dates.format_interval(TEST_DT, TEST_DT, "xxx", fuzzy=False, 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 11.46.15"
 
 
 def test_format_interval_same_instant_3():
@@ -40,7 +40,7 @@ def test_format_interval_in_tz(timezone_getter):
 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"
+    assert dates.format_interval(t1, t2, "hm", locale="en") == "10:46\u2009\u2013\u200911:46\u202fAM"
 
 
 def test_format_interval_invalid_skeleton():
diff --git a/tests/test_dates.py b/tests/test_dates.py
index 0c8bd17..7ec4dc7 100644
--- a/tests/test_dates.py
+++ b/tests/test_dates.py
@@ -439,7 +439,7 @@ def test_get_datetime_format():
 
 
 def test_get_time_format():
-    assert dates.get_time_format(locale='en_US').pattern == 'h:mm:ss a'
+    assert dates.get_time_format(locale='en_US').pattern == 'h:mm:ss\u202fa'
     assert (dates.get_time_format('full', locale='de_DE').pattern ==
             'HH:mm:ss zzzz')
 
@@ -460,7 +460,7 @@ def test_get_timezone_gmt(timezone_getter):
 def test_get_timezone_location(timezone_getter):
     tz = timezone_getter('America/St_Johns')
     assert (dates.get_timezone_location(tz, locale='de_DE') ==
-            "Kanada (St. John\u2019s) Zeit")
+            "Kanada (St. John\u2019s) (Ortszeit)")
     assert (dates.get_timezone_location(tz, locale='en') ==
             'Canada (St. John’s) Time')
     assert (dates.get_timezone_location(tz, locale='en', return_city=True) ==
@@ -468,11 +468,11 @@ def test_get_timezone_location(timezone_getter):
 
     tz = timezone_getter('America/Mexico_City')
     assert (dates.get_timezone_location(tz, locale='de_DE') ==
-            'Mexiko (Mexiko-Stadt) Zeit')
+            'Mexiko (Mexiko-Stadt) (Ortszeit)')
 
     tz = timezone_getter('Europe/Berlin')
     assert (dates.get_timezone_location(tz, locale='de_DE') ==
-            'Deutschland (Berlin) Zeit')
+            'Deutschland (Berlin) (Ortszeit)')
 
 
 @pytest.mark.parametrize(
@@ -564,7 +564,7 @@ def test_format_date():
 def test_format_datetime(timezone_getter):
     dt = datetime(2007, 4, 1, 15, 30)
     assert (dates.format_datetime(dt, locale='en_US') ==
-            'Apr 1, 2007, 3:30:00 PM')
+            'Apr 1, 2007, 3:30:00\u202fPM')
 
     full = dates.format_datetime(
         dt, 'full',
@@ -572,8 +572,8 @@ def test_format_datetime(timezone_getter):
         locale='fr_FR'
     )
     assert full == (
-        'dimanche 1 avril 2007 à 17:30:00 heure '
-        'd\u2019\xe9t\xe9 d\u2019Europe centrale'
+        'dimanche 1 avril 2007, 17:30:00 heure '
+        'd’été d’Europe centrale'
     )
     custom = dates.format_datetime(
         dt, "yyyy.MM.dd G 'at' HH:mm:ss zzz",
@@ -585,7 +585,7 @@ def test_format_datetime(timezone_getter):
 
 def test_format_time(timezone_getter):
     t = time(15, 30)
-    assert dates.format_time(t, locale='en_US') == '3:30:00 PM'
+    assert dates.format_time(t, locale='en_US') == '3:30:00\u202fPM'
     assert dates.format_time(t, format='short', locale='de_DE') == '15:30'
 
     assert (dates.format_time(t, "hh 'o''clock' a", locale='en') ==
@@ -606,7 +606,7 @@ def test_format_time(timezone_getter):
     assert paris == '15:30:00 heure normale d’Europe centrale'
 
     us_east = dates.format_time(t, format='full', tzinfo=eastern, locale='en_US')
-    assert us_east == '3:30:00 PM Eastern Standard Time'
+    assert us_east == '3:30:00\u202fPM Eastern Standard Time'
 
 
 def test_format_skeleton(timezone_getter):
@@ -720,7 +720,7 @@ def test_no_inherit_metazone_formatting(timezone_getter):
     # See: https://github.com/python-babel/babel/issues/428
     tz = timezone_getter('America/Los_Angeles')
     t = _localize(tz, 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_US') == "7:00:00\u202fAM 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"
diff --git a/tests/test_numbers.py b/tests/test_numbers.py
index 88df376..c8a04d6 100644
--- a/tests/test_numbers.py
+++ b/tests/test_numbers.py
@@ -388,7 +388,7 @@ def test_format_currency():
     assert (numbers.format_currency(0, 'USD', locale='en_US')
             == '$0.00')
     assert (numbers.format_currency(1099.98, 'USD', locale='es_CO')
-            == 'US$\xa01.099,98')
+            == 'US$1.099,98')
     assert (numbers.format_currency(1099.98, 'EUR', locale='de_DE')
             == '1.099,98\xa0\u20ac')
     assert (numbers.format_currency(1099.98, 'EUR', '\xa4\xa4 #,##0.00',
@@ -400,11 +400,11 @@ def test_format_currency():
                                     locale='en_US')
             == '$1,099.98')
     assert (numbers.format_currency(1, 'USD', locale='es_AR')
-            == 'US$\xa01,00')          # one
+            == 'US$1,00')          # one
     assert (numbers.format_currency(1000000, 'USD', locale='es_AR')
-            == 'US$\xa01.000.000,00')  # many
+            == 'US$1.000.000,00')  # many
     assert (numbers.format_currency(0, 'USD', locale='es_AR')
-            == 'US$\xa00,00')          # other
+            == 'US$0,00')          # other
 
 
 def test_format_currency_format_type():
@@ -449,8 +449,8 @@ def test_format_compact_currency():
     assert numbers.format_compact_currency(1234, 'JPY', locale='ja_JP', format_type="short") == '￥1234'
     assert numbers.format_compact_currency(123456, 'JPY', locale='ja_JP', format_type="short") == '￥12万'
     assert numbers.format_compact_currency(123456, 'JPY', locale='ja_JP', format_type="short", fraction_digits=2) == '￥12.35万'
-    assert numbers.format_compact_currency(123, 'EUR', locale='yav', format_type="short") == '123\xa0€'
-    assert numbers.format_compact_currency(12345, 'EUR', locale='yav', format_type="short") == '12K\xa0€'
+    assert numbers.format_compact_currency(123, 'EUR', locale='yav', format_type="short") == '€\xa0123'
+    assert numbers.format_compact_currency(12345, 'EUR', locale='yav', format_type="short") == '€\xa012K'
     assert numbers.format_compact_currency(123456789, 'EUR', locale='de_DE', fraction_digits=1) == '123,5\xa0Mio.\xa0€'
 
 
@@ -484,7 +484,11 @@ def test_format_compact_currency_invalid_format_type():
 def test_format_currency_precision(input_value, expected_value):
     # Test precision conservation.
     assert numbers.format_currency(
-        decimal.Decimal(input_value), 'USD', locale='en_US', decimal_quantization=False) == expected_value
+        decimal.Decimal(input_value),
+        currency='USD',
+        locale='en_US',
+        decimal_quantization=False,
+    ) == expected_value
 
 
 def test_format_currency_quantization():
diff --git a/tests/test_support.py b/tests/test_support.py
index 0b7cba0..a471137 100644
--- a/tests/test_support.py
+++ b/tests/test_support.py
@@ -304,12 +304,12 @@ def test_format_date():
 def test_format_datetime(timezone_getter):
     fmt = support.Format('en_US', tzinfo=timezone_getter('US/Eastern'))
     when = datetime(2007, 4, 1, 15, 30)
-    assert fmt.datetime(when) == 'Apr 1, 2007, 11:30:00 AM'
+    assert fmt.datetime(when) == 'Apr 1, 2007, 11:30:00\u202fAM'
 
 
 def test_format_time(timezone_getter):
     fmt = support.Format('en_US', tzinfo=timezone_getter('US/Eastern'))
-    assert fmt.time(datetime(2007, 4, 1, 15, 30)) == '11:30:00 AM'
+    assert fmt.time(datetime(2007, 4, 1, 15, 30)) == '11:30:00\u202fAM'
 
 
 def test_format_timedelta():