Merge pull request swiftlang#60408 from apple/cherry-pick-ed696240cf610ae7de3eb2e53c89cff83aa1e6e2

[5.7] Use `collections.abc.Iterable` instead of `collection.Iterable`

Author: tkremenek

utils/build_swift/build_swift/shell.py

@@ -208,7 +208,7 @@ def quote(command):
     if isinstance(command, (str,)):
         return _quote(command)
 
-    if isinstance(command, collections.Iterable):
+    if isinstance(command, collections.abc.Iterable):
         return ' '.join([_quote(arg) for arg in _normalize_args(command)])
 
     raise ValueError('Invalid command type: {}'.format(type(command).__name__))

utils/build_swift/tests/build_swift/test_shell.py

@@ -67,7 +67,7 @@ def duplicate(x):
 
         result = shell._flatmap(duplicate, [1, 2, 3])
 
-        self.assertIsInstance(result, collections.Iterable)
+        self.assertIsInstance(result, collections.abc.Iterable)
         self.assertEqual(list(result), [1, 1, 2, 2, 3, 3])
 
     # -------------------------------------------------------------------------