diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-06-22 19:25:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 19:25:44 +0200 |
| commit | 8fbbdf0c3107c3052659e166f73990b466eacbb0 (patch) | |
| tree | 81ce7da212017b7918b2373dc68a50cb9fda52fc /Lib/test/test_c_locale_coercion.py | |
| parent | 209abf746985526bce255e2fba97d3246924885d (diff) | |
| download | cpython-git-8fbbdf0c3107c3052659e166f73990b466eacbb0.tar.gz | |
bpo-33671: Add support.MS_WINDOWS and support.MACOS (GH-7800)
* Add support.MS_WINDOWS: True if Python is running on Microsoft Windows.
* Add support.MACOS: True if Python is running on Apple macOS.
* Replace support.is_android with support.ANDROID
* Replace support.is_jython with support.JYTHON
* Cleanup code to initialize unix_shell
Diffstat (limited to 'Lib/test/test_c_locale_coercion.py')
| -rw-r--r-- | Lib/test/test_c_locale_coercion.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_c_locale_coercion.py b/Lib/test/test_c_locale_coercion.py index 1db293b9c3..9e68bf96ec 100644 --- a/Lib/test/test_c_locale_coercion.py +++ b/Lib/test/test_c_locale_coercion.py @@ -27,7 +27,7 @@ EXPECT_COERCION_IN_DEFAULT_LOCALE = True # Apply some platform dependent overrides if sys.platform.startswith("linux"): - if test.support.is_android: + if test.support.ANDROID: # Android defaults to using UTF-8 for all system interfaces EXPECTED_C_LOCALE_STREAM_ENCODING = "utf-8" EXPECTED_C_LOCALE_FS_ENCODING = "utf-8" @@ -335,7 +335,7 @@ class LocaleCoercionTests(_LocaleHandlingTestCase): # locale environment variables are undefined or empty. When # this code path is run with environ['LC_ALL'] == 'C', then # LEGACY_LOCALE_WARNING is printed. - if (test.support.is_android and + if (test.support.ANDROID and _expected_warnings == [CLI_COERCION_WARNING]): _expected_warnings = None self._check_child_encoding_details(base_var_dict, |