diff options
| author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-11-13 20:56:59 (GMT) |
|---|---|---|
| committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-11-13 20:56:59 (GMT) |
| commit | f59d568e473326e27ea2451445d027674a5b6e26 (patch) | |
| tree | 18e1c1c0c7c88455a3428df216386929d40739e1 /Lib | |
| parent | 524eac0f142b3ea02bee3470262de5143da37d86 (diff) | |
| parent | 95aa56a6fb870397e2fc31b40154f32688ab33e4 (diff) | |
| download | cpython-f59d568e473326e27ea2451445d027674a5b6e26.zip cpython-f59d568e473326e27ea2451445d027674a5b6e26.tar.gz cpython-f59d568e473326e27ea2451445d027674a5b6e26.tar.bz2 | |
Issue #26934: Merge 3.6
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/support/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 961b735..d862d8b 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -736,7 +736,7 @@ 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 > 0) +is_android = (_ANDROID_API_LEVEL is not None and _ANDROID_API_LEVEL > 0) if sys.platform != 'win32': unix_shell = '/system/bin/sh' if is_android else '/bin/sh' |