Fix deprecation warning for 3.7 and up

dmerejkowsky · dmerejkowsky · commit 3e81ad1f7ea5 · 2019-07-26T17:05:14.000+02:00
Fix #963
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -181,4 +181,6 @@ Contributors
 
 - Steven Nyman (@stevennyman)
 
-- Tigran Tchougourian (@NargiT)
+- Tigran Tchougourian (@NargiT)
+
+- Dimitri Merejkowsky (@dmerejkowsky)
diff --git a/src/github3/session.py b/src/github3/session.py
@@ -1,6 +1,11 @@
 # -*- coding: utf-8 -*-
 """Module containing session and auth logic."""
-from collections import Callable
+try:
+    from collections.abc import Callable
+except ImportError:
+    # For Python 2.7 compatibility
+    from collections import Callable
+
 import datetime
 from contextlib import contextmanager
 from logging import getLogger
diff --git a/src/github3/structs.py b/src/github3/structs.py
@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
-import collections
+try:
+    from collections.abc import Iterator
+except ImportError:
+    # For Python 2.7 compatibility
+    from collections import Iterator
 import functools
 
 from requests.compat import urlparse, urlencode
@@ -8,7 +12,7 @@
 from . import models
 
 
-class GitHubIterator(models.GitHubCore, collections.Iterator):
+class GitHubIterator(models.GitHubCore, Iterator):
     """The :class:`GitHubIterator` class powers all of the iter_* methods."""
 
     def __init__(
