Merge pull request sigmavirus24#964 from dmerejkowsky/dm/3.8

sigmavirus24 · web-flow · commit 9e749aa9b9d6 · 2019-07-30T09:11:31.000-05:00
Fix deprecation warning for 3.7 and up
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/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -56,6 +56,8 @@ Guidelines for Contributing to github3.py
 
 #. Please follow pep-0008_. Feel free to also use flake8_ to help.
 
+#. Import modules, not class or functions
+
 .. links
 .. _README: ./README.rst
 .. _easy: https://github.com/sigmavirus24/github3.py/issues?labels=Easy&page=1&state=open
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:
+    import collections.abc as abc_collections
+except ImportError:
+    # For Python 2.7 compatibility
+    import collections as abc_collections
+
 import datetime
 from contextlib import contextmanager
 from logging import getLogger
@@ -193,7 +198,7 @@ def two_factor_auth_callback(self, callback):
         if not callback:
             return
 
-        if not isinstance(callback, Callable):
+        if not isinstance(callback, abc_collections.Callable):
             raise ValueError("Your callback should be callable")
 
         self.two_factor_auth_cb = callback
diff --git a/src/github3/structs.py b/src/github3/structs.py
@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
-import collections
+try:
+    import collections.abc as abc_collections
+except ImportError:
+    # For Python 2.7 compatibility
+    import collections as abc_collections
 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, abc_collections.Iterator):
     """The :class:`GitHubIterator` class powers all of the iter_* methods."""
 
     def __init__(
diff --git a/src/github3/utils.py b/src/github3/utils.py
@@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-
 """A collection of useful utilities."""
-import collections
+try:
+    import collections.abc as abc_collections
+except ImportError:
+    # For Python 2.7 compatibility
+    import collections as abc_collections
 import datetime
 import re
 
@@ -68,7 +72,7 @@ def stream_response_to_file(response, path=None):
     fd = None
     filename = None
     if path:
-        if isinstance(getattr(path, "write", None), collections.Callable):
+        if isinstance(getattr(path, "write", None), abc_collections.Callable):
             pre_opened = True
             fd = path
             filename = getattr(fd, "name", None)
