Merge pull request matplotlib#4925 from jenshnielsen/numpydeprecation

MNT: Make sure _edgecolors is a string before comparison to string.

Author: tacaswell

lib/matplotlib/collections.py

@@ -617,7 +617,8 @@ def get_facecolor(self):
     get_facecolors = get_facecolor
 
     def get_edgecolor(self):
-        if self._edgecolors == str('face'):
+        if (isinstance(self._edgecolors, six.string_types)
+                   and self._edgecolors == str('face')):
             return self.get_facecolors()
         else:
             return self._edgecolors
@@ -678,7 +679,8 @@ def set_alpha(self, alpha):
         except (AttributeError, TypeError, IndexError):
             pass
         try:
-            if self._edgecolors_original != str('face'):
+            if (not isinstance(self._edgecolors_original, six.string_types)
+                             or self._edgecolors_original != str('face')):
                 self._edgecolors = mcolors.colorConverter.to_rgba_array(
                     self._edgecolors_original, self._alpha)
         except (AttributeError, TypeError, IndexError):