[tor-commits] [tor-browser] 04/76: Bug 1718878 - Minimal changes to third_party library gyp to make it compatible with Python 3.10 r=mhentges a=RyanVM

[gitolite role <git@xxxxxxxxxxxxxxxxxxxxx>]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-91.8.0esr-11.0-1
in repository tor-browser.

commit 8fb634d7772b0173e174a32b80895df62ab82f38
Author: Alex Hochheiden <ahochheiden@xxxxxxxxxxx>
AuthorDate: Wed Oct 27 13:35:12 2021 +0000

    Bug 1718878 - Minimal changes to third_party library gyp to make it compatible with Python 3.10 r=mhentges a=RyanVM
    
    gyp appears to have been abandoned. To make it compatible with Python 3.10 a
    small 'soft fork' had to be made. If gyp is ever updated in the future, these
    changes can probably be discarded.
    
    gyp source here: https://chromium.googlesource.com/external/gyp/
    
    Differential Revision: https://phabricator.services.mozilla.com/D128837
---
 third_party/python/gyp/pylib/gyp/msvs_emulation.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/third_party/python/gyp/pylib/gyp/msvs_emulation.py b/third_party/python/gyp/pylib/gyp/msvs_emulation.py
index 63d40e63ec9ab..43fbbbb96279a 100644
--- a/third_party/python/gyp/pylib/gyp/msvs_emulation.py
+++ b/third_party/python/gyp/pylib/gyp/msvs_emulation.py
@@ -91,7 +91,7 @@ def _AddPrefix(element, prefix):
   """Add |prefix| to |element| or each subelement if element is iterable."""
   if element is None:
     return element
-  if (isinstance(element, collections.Iterable) and
+  if (isinstance(element, collections.abc.Iterable) and
       not isinstance(element, basestring)):
     return [prefix + e for e in element]
   else:
@@ -104,7 +104,7 @@ def _DoRemapping(element, map):
   if map is not None and element is not None:
     if not callable(map):
       map = map.get # Assume it's a dict, otherwise a callable to do the remap.
-    if (isinstance(element, collections.Iterable) and
+    if (isinstance(element, collections.abc.Iterable) and
         not isinstance(element, basestring)):
       element = filter(None, [map(elem) for elem in element])
     else:
@@ -117,7 +117,7 @@ def _AppendOrReturn(append, element):
   then add |element| to it, adding each item in |element| if it's a list or
   tuple."""
   if append is not None and element is not None:
-    if (isinstance(element, collections.Iterable) and
+    if (isinstance(element, collections.abc.Iterable) and
         not isinstance(element, basestring)):
       append.extend(element)
     else:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits