Updates for mplot3d and manual contour example

Author: ianthomas23

lib/matplotlib/contour.py

@@ -823,7 +823,12 @@ def __init__(self, ax, *args,
             self.norm.vmax = vmax
         self._process_colors()
 
-        self.allsegs, self.allkinds = self._get_allsegs_and_allkinds()
+        if getattr(self, 'allsegs', None) is None:
+            self.allsegs, self.allkinds = self._get_allsegs_and_allkinds()
+        elif self.allkinds is None:
+            # allsegs specified in constructor may or may not have allkinds as
+            # well.  Must ensure allkinds can be zipped below.
+            self.allkinds = [None] * len(self.allsegs)
 
         if self.filled:
             if self.linewidths is not None:
@@ -1032,7 +1037,11 @@ def _get_lowers_and_uppers(self):
         return (lowers, uppers)
 
     def _make_paths(self, segs, kinds):
-        return [mpath.Path(seg, codes=kind) for seg, kind in zip(segs, kinds)]
+        if kinds is None:
+            return [mpath.Path(seg) for seg in segs]
+        else:
+            return [mpath.Path(seg, codes=kind) for seg, kind
+                    in zip(segs, kinds)]
 
     def changed(self):
         tcolors = [(tuple(rgba),)

lib/mpl_toolkits/mplot3d/axes3d.py

@@ -2039,7 +2039,7 @@ def _3d_extend_contour(self, cset, stride=5):
             topverts = art3d._paths_to_3d_segments(paths, z - dz)
             botverts = art3d._paths_to_3d_segments(paths, z + dz)
 
-            color = linec.get_color()[0]
+            color = linec.get_edgecolor()[0]
 
             polyverts = []
             normals = []