diff options
| author | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:18:39 -0800 |
|---|---|---|
| committer | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:18:39 -0800 |
| commit | 731cca110f376cdbaffb536e42d6c9d6da574fa8 (patch) | |
| tree | 9cb95caf6f8b933115820bf699725d9cd600d2df /Lib/test/support/__init__.py | |
| parent | da79bcf8ac7ae72218ab023e1ed54390bc1a3a27 (diff) | |
| parent | c8102f4d974669f4c5e4ca7bcd73292a1ac5bcbf (diff) | |
| download | cpython-731cca110f376cdbaffb536e42d6c9d6da574fa8.tar.gz | |
Issue #29371: merge with 3.6
Diffstat (limited to 'Lib/test/support/__init__.py')
| -rw-r--r-- | Lib/test/support/__init__.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 15d8fc849b..345e16d754 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -777,8 +777,13 @@ requires_lzma = unittest.skipUnless(lzma, 'requires lzma') is_jython = sys.platform.startswith('java') -_ANDROID_API_LEVEL = sysconfig.get_config_var('ANDROID_API_LEVEL') -is_android = (_ANDROID_API_LEVEL is not None and _ANDROID_API_LEVEL > 0) +try: + # constant used by requires_android_level() + _ANDROID_API_LEVEL = sys.getandroidapilevel() + is_android = True +except AttributeError: + # sys.getandroidapilevel() is only available on Android + is_android = False android_not_root = (is_android and os.geteuid() != 0) if sys.platform != 'win32': |