SNOW-76497: fixed python 2 issue on collections.abc

Author: sfc-gh-stakeda

compat.py

@@ -34,10 +34,13 @@
     import httplib
     import Queue
     from HTMLParser import HTMLParser
+    import collections
 
     GET_CWD = os.getcwdu
     BASE_EXCEPTION_CLASS = StandardError  # noqa: F821
     TO_UNICODE = unicode  # noqa: F821
+    ITERATOR = collections.Iterator
+    MAPPING = collections.Mapping
 
     urlsplit = urlparse.urlsplit
     urlunsplit = urlparse.urlunsplit
@@ -75,10 +78,13 @@
     import urllib.request
     import queue
     import html
+    import collections.abc
 
     GET_CWD = os.getcwd
     BASE_EXCEPTION_CLASS = Exception
     TO_UNICODE = str
+    ITERATOR = collections.abc.Iterator
+    MAPPING = collections.abc.Mapping
 
     urlsplit = urllib.parse.urlsplit
     urlunsplit = urllib.parse.urlunsplit

network.py

@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2012-2019 Snowflake Computing Inc. All right reserved.
 #
-import collections.abc
+import collections
 import contextlib
 import gzip
 import itertools
@@ -29,6 +29,7 @@
 from . import ssl_wrap_socket
 from .compat import (
     PY2,
+    ITERATOR,
     METHOD_NOT_ALLOWED, BAD_REQUEST, SERVICE_UNAVAILABLE, GATEWAY_TIMEOUT,
     FORBIDDEN, BAD_GATEWAY, REQUEST_TIMEOUT,
     UNAUTHORIZED, INTERNAL_SERVER_ERROR, OK, BadStatusLine)
@@ -184,7 +185,7 @@ def __call__(self, r):
         return r
 
 
-class ResultIterWithTimings(collections.abc.Iterator):
+class ResultIterWithTimings(ITERATOR):
     DOWNLOAD = u"download"
     PARSE = u"parse"
 
@@ -908,4 +909,5 @@ def _use_requests_session(self):
                         "session doesn't exist in the active session pool. "
                         "Ignored...")
                 logger.debug("Active requests sessions: %s, idle: %s",
-                             len(self._active_sessions), len(self._idle_sessions))
+                             len(self._active_sessions),
+                             len(self._idle_sessions))

ssl_wrap_util.py

@@ -22,7 +22,7 @@
 import sys
 import time
 from collections import namedtuple
-from collections.abc import Mapping
+from .compat import MAPPING
 
 try:
     monotonic = time.monotonic
@@ -138,7 +138,7 @@ def _syscall_wrapper(func, recalc_timeout, *args, **kwargs):
 SelectorKey = namedtuple('SelectorKey', ['fileobj', 'fd', 'events', 'data'])
 
 
-class _SelectorMapping(Mapping):
+class _SelectorMapping(MAPPING):
     """ Mapping of file objects to selector keys """
 
     def __init__(self, selector):