traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #26934: Merge 3.6

This commit is contained in:
Xavier de Gaye 2016-11-13 21:56:59 +01:00
parent 524eac0f14 95aa56a6fb
commit f59d568e47
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/support/__init__.py
View File

@ -736,7 +736,7 @@ requires_lzma = unittest.skipUnless(lzma, 'requires lzma')
is_jython = sys.platform.startswith('java') is_jython = sys.platform.startswith('java')
_ANDROID_API_LEVEL = sysconfig.get_config_var('ANDROID_API_LEVEL') _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': if sys.platform != 'win32':
unix_shell = '/system/bin/sh' if is_android else '/bin/sh' unix_shell = '/system/bin/sh' if is_android else '/bin/sh'