From e3e7ed64f23f29e239adb1aa1d2e1a85642d746f Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Sun, 22 Jul 2018 19:25:23 +1000 Subject: [PATCH 1/3] MAINT: use collections.abc for 3.7 --- lib/matplotlib/cbook/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py index 13e8d66d82db..95e5ea739d2a 100644 --- a/lib/matplotlib/cbook/__init__.py +++ b/lib/matplotlib/cbook/__init__.py @@ -1697,7 +1697,7 @@ def index_of(y): def safe_first_element(obj): - if isinstance(obj, collections.Iterator): + if isinstance(obj, collections.abc.Iterator): # needed to accept `array.flat` as input. # np.flatiter reports as an instance of collections.Iterator # but can still be indexed via []. @@ -1714,7 +1714,7 @@ def safe_first_element(obj): def sanitize_sequence(data): """Converts dictview object to list""" - return list(data) if isinstance(data, collections.MappingView) else data + return list(data) if isinstance(data, collections.abc.MappingView) else data def normalize_kwargs(kw, alias_mapping=None, required=(), forbidden=(), @@ -2088,9 +2088,9 @@ def _warn_external(message, category=None): warnings.warn(message, category, stacklevel) -class _OrderedSet(collections.MutableSet): +class _OrderedSet(collections.abc.MutableSet): def __init__(self): - self._od = collections.OrderedDict() + self._od = collections.abc.OrderedDict() def __contains__(self, key): return key in self._od From 3d290803ee373ecd8da92948209e6e6ac7c8384e Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Tue, 24 Jul 2018 08:11:38 +1000 Subject: [PATCH 2/3] MAINT: collections.abc imports --- lib/matplotlib/cbook/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py index 95e5ea739d2a..f3c8db576b5e 100644 --- a/lib/matplotlib/cbook/__init__.py +++ b/lib/matplotlib/cbook/__init__.py @@ -7,6 +7,7 @@ """ import collections +import collections.abc import contextlib import datetime import errno @@ -2090,7 +2091,7 @@ def _warn_external(message, category=None): class _OrderedSet(collections.abc.MutableSet): def __init__(self): - self._od = collections.abc.OrderedDict() + self._od = collections.OrderedDict() def __contains__(self, key): return key in self._od From 4fdb061238c2bcbad2a3de496a90f020dafee444 Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Tue, 24 Jul 2018 18:12:22 +1000 Subject: [PATCH 3/3] PEP8 --- lib/matplotlib/cbook/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/cbook/__init__.py b/lib/matplotlib/cbook/__init__.py index f3c8db576b5e..f5eb164a8ff8 100644 --- a/lib/matplotlib/cbook/__init__.py +++ b/lib/matplotlib/cbook/__init__.py @@ -1639,7 +1639,8 @@ def pts_to_midstep(x, *args): The x location of the steps. May be empty. y1, ..., yp : array - y arrays to be turned into steps; all must be the same length as ``x``. + y arrays to be turned into steps; all must be the same length as + ``x``. Returns ------- @@ -1715,7 +1716,8 @@ def safe_first_element(obj): def sanitize_sequence(data): """Converts dictview object to list""" - return list(data) if isinstance(data, collections.abc.MappingView) else data + return (list(data) if isinstance(data, collections.abc.MappingView) + else data) def normalize_kwargs(kw, alias_mapping=None, required=(), forbidden=(),