@@ -1212,17 +1212,16 @@ def _reset_locator_formatter_scale(self):
12121212self ._minorlocator = None
12131213self ._formatter = None
12141214self ._minorformatter = None
1215- if (isinstance (self .mappable ,contour .ContourSet )and
1216- isinstance (self .norm ,colors .LogNorm )):
1217- # if contours have lognorm, give them a log scale...
1218- self ._set_scale ('log' )
1219- elif (self .boundaries is not None or
1215+ if (self .boundaries is not None or
12201216isinstance (self .norm ,colors .BoundaryNorm )):
12211217if self .spacing == 'uniform' :
12221218funcs = (self ._forward_boundaries ,self ._inverse_boundaries )
12231219self ._set_scale ('function' ,functions = funcs )
12241220elif self .spacing == 'proportional' :
1225- self ._set_scale ('linear' )
1221+ if isinstance (self .norm ,colors .LogNorm ):
1222+ self ._set_scale ('log' )
1223+ else :
1224+ self ._set_scale ('linear' )
12261225elif getattr (self .norm ,'_scale' ,None ):
12271226# use the norm's scale (if it exists and is not None):
12281227self ._set_scale (self .norm ._scale )