--- /dev/null

+++ b/Lib/_ios_support.py

@@ -0,0 +1,36 @@

+from ctypes import cdll, c_void_p, c_char_p

+from ctypes import util

+

+

+def get_platform_ios():

+ objc = cdll.LoadLibrary(util.find_library(b'objc'))

+

+ objc.objc_getClass.restype = c_void_p

+ objc.objc_getClass.argtypes = [c_char_p]

+ objc.objc_msgSend.restype = c_void_p

+ objc.objc_msgSend.argtypes = [c_void_p, c_void_p]

+ objc.sel_registerName.restype = c_void_p

+ objc.sel_registerName.argtypes = [c_char_p]

+

+ UIDevice = c_void_p(objc.objc_getClass(b'UIDevice'))

+ SEL_currentDevice = c_void_p(objc.sel_registerName(b'currentDevice'))

+ device = c_void_p(objc.objc_msgSend(UIDevice, SEL_currentDevice))

+

+ SEL_systemVersion = c_void_p(objc.sel_registerName(b'systemVersion'))

+ systemVersion = c_void_p(objc.objc_msgSend(device, SEL_systemVersion))

+

+ SEL_systemName = c_void_p(objc.sel_registerName(b'systemName'))

+ systemName = c_void_p(objc.objc_msgSend(device, SEL_systemName))

+

+ SEL_model = c_void_p(objc.sel_registerName(b'model'))

+ systemModel = c_void_p(objc.objc_msgSend(device, SEL_model))

+

+ # UTF8String returns a const char*;

+ SEL_UTF8String = c_void_p(objc.sel_registerName(b'UTF8String'))

+ objc.objc_msgSend.restype = c_char_p

+

+ system = objc.objc_msgSend(systemName, SEL_UTF8String).decode()

+ release = objc.objc_msgSend(systemVersion, SEL_UTF8String).decode()

+ model = objc.objc_msgSend(systemModel, SEL_UTF8String).decode()

+

+ return system, release, model

diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py

index 0c2510e161..6c3c43f11d 100644

--- a/Lib/ctypes/util.py

+++ b/Lib/ctypes/util.py

@@ -67,7 +67,7 @@

return fname

return None

-elif os.name == "posix" and sys.platform == "darwin":

+elif os.name == "posix" and sys.platform in ('darwin', 'ios', 'tvos', 'watchos'):

from ctypes.macholib.dyld import dyld_find as _dyld_find

def find_library(name):

possible = ['lib%s.dylib' % name,

diff --git a/Lib/distutils/tests/test_cygwinccompiler.py b/Lib/distutils/tests/test_cygwinccompiler.py

index 0912ffd15c..959aa90522 100644

--- a/Lib/distutils/tests/test_cygwinccompiler.py

+++ b/Lib/distutils/tests/test_cygwinccompiler.py

@@ -5,11 +5,14 @@

from io import BytesIO

from test.support import run_unittest

-from distutils import cygwinccompiler

-from distutils.cygwinccompiler import (check_config_h,

- CONFIG_H_OK, CONFIG_H_NOTOK,

- CONFIG_H_UNCERTAIN, get_versions,

- get_msvcr)

+# Importing cygwinccompiler attempts to import other tools

+# that may not exist unless you're on win32.

+if sys.platform == 'win32':

+ from distutils import cygwinccompiler

+ from distutils.cygwinccompiler import (check_config_h,

+ CONFIG_H_OK, CONFIG_H_NOTOK,

+ CONFIG_H_UNCERTAIN, get_versions,

+ get_msvcr)

from distutils.tests import support

class FakePopen(object):

@@ -25,6 +28,7 @@

self.stdout = os.popen(cmd, 'r')

+@unittest.skipUnless(sys.platform == "win32", "These tests are only for win32")

class CygwinCCompilerTestCase(support.TempdirManager,

unittest.TestCase):

diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py

index 2ce5c5b64d..6e10a0c4a5 100644

--- a/Lib/distutils/util.py

+++ b/Lib/distutils/util.py

@@ -170,7 +170,7 @@

if _environ_checked:

return

- if os.name == 'posix' and 'HOME' not in os.environ:

+ if os.name == 'posix' and 'HOME' not in os.environ and sys.platform not in ('ios', 'tvos', 'watchos'):

try:

import pwd

os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]

diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py

index f603a89f7f..faea51d1b5 100644

--- a/Lib/importlib/_bootstrap_external.py

+++ b/Lib/importlib/_bootstrap_external.py

@@ -52,7 +52,7 @@

# Bootstrap-related code ######################################################

_CASE_INSENSITIVE_PLATFORMS_STR_KEY = 'win',

-_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY = 'cygwin', 'darwin'

+_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY = 'cygwin', 'darwin', 'ios', 'tvos', 'watchos'

_CASE_INSENSITIVE_PLATFORMS = (_CASE_INSENSITIVE_PLATFORMS_BYTES_KEY

+ _CASE_INSENSITIVE_PLATFORMS_STR_KEY)

diff --git a/Lib/platform.py b/Lib/platform.py

index c272c407c7..1b1aa6d141 100755

--- a/Lib/platform.py

+++ b/Lib/platform.py

@@ -451,6 +451,35 @@

# If that also doesn't work return the default values

return release, versioninfo, machine

+def iOS_ver():

+ """ Get iOS/tvOS version information, and return it as a

+ tuple (system, release, model). All tuple entries are strings.

+

+ Equivalent of:

+ system = [[UIDevice currentDevice].systemName] UTF8String]

+ release = [[UIDevice currentDevice].systemVersion] UTF8String]

+ model = [[UIDevice currentDevice].model] UTF8String]

+ """

+ import _ios_support

+ return _ios_support.get_platform_ios()

+

+def is_simulator():

+ """Determine if the current platform is a device simulator.

+

+ Only useful when working with iOS, tvOS or watchOS, because

+ Apple provides simulator platforms for those devices.

+

+ If the platform is actual hardware, returns False. Will also

+ return False for device *emulators*, which are indistinguishable

+ from actual devices because they are reproducing actual device

+ properties.

+ """

+ if sys.platform in ('ios', 'tvos', 'watchos'):

+ return sys.implementation._multiarch.endswith('simulator')

+

+ # All other platforms aren't simulators.

+ return False

+

def _java_getprop(name, default):

from java.lang import System

@@ -607,7 +636,7 @@

default in case the command should fail.

"""

- if sys.platform in ('dos', 'win32', 'win16'):

+ if sys.platform in ('dos', 'win32', 'win16', 'ios', 'tvos', 'watchos'):

# XXX Others too ?

return default

@@ -749,6 +778,24 @@

csid, cpu_number = vms_lib.getsyi('SYI$_CPU', 0)

return 'Alpha' if cpu_number >= 128 else 'VAX'

+ # On iOS, tvOS and watchOS, os.uname returns the architecture

+ # as uname.machine. On device it doesn't; but there's only

+ # on CPU architecture on device

+ def get_ios():

+ if sys.implementation._multiarch.endswith('simulator'):

+ return os.uname().machine

+ return 'arm64'

+

+ def get_tvos():

+ if sys.implementation._multiarch.endswith('simulator'):

+ return os.uname().machine

+ return 'arm64'

+

+ def get_watchos():

+ if sys.implementation._multiarch.endswith('simulator'):

+ return os.uname().machine

+ return 'arm64_32'

+

def from_subprocess():

"""

Fall back to `uname -p`

@@ -900,6 +947,14 @@

system = 'Windows'

release = 'Vista'

+ # Normalize responses on Apple mobile platforms

+ if sys.platform in ('ios', 'tvos'):

+ system, release, model = iOS_ver()

+ # Simulator devices report as "arm64" or "x86_64";

+ # use the model as the basis for the normalized machine name.

+ if sys.implementation._multiarch.endswith('simulator'):

+ machine = f'{model} Simulator'

+

vals = system, node, release, version, machine

# Replace 'unknown' values with the more portable ''

_uname_cache = uname_result(*map(_unknown_as_blank, vals))

@@ -1212,11 +1267,13 @@

system, release, version = system_alias(system, release, version)

if system == 'Darwin':

- # macOS (darwin kernel)

- macos_release = mac_ver()[0]

- if macos_release:

- system = 'macOS'

- release = macos_release

+ if sys.platform in ('ios', 'tvos'):

+ system, release, model = iOS_ver()

+ else:

+ macos_release = mac_ver()[0]

+ if macos_release:

+ system = 'macOS'

+ release = macos_release

if system == 'Windows':

# MS platforms

diff --git a/Lib/site.py b/Lib/site.py

index 69670d9d7f..8287267e64 100644

--- a/Lib/site.py

+++ b/Lib/site.py

@@ -294,6 +294,9 @@

if sys.platform == 'darwin' and sys._framework:

return f'{userbase}/lib/python/site-packages'

+ elif sys.platform in ('ios', 'tvos', 'watchos'):

+ from sysconfig import get_path

+ return get_path('purelib', sys.platform)

return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages'

diff --git a/Lib/subprocess.py b/Lib/subprocess.py

index 7ae8df154b..08899c9921 100644

--- a/Lib/subprocess.py

+++ b/Lib/subprocess.py

@@ -74,8 +74,8 @@

else:

_mswindows = True

-# wasm32-emscripten and wasm32-wasi do not support processes

-_can_fork_exec = sys.platform not in {"emscripten", "wasi"}

+# some platforms do not support processes

+_can_fork_exec = sys.platform not in {"emscripten", "wasi", "ios", "tvos", "watchos"}

if _mswindows:

import _winapi

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py

index ebe3711827..ea00c3176d 100644

--- a/Lib/sysconfig.py

+++ b/Lib/sysconfig.py

@@ -95,6 +95,33 @@

'scripts': '{base}/Scripts',

'data': '{base}',

},

+ 'ios': {

+ 'stdlib': '{installed_base}/lib/python%s' % sys.version[:3],

+ 'platstdlib': '{installed_base}/lib/python%s' % sys.version[:3],

+ 'purelib': '{installed_base}/lib/python%s/site-packages' % sys.version[:3],

+ 'platlib': '{installed_base}/lib/python%s/site-packages' % sys.version[:3],

+ 'include': '{installed_base}/include',

+ 'scripts': '{installed_base}/bin',

+ 'data': '{installed_base}/Resources',

+ },

+ 'tvos': {

+ 'stdlib': '{installed_base}/lib/python%s' % sys.version[:3],

+ 'platstdlib': '{installed_base}/lib/python%s' % sys.version[:3],

+ 'purelib': '{installed_base}/lib/python%s/site-packages' % sys.version[:3],

+ 'platlib': '{installed_base}/lib/python%s/site-packages' % sys.version[:3],

+ 'include': '{installed_base}/include',

+ 'scripts': '{installed_base}/bin',

+ 'data': '{installed_base}/Resources',

+ },

+ 'watchos': {

+ 'stdlib': '{installed_base}/lib/python%s' % sys.version[:3],

+ 'platstdlib': '{installed_base}/lib/python%s' % sys.version[:3],

+ 'purelib': '{installed_base}/lib/python%s/site-packages' % sys.version[:3],

+ 'platlib': '{installed_base}/lib/python%s/site-packages' % sys.version[:3],

+ 'include': '{installed_base}/include',

+ 'scripts': '{installed_base}/bin',

+ 'data': '{installed_base}/Resources',

+ },

}

# For the OS-native venv scheme, we essentially provide an alias:

@@ -283,12 +310,19 @@

'home': 'posix_home',

'user': 'nt_user',

}

+ if sys.platform in ('ios', 'tvos', 'watchos'):

+ return {

+ 'prefix': sys.platform,

+ 'home': sys.platform,

+ 'user': sys.platform,

+ }

if sys.platform == 'darwin' and sys._framework:

return {

'prefix': 'posix_prefix',

'home': 'posix_home',

'user': 'osx_framework_user',

}

+

return {

'prefix': 'posix_prefix',

'home': 'posix_home',

@@ -788,10 +822,16 @@

if m:

release = m.group()

elif osname[:6] == "darwin":

- import _osx_support

- osname, release, machine = _osx_support.get_platform_osx(

- get_config_vars(),

- osname, release, machine)

+ if sys.platform in ("ios", "tvos", "watchos"):

+ import _ios_support

+ _, release, model = _ios_support.get_platform_ios()

+ osname = sys.platform

+ machine = sys.implementation._multiarch

+ else:

+ import _osx_support

+ osname, release, machine = _osx_support.get_platform_osx(

+ get_config_vars(),

+ osname, release, machine)

return f"{osname}-{release}-{machine}"

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py

index 46087a98a2..ea8c228f65 100644

--- a/Lib/test/support/__init__.py

+++ b/Lib/test/support/__init__.py

@@ -47,7 +47,7 @@

"check__all__", "skip_if_buggy_ucrt_strfptime",

"check_disallow_instantiation", "check_sanitizer", "skip_if_sanitizer",

# sys

- "is_jython", "is_android", "is_emscripten", "is_wasi",

+ "is_jython", "is_android", "is_emscripten", "is_wasi", "is_apple_mobile",

"check_impl_detail", "unix_shell", "setswitchinterval",

# network

"open_urlresource",

@@ -507,7 +507,7 @@

is_android = hasattr(sys, 'getandroidapilevel')

-if sys.platform not in ('win32', 'vxworks'):

+if sys.platform not in ('win32', 'vxworks', 'ios', 'tvos', 'watchos'):

unix_shell = '/system/bin/sh' if is_android else '/bin/sh'

else:

unix_shell = None

@@ -517,12 +517,25 @@

is_emscripten = sys.platform == "emscripten"

is_wasi = sys.platform == "wasi"

-has_fork_support = hasattr(os, "fork") and not is_emscripten and not is_wasi

+# Apple mobile platforms (iOS/tvOS/watchOS) are POSIX-like but do not

+# have subprocess or fork support.

+is_apple_mobile = sys.platform in ('ios', 'tvos', 'watchos')

+

+has_fork_support = (

+ hasattr(os, "fork")

+ and not is_emscripten

+ and not is_wasi

+ and not is_apple_mobile

+)

def requires_fork():

return unittest.skipUnless(has_fork_support, "requires working os.fork()")

-has_subprocess_support = not is_emscripten and not is_wasi

+has_subprocess_support = (

+ not is_emscripten

+ and not is_wasi

+ and not is_apple_mobile

+)

def requires_subprocess():

"""Used for subprocess, os.spawn calls, fd inheritance"""

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py

index 05d9107b28..6df2bcf163 100644

--- a/Lib/test/test_asyncio/test_events.py

+++ b/Lib/test/test_asyncio/test_events.py

@@ -33,6 +33,7 @@

from asyncio import selector_events

from test.test_asyncio import utils as test_utils

from test import support

+from test.support import is_apple_mobile

from test.support import socket_helper

from test.support import threading_helper

from test.support import ALWAYS_EQ, LARGEST, SMALLEST

@@ -542,6 +543,7 @@

self._basetest_create_connection(conn_fut)

@socket_helper.skip_unless_bind_unix_socket

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_create_unix_connection(self):

# Issue #20682: On Mac OS X Tiger, getsockname() returns a

# zero-length address for UNIX socket.

@@ -634,6 +636,7 @@

self.assertEqual(cm.exception.reason, 'CERTIFICATE_VERIFY_FAILED')

@unittest.skipIf(ssl is None, 'No ssl module')

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_create_ssl_connection(self):

with test_utils.run_test_server(use_ssl=True) as httpd:

create_connection = functools.partial(

@@ -645,6 +648,7 @@

@socket_helper.skip_unless_bind_unix_socket

@unittest.skipIf(ssl is None, 'No ssl module')

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_create_ssl_unix_connection(self):

# Issue #20682: On Mac OS X Tiger, getsockname() returns a

# zero-length address for UNIX socket.

@@ -860,6 +864,7 @@

return server, path

@socket_helper.skip_unless_bind_unix_socket

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_create_unix_server(self):

proto = MyProto(loop=self.loop)

server, path = self._make_unix_server(lambda: proto)

@@ -888,6 +893,7 @@

server.close()

@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'No UNIX Sockets')

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_create_unix_server_path_socket_error(self):

proto = MyProto(loop=self.loop)

sock = socket.socket()

@@ -953,6 +959,7 @@

@socket_helper.skip_unless_bind_unix_socket

@unittest.skipIf(ssl is None, 'No ssl module')

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_create_unix_server_ssl(self):

proto = MyProto(loop=self.loop)

server, path = self._make_ssl_unix_server(

@@ -983,6 +990,7 @@

server.close()

@unittest.skipIf(ssl is None, 'No ssl module')

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_create_server_ssl_verify_failed(self):

proto = MyProto(loop=self.loop)

server, host, port = self._make_ssl_server(

@@ -1013,6 +1021,7 @@

@socket_helper.skip_unless_bind_unix_socket

@unittest.skipIf(ssl is None, 'No ssl module')

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_create_unix_server_ssl_verify_failed(self):

proto = MyProto(loop=self.loop)

server, path = self._make_ssl_unix_server(

@@ -1073,6 +1082,7 @@

@socket_helper.skip_unless_bind_unix_socket

@unittest.skipIf(ssl is None, 'No ssl module')

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_create_unix_server_ssl_verified(self):

proto = MyProto(loop=self.loop)

server, path = self._make_ssl_unix_server(

diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py

index 0c49099bc4..c972bade4b 100644

--- a/Lib/test/test_asyncio/test_streams.py

+++ b/Lib/test/test_asyncio/test_streams.py

@@ -17,6 +17,7 @@

import asyncio

from test.test_asyncio import utils as test_utils

+from test.support import is_apple_mobile

def tearDownModule():

@@ -60,6 +61,7 @@

self._basetest_open_connection(conn_fut)

@socket_helper.skip_unless_bind_unix_socket

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_open_unix_connection(self):

with test_utils.run_test_unix_server() as httpd:

conn_fut = asyncio.open_unix_connection(httpd.address)

@@ -91,6 +93,7 @@

@socket_helper.skip_unless_bind_unix_socket

@unittest.skipIf(ssl is None, 'No ssl module')

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_open_unix_connection_no_loop_ssl(self):

with test_utils.run_test_unix_server(use_ssl=True) as httpd:

conn_fut = asyncio.open_unix_connection(

@@ -119,6 +122,7 @@

self._basetest_open_connection_error(conn_fut)

@socket_helper.skip_unless_bind_unix_socket

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_open_unix_connection_error(self):

with test_utils.run_test_unix_server() as httpd:

conn_fut = asyncio.open_unix_connection(httpd.address)

@@ -637,6 +641,7 @@

self.assertEqual(messages, [])

@socket_helper.skip_unless_bind_unix_socket

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_start_unix_server(self):

class MyServer:

diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py

index 1d922783ce..81a5d2c699 100644

--- a/Lib/test/test_asyncio/test_unix_events.py

+++ b/Lib/test/test_asyncio/test_unix_events.py

@@ -13,6 +13,7 @@

import threading

import unittest

from unittest import mock

+from test.support import is_apple_mobile

from test.support import os_helper

from test.support import socket_helper

@@ -276,6 +277,7 @@

@unittest.skipUnless(hasattr(socket, 'AF_UNIX'),

'UNIX Sockets are not supported')

+@unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

class SelectorEventLoopUnixSocketTests(test_utils.TestCase):

def setUp(self):

diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py

index fc8c39365f..16235b8397 100644

--- a/Lib/test/test_fcntl.py

+++ b/Lib/test/test_fcntl.py

@@ -6,7 +6,7 @@

import sys

import unittest

from multiprocessing import Process

-from test.support import verbose, cpython_only

+from test.support import verbose, cpython_only, is_apple_mobile

from test.support.import_helper import import_module

from test.support.os_helper import TESTFN, unlink

@@ -25,7 +25,7 @@

start_len = "qq"

if (sys.platform.startswith(('netbsd', 'freebsd', 'openbsd'))

- or sys.platform == 'darwin'):

+ or sys.platform == 'darwin' or is_apple_mobile):

if struct.calcsize('l') == 8:

off_t = 'l'

pid_t = 'i'

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py

index a937258069..3829c29fe5 100644

--- a/Lib/test/test_httpservers.py

+++ b/Lib/test/test_httpservers.py

@@ -30,6 +30,7 @@

import unittest

from test import support

+from test.support import is_apple_mobile

from test.support import os_helper

from test.support import threading_helper

@@ -401,7 +402,7 @@

with open(os.path.join(self.tempdir, filename), 'wb') as f:

f.write(os_helper.TESTFN_UNDECODABLE)

response = self.request(self.base_url + '/')

- if sys.platform == 'darwin':

+ if sys.platform == 'darwin' or is_apple_mobile:

# On Mac OS the HFS+ filesystem replaces bytes that aren't valid

# UTF-8 into a percent-encoded value.

for name in os.listdir(self.tempdir):

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py

index daccbae5b4..607e40eb66 100644

--- a/Lib/test/test_io.py

+++ b/Lib/test/test_io.py

@@ -40,6 +40,7 @@

from test.support.script_helper import (

assert_python_ok, assert_python_failure, run_python_until_end)

from test.support import import_helper

+from test.support import is_apple_mobile

from test.support import os_helper

from test.support import threading_helper

from test.support import warnings_helper

@@ -609,7 +610,7 @@

# On Windows and Mac OSX this test consumes large resources; It takes

# a long time to build the >2 GiB file and takes >2 GiB of disk space

# therefore the resource must be enabled to run this test.

- if sys.platform[:3] == 'win' or sys.platform == 'darwin':

+ if sys.platform[:3] == 'win' or sys.platform == 'darwin' or is_apple_mobile:

support.requires(

'largefile',

'test requires %s bytes and a long time to run' % self.LARGE)

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py

index 350f4a57e2..54ef53a4c1 100644

--- a/Lib/test/test_logging.py

+++ b/Lib/test/test_logging.py

@@ -43,6 +43,7 @@

import tempfile

from test.support.script_helper import assert_python_ok, assert_python_failure

from test import support

+from test.support import is_apple_mobile

from test.support import os_helper

from test.support import socket_helper

from test.support import threading_helper

@@ -1787,9 +1788,20 @@

# just need a name - file can't be present, or we'll get an

# 'address already in use' error.

os.remove(fn)

+ # Check the size of the socket file name. If it exceeds 108

+ # characters (UNIX_PATH_MAX), it can't be used as a UNIX socket.

+ # In this case, fall back to a path constructed somewhere that

+ # is known to be short.

+ if len(fn) > 108:

+ fd, fn = tempfile.mkstemp(prefix='test_logging_', suffix='.sock', dir='/tmp')

+ os.close(fd)

+ # just need a name - file can't be present, or we'll get an

+ # 'address already in use' error.

+ os.remove(fn)

return fn

@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")

+@unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

class UnixSocketHandlerTest(SocketHandlerTest):

"""Test for SocketHandler with unix sockets."""

@@ -1873,6 +1885,7 @@

self.assertEqual(self.log_output, "spam\neggs\n")

@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")

+@unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

class UnixDatagramHandlerTest(DatagramHandlerTest):

"""Test for DatagramHandler using Unix sockets."""

@@ -1967,6 +1980,7 @@

self.assertEqual(self.log_output, b'<11>sp\xc3\xa4m\x00')

@unittest.skipUnless(hasattr(socket, "AF_UNIX"), "Unix sockets required")

+@unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

class UnixSysLogHandlerTest(SysLogHandlerTest):

"""Test for SysLogHandler with Unix sockets."""

diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py

index aae86cc257..8be5af371b 100644

--- a/Lib/test/test_marshal.py

+++ b/Lib/test/test_marshal.py

@@ -1,5 +1,5 @@

from test import support

-from test.support import os_helper, requires_debug_ranges

+from test.support import os_helper, requires_debug_ranges, is_apple_mobile

from test.support.script_helper import assert_python_ok

import array

import io

@@ -260,7 +260,10 @@

if os.name == 'nt':

MAX_MARSHAL_STACK_DEPTH = 1000

else:

- MAX_MARSHAL_STACK_DEPTH = 2000

+ if is_apple_mobile:

+ MAX_MARSHAL_STACK_DEPTH = 1500

+ else:

+ MAX_MARSHAL_STACK_DEPTH = 2000

for i in range(MAX_MARSHAL_STACK_DEPTH - 2):

last.append([0])

last = last[-1]

diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py

index 213a44d56f..87279579fe 100644

--- a/Lib/test/test_mmap.py

+++ b/Lib/test/test_mmap.py

@@ -1,5 +1,5 @@

from test.support import (

- requires, _2G, _4G, gc_collect, cpython_only, is_emscripten

+ requires, _2G, _4G, gc_collect, cpython_only, is_emscripten, is_apple_mobile

)

from test.support.import_helper import import_module

from test.support.os_helper import TESTFN, unlink

@@ -245,7 +245,7 @@

with open(TESTFN, "r+b") as f:

self.assertRaises(ValueError, mmap.mmap, f.fileno(), mapsize, access=4)

- if os.name == "posix":

+ if os.name == "posix" and not is_apple_mobile:

# Try incompatible flags, prot and access parameters.

with open(TESTFN, "r+b") as f:

self.assertRaises(ValueError, mmap.mmap, f.fileno(), mapsize,

@@ -896,7 +896,7 @@

unlink(TESTFN)

def _make_test_file(self, num_zeroes, tail):

- if sys.platform[:3] == 'win' or sys.platform == 'darwin':

+ if sys.platform[:3] == 'win' or sys.platform == 'darwin' or is_apple_mobile:

requires('largefile',

'test requires %s bytes and a long time to run' % str(0x180000000))

f = open(TESTFN, 'w+b')

diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py

index 9b2cd201f3..e47de5d468 100644

--- a/Lib/test/test_platform.py

+++ b/Lib/test/test_platform.py

@@ -8,7 +8,7 @@

from unittest import mock

from test import support

-from test.support import os_helper

+from test.support import os_helper, is_apple_mobile

FEDORA_OS_RELEASE = """\

NAME=Fedora

@@ -315,7 +315,7 @@

def test_mac_ver(self):

res = platform.mac_ver()

- if platform.uname().system == 'Darwin':

+ if platform.uname().system == 'Darwin' and not is_apple_mobile:

# We are on a macOS system, check that the right version

# information is returned

output = subprocess.check_output(['sw_vers'], text=True)

@@ -347,6 +347,9 @@

else:

self.assertEqual(res[2], 'PowerPC')

+ @unittest.skipUnless(is_apple_mobile, 'iOS/tvOS/watchOS only test')

+ def test_ios_ver(self):

+ res = platform.ios_ver()

@unittest.skipUnless(sys.platform == 'darwin', "OSX only test")

def test_mac_ver_with_fork(self):

diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py

index ae25ef5588..2885d5fd52 100644

--- a/Lib/test/test_posix.py

+++ b/Lib/test/test_posix.py

@@ -2,6 +2,7 @@

from test import support

from test.support import import_helper

+from test.support import is_apple_mobile

from test.support import os_helper

from test.support import warnings_helper

from test.support.script_helper import assert_python_ok

@@ -69,12 +70,19 @@

"getpid", "getpgrp", "getppid", "getuid", "sync",

]

+ # getgroups can't be invoked on iOS/tvOS/watchOS.

+ if is_apple_mobile:

+ NO_ARG_FUNCTIONS.append("getgroups")

+

for name in NO_ARG_FUNCTIONS:

posix_func = getattr(posix, name, None)

if posix_func is not None:

with self.subTest(name):

- posix_func()

- self.assertRaises(TypeError, posix_func, 1)

+ try:

+ posix_func()

+ self.assertRaises(TypeError, posix_func, 1)

+ except Exception as e:

+ self.fail('Problem invoking %s: %s' % (name, e))

@unittest.skipUnless(hasattr(posix, 'getresuid'),

'test needs posix.getresuid()')

@@ -776,9 +784,10 @@

check_stat(uid, gid)

self.assertRaises(OSError, chown_func, first_param, 0, -1)

check_stat(uid, gid)

- if 0 not in os.getgroups():

- self.assertRaises(OSError, chown_func, first_param, -1, 0)

- check_stat(uid, gid)

+ if hasattr(os, 'getgroups') and not is_apple_mobile:

+ if 0 not in os.getgroups():

+ self.assertRaises(OSError, chown_func, first_param, -1, 0)

+ check_stat(uid, gid)

# test illegal types

for t in str, float:

self.assertRaises(TypeError, chown_func, first_param, t(uid), gid)

@@ -1129,7 +1138,7 @@

self.assertIsInstance(hi, int)

self.assertGreaterEqual(hi, lo)

# OSX evidently just returns 15 without checking the argument.

- if sys.platform != "darwin":

+ if sys.platform != 'darwin' and not is_apple_mobile:

self.assertRaises(OSError, posix.sched_get_priority_min, -23)

self.assertRaises(OSError, posix.sched_get_priority_max, -23)

diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py

index a2c4ab5081..45927b3163 100644

--- a/Lib/test/test_shutil.py

+++ b/Lib/test/test_shutil.py

@@ -1776,6 +1776,7 @@

check_chown(dirname, uid, gid)

+@unittest.skipIf(support.has_subprocess_support, 'Test requires support for subprocesses.')

class TestWhich(BaseTest, unittest.TestCase):

def setUp(self):

@@ -2642,6 +2643,7 @@

self.assertGreaterEqual(size.lines, 0)

@unittest.skipUnless(os.isatty(sys.__stdout__.fileno()), "not on tty")

+ @unittest.skipUnless(support.has_subprocess_support, 'Test requires support for subprocesses.')

@unittest.skipUnless(hasattr(os, 'get_terminal_size'),

'need os.get_terminal_size()')

def test_stty_match(self):

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py

index b07954989f..ac634d421c 100644

--- a/Lib/test/test_socket.py

+++ b/Lib/test/test_socket.py

@@ -1,5 +1,6 @@

import unittest

from test import support

+from test.support import is_apple_mobile

from test.support import os_helper

from test.support import socket_helper

from test.support import threading_helper

@@ -1157,7 +1158,7 @@

# I've ordered this by protocols that have both a tcp and udp

# protocol, at least for modern Linuxes.

if (sys.platform.startswith(('freebsd', 'netbsd', 'gnukfreebsd'))

- or sys.platform in ('linux', 'darwin')):

+ or sys.platform in ('linux', 'darwin') or is_apple_mobile):

# avoid the 'echo' service on this platform, as there is an

# assumption breaking non-standard port/protocol entry

services = ('daytime', 'qotd', 'domain')

@@ -3563,7 +3564,7 @@

def _testFDPassCMSG_LEN(self):

self.createAndSendFDs(1)

- @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")

+ @unittest.skipIf(sys.platform == "darwin" or is_apple_mobile, "skipping, see issue #12958")

@unittest.skipIf(AIX, "skipping, see issue #22397")

@requireAttrs(socket, "CMSG_SPACE")

def testFDPassSeparate(self):

@@ -3574,7 +3575,7 @@

maxcmsgs=2)

@testFDPassSeparate.client_skip

- @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")

+ @unittest.skipIf(sys.platform == "darwin" or is_apple_mobile, "skipping, see issue #12958")

@unittest.skipIf(AIX, "skipping, see issue #22397")

def _testFDPassSeparate(self):

fd0, fd1 = self.newFDs(2)

@@ -3587,7 +3588,7 @@

array.array("i", [fd1]))]),

len(MSG))

- @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")

+ @unittest.skipIf(sys.platform == "darwin" or is_apple_mobile, "skipping, see issue #12958")

@unittest.skipIf(AIX, "skipping, see issue #22397")

@requireAttrs(socket, "CMSG_SPACE")

def testFDPassSeparateMinSpace(self):

@@ -3601,7 +3602,7 @@

maxcmsgs=2, ignoreflags=socket.MSG_CTRUNC)

@testFDPassSeparateMinSpace.client_skip

- @unittest.skipIf(sys.platform == "darwin", "skipping, see issue #12958")

+ @unittest.skipIf(sys.platform == "darwin" or is_apple_mobile, "skipping, see issue #12958")

@unittest.skipIf(AIX, "skipping, see issue #22397")

def _testFDPassSeparateMinSpace(self):

fd0, fd1 = self.newFDs(2)

@@ -3625,7 +3626,7 @@

nbytes = self.sendmsgToServer([msg])

self.assertEqual(nbytes, len(msg))

- @unittest.skipIf(sys.platform == "darwin", "see issue #24725")

+ @unittest.skipIf(sys.platform == "darwin" or is_apple_mobile, "skipping, see issue #12958")

def testFDPassEmpty(self):

# Try to pass an empty FD array. Can receive either no array

# or an empty array.

@@ -4445,28 +4446,33 @@

pass

@requireAttrs(socket.socket, "sendmsg")

+@unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

@requireAttrs(socket, "AF_UNIX")

class SendmsgUnixStreamTest(SendmsgStreamTests, SendrecvmsgUnixStreamTestBase):

pass

@requireAttrs(socket.socket, "recvmsg")

+@unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

@requireAttrs(socket, "AF_UNIX")

class RecvmsgUnixStreamTest(RecvmsgTests, RecvmsgGenericStreamTests,

SendrecvmsgUnixStreamTestBase):

pass

@requireAttrs(socket.socket, "recvmsg_into")

+@unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

@requireAttrs(socket, "AF_UNIX")

class RecvmsgIntoUnixStreamTest(RecvmsgIntoTests, RecvmsgGenericStreamTests,

SendrecvmsgUnixStreamTestBase):

pass

@requireAttrs(socket.socket, "sendmsg", "recvmsg")

+@unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

@requireAttrs(socket, "AF_UNIX", "SOL_SOCKET", "SCM_RIGHTS")

class RecvmsgSCMRightsStreamTest(SCMRightsTest, SendrecvmsgUnixStreamTestBase):

pass

@requireAttrs(socket.socket, "sendmsg", "recvmsg_into")

+@unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

@requireAttrs(socket, "AF_UNIX", "SOL_SOCKET", "SCM_RIGHTS")

class RecvmsgIntoSCMRightsStreamTest(RecvmsgIntoMixin, SCMRightsTest,

SendrecvmsgUnixStreamTestBase):

diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py

index 2edb1e0c0e..62307168f6 100644

--- a/Lib/test/test_socketserver.py

+++ b/Lib/test/test_socketserver.py

@@ -8,13 +8,14 @@

import select

import signal

import socket

+import sys

import tempfile

import threading

import unittest

import socketserver

import test.support

-from test.support import reap_children, verbose

+from test.support import reap_children, verbose, is_apple_mobile

from test.support import os_helper

from test.support import socket_helper

from test.support import threading_helper

@@ -198,12 +199,14 @@

self.stream_examine)

@requires_unix_sockets

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_UnixStreamServer(self):

self.run_server(socketserver.UnixStreamServer,

socketserver.StreamRequestHandler,

self.stream_examine)

@requires_unix_sockets

+ @unittest.skipIf(is_apple_mobile, "%s doesn't fully support UNIX sockets." % sys.platform)

def test_ThreadingUnixStreamServer(self):

self.run_server(socketserver.ThreadingUnixStreamServer,

socketserver.StreamRequestHandler,

diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py

index de2e7305cc..ccf240397d 100644

--- a/Lib/test/test_sundry.py

+++ b/Lib/test/test_sundry.py

@@ -1,5 +1,6 @@

"""Do a minimal test of all the modules that aren't otherwise tested."""

import importlib

+import sys

from test import support

from test.support import import_helper

from test.support import warnings_helper

@@ -20,7 +21,8 @@

import distutils.bcppcompiler

import distutils.ccompiler

- import distutils.cygwinccompiler

+ if sys.platform.startswith('win'):

+ import distutils.cygwinccompiler

import distutils.filelist

import distutils.text_file

import distutils.unixccompiler

diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py

index 578ac1db50..daf61113b2 100644

--- a/Lib/test/test_sysconfig.py

+++ b/Lib/test/test_sysconfig.py

@@ -336,7 +336,7 @@

self.assertTrue(os.path.isfile(config_h), config_h)

def test_get_scheme_names(self):

- wanted = ['nt', 'posix_home', 'posix_prefix', 'posix_venv', 'nt_venv', 'venv']

+ wanted = ['nt', 'posix_home', 'posix_prefix', 'posix_venv', 'nt_venv', 'venv', 'tvos', 'watchos']

if HAS_USER_BASE:

wanted.extend(['nt_user', 'osx_framework_user', 'posix_user'])

self.assertEqual(get_scheme_names(), tuple(sorted(wanted)))

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py

index 9c6561c099..ccccfb8b0b 100644

--- a/Lib/test/test_threading.py

+++ b/Lib/test/test_threading.py

@@ -3,7 +3,7 @@

"""

import test.support

-from test.support import threading_helper, requires_subprocess

+from test.support import threading_helper, requires_subprocess, is_apple_mobile

from test.support import verbose, cpython_only, os_helper

from test.support.import_helper import import_module

from test.support.script_helper import assert_python_ok, assert_python_failure

@@ -1171,6 +1171,7 @@

os.set_blocking(r, False)

return (r, w)

+ @unittest.skipIf(is_apple_mobile, "%s doesn't have os.pipe" % sys.platform)

def test_threads_join(self):

# Non-daemon threads should be joined at subinterpreter shutdown

# (issue #18808)

@@ -1199,6 +1200,7 @@

# The thread was joined properly.

self.assertEqual(os.read(r, 1), b"x")

+ @unittest.skipIf(is_apple_mobile, "%s doesn't have os.pipe" % sys.platform)

def test_threads_join_2(self):

# Same as above, but a delay gets introduced after the thread's

# Python code returned but before the thread state is deleted.

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py

index 74039f59f7..36dc82f871 100644

--- a/Lib/test/test_venv.py

+++ b/Lib/test/test_venv.py

@@ -19,7 +19,7 @@