Merge lp:~cjwatson/launchpadlib/py3-callable into lp:launchpadlib

[Colin Watson]

Squash a deprecation warning on Python >= 3.7 in launchpadlib.testing.launchpad.

[Kristian Glass (doismellburning)]

review: Approve

=== modified file 'NEWS.txt'
--- NEWS.txt	2019-11-04 22:50:46 +0000
+++ NEWS.txt	2019-11-22 13:35:40 +0000
@@ -2,6 +2,11 @@
 NEWS for launchpadlib
 =====================
 
+1.10.8
+======
+- Squash a deprecation warning on Python >= 3.7 in
+  launchpadlib.testing.launchpad.
+
 1.10.7 (2019-05-22)
 ===================
 - Change 'dev' URLs from launchpad.dev to launchpad.test.
 
=== modified file 'src/launchpadlib/testing/launchpad.py'
--- src/launchpadlib/testing/launchpad.py	2014-07-14 20:29:51 +0000
+++ src/launchpadlib/testing/launchpad.py	2019-11-22 13:35:40 +0000
@@ -66,7 +66,10 @@
 """
 
 from datetime import datetime
-import collections
+try:
+    from collections.abc import Callable
+except ImportError:
+    from collections import Callable
 import sys
 if sys.version_info[0] >= 3:
     basestring = str
@@ -205,7 +208,7 @@
         result = self._children.get(name, _marker)
         if result is _marker:
             result = self._values.get(name, _marker)
-            if isinstance(result, collections.Callable):
+            if isinstance(result, Callable):
                 return self._wrap_method(name, result)
         if name in self.special_methods:
             return lambda: True
@@ -280,7 +283,7 @@
             attributes and methods.
         """
         for name, value in partial_object.items():
-            if isinstance(value, collections.Callable):
+            if isinstance(value, Callable):
                 # Performs an integrity check.
                 self._get_method(resource_type, name)
             else:
@@ -306,7 +309,7 @@
             if name == "entries":
                 name, child_resource_type = (
                     self._check_entries(resource_type, value))
-            elif isinstance(value, collections.Callable):
+            elif isinstance(value, Callable):
                 # Performs an integrity check.
                 self._get_method(resource_type, name)
             else: