Merge branch 'release/1.5.3'

logbook/__version__.py

@@ -1 +1 @@
-__version__ = "1.5.2"
+__version__ = "1.5.3"

logbook/compat.py

@@ -16,7 +16,7 @@
 from datetime import date, datetime
 
 import logbook
-from logbook.helpers import u, string_types, iteritems
+from logbook.helpers import u, string_types, iteritems, collections_abc
 
 _epoch_ord = date(1970, 1, 1).toordinal()
 
@@ -133,7 +133,7 @@ def convert_record(self, old_record):
         kwargs = None
 
         # Logging allows passing a mapping object, in which case args will be a mapping.
-        if isinstance(args, collections.Mapping):
+        if isinstance(args, collections_abc.Mapping):
             kwargs = args
             args = None
         record = LoggingCompatRecord(old_record.name,

logbook/handlers.py

@@ -32,7 +32,7 @@
     _missing, lookup_level, Flags, ContextObject, ContextStackManager,
     _datetime_factory)
 from logbook.helpers import (
-    rename, b, _is_text_stream, is_unicode, PY2, zip, xrange, string_types,
+    rename, b, _is_text_stream, is_unicode, PY2, zip, xrange, string_types, collections_abc,
     integer_types, reraise, u, with_metaclass)
 from logbook.concurrency import new_fine_grained_lock
 
@@ -1355,10 +1355,10 @@ def get_connection(self):
         # - tuple to be unpacked to variables keyfile and certfile.
         # - secure=() equivalent to secure=True for backwards compatibility.
         # - secure=False equivalent to secure=None to disable.
-        if isinstance(self.secure, collections.Mapping):
+        if isinstance(self.secure, collections_abc.Mapping):
             keyfile = self.secure.get('keyfile', None)
             certfile = self.secure.get('certfile', None)
-        elif isinstance(self.secure, collections.Iterable):
+        elif isinstance(self.secure, collections_abc.Iterable):
             # Allow empty tuple for backwards compatibility
             if len(self.secure) == 0:
                 keyfile = certfile = None
@@ -1381,7 +1381,7 @@ def get_connection(self):
                 con.ehlo()
 
             # Allow credentials to be a tuple or dict.
-            if isinstance(self.credentials, collections.Mapping):
+            if isinstance(self.credentials, collections_abc.Mapping):
                 credentials_args = ()
                 credentials_kwargs = self.credentials
             else:

logbook/helpers.py

@@ -20,8 +20,10 @@
 
 if PY2:
     import __builtin__ as _builtins
+    import collections as collections_abc
 else:
     import builtins as _builtins
+    import collections.abc as collections_abc
 
 try:
     import json