Avoid comparing numpy array to strings in two places#7658

QuLogic merged 3 commits into

matplotlib:mastermatplotlib/matplotlib:masterfrom

dstansby:aspect-array-warningdstansby/matplotlib:aspect-array-warningCopy head branch name to clipboard