Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 97c264d

Browse files
committed
Merge branch 'v1.2.x'
Conflicts: lib/matplotlib/contour.py lib/matplotlib/tests/test_lines.py
2 parents a4be3f2 + b3f676c commit 97c264d

File tree

6 files changed

+3199
-3
lines changed

6 files changed

+3199
-3
lines changed

lib/matplotlib/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ def keys(self):
733733
"""
734734
Return sorted list of keys.
735735
"""
736-
k = dict.keys(self)
736+
k = list(dict.keys(self))
737737
k.sort()
738738
return k
739739

lib/matplotlib/contour.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ def __init__(self, ax, *args, **kwargs):
854854
col = mcoll.LineCollection(segs,
855855
antialiaseds=aa,
856856
linewidths=width,
857-
linestyle=lstyle,
857+
linestyle=[lstyle],
858858
alpha=self.alpha,
859859
transform=self.get_transform(),
860860
zorder=zorder)
Binary file not shown.

0 commit comments

Comments
 (0)