Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 97c264d

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

File tree

Expand file treeCollapse file tree

6 files changed

+3199
-3
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+3199
-3
lines changed

‎lib/matplotlib/__init__.py

Copy file name to clipboardExpand all lines: lib/matplotlib/__init__.py
+1-1Lines 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

Copy file name to clipboardExpand all lines: lib/matplotlib/contour.py
+1-1Lines 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.
Loading

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.