Merge branch 'fix-warnings' into accept-parse-offer

src/webob/compat.py

@@ -49,6 +49,13 @@ def native_(s, encoding='latin-1', errors='strict'):
 except ImportError:
     from Queue import Queue, Empty
 
+try:
+    from collections.abc import MutableMapping
+    from collections.abc import Iterable
+except ImportError:
+    from collections import MutableMapping
+    from collections import Iterable
+
 if PY3:
     from urllib import parse
     urlparse = parse

src/webob/cookies.py

@@ -1,5 +1,3 @@
-import collections
-
 import base64
 import binascii
 import hashlib
@@ -16,6 +14,7 @@
 import warnings
 
 from webob.compat import (
+    MutableMapping,
     PY2,
     text_type,
     bytes_,
@@ -31,7 +30,7 @@
 
 _marker = object()
 
-class RequestCookies(collections.MutableMapping):
+class RequestCookies(MutableMapping):
 
     _cache_key = 'webob._parsed_cookies'
 

src/webob/headers.py

@@ -1,5 +1,5 @@
-from collections import MutableMapping
 from webob.compat import (
+    MutableMapping,
     iteritems_,
     string_types,
     )

src/webob/multidict.py

@@ -4,12 +4,11 @@
 """
 Gives a multi-value dictionary object (MultiDict) plus several wrappers
 """
-from collections import MutableMapping
-
 import binascii
 import warnings
 
 from webob.compat import (
+    MutableMapping,
     PY2,
     iteritems_,
     itervalues_,