Issue #26934: Merge 3.6

This commit is contained in:
Xavier de Gaye 2016-11-13 21:56:59 +01:00
commit f59d568e47
1 changed files with 1 additions and 1 deletions

View File

@ -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'