fix problem with map contour and polymask use of newest matplotlib

Author: vondreele

GSASII/GSASIIimage.py

@@ -1287,9 +1287,12 @@ def polymask(data,Poly):
         ax0.fill(px,py,inmask)
     ax0.set_xbound(0,Nx)
     ax0.set_ybound(0,Ny)
-    agg = canvas.switch_backends(hcCanvas)
-    agg.draw()
-    img, (width, height) = agg.print_to_buffer()
+    try:
+        agg = canvas.switch_backends(hcCanvas)
+        agg.draw()
+        img, (width, height) = agg.print_to_buffer()
+    except AttributeError:
+        img, (width,height) = canvas.print_to_buffer()
     Zimg = np.frombuffer(img, np.uint8).reshape((height, width, 4))
     return Zimg[:,:,0]
 

GSASII/GSASIIplot.py

@@ -7430,9 +7430,12 @@ def Draw(caller='',Fade=[],NPkey=False):
                     contourSet = ax0.contour(ZU,colors='k',linewidths=1)
             ax0.axis("off")
             figure.subplots_adjust(bottom=0.,top=1.,left=0.,right=1.,wspace=0.,hspace=0.)
-            agg = canvas.switch_backends(hcCanvas)
-            agg.draw()
-            img, (width, height) = agg.print_to_buffer()
+            try:
+                agg = canvas.switch_backends(hcCanvas)
+                agg.draw()
+                img, (width, height) = agg.print_to_buffer()
+            except AttributeError:
+                img, (width,height) = canvas.print_to_buffer()
             Zimg = np.frombuffer(img, np.uint8).reshape((height, width, 4))
             RenderViewPlane(msize*eplane,Zimg,width,height)
         try: