Merge pull request #2476 from oulenz/collections

Try importing from collections.abc for compatibility with Python 3.8

pelican/__init__.py

@@ -2,7 +2,10 @@
 from __future__ import print_function, unicode_literals
 
 import argparse
-import collections
+try:
+    import collections.abc as collections
+except ImportError:
+    import collections
 import locale
 import logging
 import multiprocessing

pelican/log.py

@@ -5,7 +5,11 @@ import locale
 import logging
 import os
 import sys
-from collections import Mapping, defaultdict
+from collections import defaultdict
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
 
 import six
 

pelican/utils.py

@@ -12,7 +12,10 @@ import re
 import shutil
 import sys
 import traceback
-from collections import Hashable
+try:
+    from collections.abc import Hashable
+except ImportError:
+    from collections import Hashable
 from contextlib import contextmanager
 from functools import partial
 from itertools import groupby