From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Tue, 13 Dec 2016 09:03:34 +0000 (+0100)
Subject: Issue #28759: Merge 3.6.
X-Git-Tag: v3.7.0a1~1763
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f852fff878a578bef805310b0bfb7cbd1980e689;p=python

Issue #28759: Merge 3.6.
---

f852fff878a578bef805310b0bfb7cbd1980e689
diff --cc Lib/test/support/__init__.py
index 6df48c0fed,ed1af2b5a5..bed76eb103
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@@ -767,13 -767,9 +767,14 @@@ requires_lzma = unittest.skipUnless(lzm
  
  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':
      unix_shell = '/system/bin/sh' if is_android else '/bin/sh'