Fix some python2.6 -3 warnings. (mainly usage of has_key)

svn path=/trunk/matplotlib/; revision=6143

Author: mdboom

boilerplate.py

@@ -114,7 +114,7 @@ def %(func)s(*args, **kwargs):
 
 
 for func in _plotcommands:
-    if cmappable.has_key(func):
+    if func in cmappable:
         mappable = cmappable[func]
     else:
         mappable = ''

lib/matplotlib/__init__.py

@@ -443,7 +443,7 @@ def _get_configdir():
 def _get_data_path():
     'get the path to matplotlib data'
 
-    if os.environ.has_key('MATPLOTLIBDATA'):
+    if 'MATPLOTLIBDATA' in os.environ:
         path = os.environ['MATPLOTLIBDATA']
         if not os.path.isdir(path):
             raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
@@ -535,7 +535,7 @@ def matplotlib_fname():
     fname = os.path.join( os.getcwd(), 'matplotlibrc')
     if os.path.exists(fname): return fname
 
-    if os.environ.has_key('MATPLOTLIBRC'):
+    if 'MATPLOTLIBRC' in os.environ:
         path =  os.environ['MATPLOTLIBRC']
         if os.path.exists(path):
             fname = os.path.join(path, 'matplotlibrc')
@@ -637,7 +637,7 @@ def rc_params(fail_on_error=False):
     verbose.set_fileo(ret['verbose.fileo'])
 
     for key, (val, line, cnt) in rc_temp.iteritems():
-        if defaultParams.has_key(key):
+        if key in defaultParams:
             if fail_on_error:
                 ret[key] = val # try to convert to proper type or raise
             else:
@@ -745,7 +745,7 @@ def rc(group, **kwargs):
         for k,v in kwargs.items():
             name = aliases.get(k) or k
             key = '%s.%s' % (g, name)
-            if not rcParams.has_key(key):
+            if key not in rcParams:
                 raise KeyError('Unrecognized key "%s" for group "%s" and name "%s"' %
                                (key, g, name))
 

lib/matplotlib/_pylab_helpers.py

@@ -31,7 +31,7 @@ def destroy(num):
     destroy = staticmethod(destroy)
 
     def has_fignum(num):
-        return Gcf.figs.has_key(num)
+        return num in Gcf.figs
     has_fignum = staticmethod(has_fignum)
 
     def get_all_fig_managers():

lib/matplotlib/afm.py

@@ -263,7 +263,7 @@ def _parse_optional(fh):
         if len(line)==0: continue
         key = line.split()[0]
 
-        if optional.has_key(key): d[key] = optional[key](fh)
+        if key in optional: d[key] = optional[key](fh)
 
     l = ( d['StartKernData'], d['StartComposites'] )
     return l

lib/matplotlib/artist.py

@@ -662,7 +662,7 @@ def aliased_name(self, s):
         alias, return 'markerfacecolor or mfc' and for the transform
         property, which does not, return 'transform'
         """
-        if self.aliasd.has_key(s):
+        if s in self.aliasd:
             return '%s or %s' % (s, self.aliasd[s])
         else: return s
 

lib/matplotlib/axes.py

@@ -73,17 +73,17 @@ def _process_plot_format(fmt):
     chars = [c for c in fmt]
 
     for c in chars:
-        if mlines.lineStyles.has_key(c):
+        if c in mlines.lineStyles:
             if linestyle is not None:
                 raise ValueError(
                     'Illegal format string "%s"; two linestyle symbols' % fmt)
             linestyle = c
-        elif mlines.lineMarkers.has_key(c):
+        elif c in mlines.lineMarkers:
             if marker is not None:
                 raise ValueError(
                     'Illegal format string "%s"; two marker symbols' % fmt)
             marker = c
-        elif mcolors.colorConverter.colors.has_key(c):
+        elif c in mcolors.colorConverter.colors:
             if color is not None:
                 raise ValueError(
                     'Illegal format string "%s"; two color symbols' % fmt)
@@ -2632,7 +2632,7 @@ def text(self, x, y, s, fontdict=None,
 
 
         #if t.get_clip_on():  t.set_clip_box(self.bbox)
-        if kwargs.has_key('clip_on'):  t.set_clip_box(self.bbox)
+        if 'clip_on' in kwargs:  t.set_clip_box(self.bbox)
         return t
     text.__doc__ = cbook.dedent(text.__doc__) % martist.kwdocd
 

lib/matplotlib/backends/backend_gtk.py

@@ -234,7 +234,7 @@ def motion_notify_event(self, widget, event):
         return False  # finish event propagation?
 
     def _get_key(self, event):
-        if self.keyvald.has_key(event.keyval):
+        if event.keyval in self.keyvald:
             key = self.keyvald[event.keyval]
         elif event.keyval <256:
             key = chr(event.keyval)

lib/matplotlib/backends/backend_qt.py

@@ -170,7 +170,7 @@ def minumumSizeHint( self ):
     def _get_key( self, event ):
         if event.key() < 256:
             key = event.text().latin1()
-        elif self.keyvald.has_key( event.key() ):
+        elif event.key() in self.keyvald.has_key:
             key = self.keyvald[ event.key() ]
         else:
             key = None

lib/matplotlib/backends/backend_qt4.py

@@ -174,7 +174,7 @@ def minumumSizeHint( self ):
     def _get_key( self, event ):
         if event.key() < 256:
             key = str(event.text())
-        elif self.keyvald.has_key( event.key() ):
+        elif event.key() in self.keyvald:
             key = self.keyvald[ event.key() ]
         else:
             key = None

lib/matplotlib/backends/backend_tkagg.py

@@ -297,7 +297,7 @@ def scroll_event_windows(self, event):
 
     def _get_key(self, event):
         val = event.keysym_num
-        if self.keyvald.has_key(val):
+        if val in self.keyvald:
             key = self.keyvald[val]
         elif val<256:
             key = chr(val)

lib/matplotlib/backends/backend_wx.py

@@ -1141,7 +1141,7 @@ def _onSize(self, evt):
     def _get_key(self, evt):
 
         keyval = evt.m_keyCode
-        if self.keyvald.has_key(keyval):
+        if keyval in self.keyvald:
             key = self.keyvald[keyval]
         elif keyval <256:
             key = chr(keyval)

lib/matplotlib/collections.py

@@ -267,9 +267,9 @@ def set_linestyles(self, ls):
         try:
             dashd = backend_bases.GraphicsContextBase.dashd
             if cbook.is_string_like(ls):
-                if dashd.has_key(ls):
+                if ls in dashd:
                     dashes = [dashd[ls]]
-                elif cbook.ls_mapper.has_key(ls):
+                elif ls in cbook.ls_mapper:
                     dashes = [dashd[cbook.ls_mapper[ls]]]
                 else:
                     raise ValueError()
@@ -278,9 +278,9 @@ def set_linestyles(self, ls):
                     dashes = []
                     for x in ls:
                         if cbook.is_string_like(x):
-                            if dashd.has_key(x):
+                            if x in dashd:
                                 dashes.append(dashd[x])
-                            elif cbook.ls_mapper.has_key(x):
+                            elif x in cbook.ls_mapper:
                                 dashes.append(dashd[cbook.ls_mapper[x]])
                             else:
                                 raise ValueError()

lib/matplotlib/config/cutils.py

@@ -93,7 +93,7 @@ def _get_configdir():
 def _get_data_path():
     'get the path to matplotlib data'
 
-    if os.environ.has_key('MATPLOTLIBDATA'):
+    if 'MATPLOTLIBDATA' in os.environ:
         path = os.environ['MATPLOTLIBDATA']
         if not os.path.isdir(path):
             raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
@@ -167,7 +167,7 @@ def get_config_file(tconfig=False):
     fname = os.path.join( os.getcwd(), filename)
     if os.path.exists(fname): return fname
 
-    if os.environ.has_key('MATPLOTLIBRC'):
+    if 'MATPLOTLIBRC' in os.environ:
         path =  os.environ['MATPLOTLIBRC']
         if os.path.exists(path):
             fname = os.path.join(path, filename)

lib/matplotlib/config/mplconfig.py

@@ -461,8 +461,8 @@ def __getitem__(self, key):
     def keys(self):
         return self.tconfig_map.keys()
 
-    def has_key(self, val):
-        return self.tconfig_map.has_key(val)
+    def __contains__(self, val):
+        return val in self.tconfig_map
 
     def update(self, arg, **kwargs):
         try:

lib/matplotlib/config/rcparams.py

@@ -19,16 +19,16 @@
 
 
 class RcParams(dict):
-    
+
     """A dictionary object including validation
-    
+
     validating functions are defined and associated with rc parameters in
     rcsetup.py
     """
-    
+
     validate = dict([ (key, converter) for key, (default, converter) in \
                      defaultParams.iteritems() ])
-    
+
     def __setitem__(self, key, val):
         try:
             if key in _deprecated_map.keys():
@@ -89,7 +89,7 @@ def rc_params(fail_on_error=False):
     verbose.set_fileo(ret['verbose.fileo'])
 
     for key, (val, line, cnt) in rc_temp.iteritems():
-        if defaultParams.has_key(key):
+        if key in defaultParams:
             if fail_on_error:
                 ret[key] = val # try to convert to proper type or raise
             else:
@@ -109,7 +109,7 @@ def rc_params(fail_on_error=False):
         ret['datapath'] = get_data_path()
 
     verbose.report('loaded rc file %s'%fname)
-    
+
     return ret
 
 
@@ -183,7 +183,7 @@ def rc(group, **kwargs):
         for k,v in kwargs.items():
             name = aliases.get(k) or k
             key = '%s.%s' % (g, name)
-            if not rcParams.has_key(key):
+            if key not in rcParams:
                 raise KeyError('Unrecognized key "%s" for group "%s" and name "%s"' %
                                (key, g, name))
 

lib/matplotlib/figure.py

@@ -591,7 +591,7 @@ def add_axes(self, *args, **kwargs):
 
         key = self._make_key(*args, **kwargs)
 
-        if self._seen.has_key(key):
+        if key in self._seen:
             ax = self._seen[key]
             self.sca(ax)
             return ax
@@ -652,7 +652,7 @@ def add_subplot(self, *args, **kwargs):
         """
 
         key = self._make_key(*args, **kwargs)
-        if self._seen.has_key(key):
+        if key in self._seen:
             ax = self._seen[key]
             self.sca(ax)
             return ax
@@ -951,7 +951,7 @@ def savefig(self, *args, **kwargs):
         """
 
         for key in ('dpi', 'facecolor', 'edgecolor'):
-            if not kwargs.has_key(key):
+            if key not in kwargs:
                 kwargs[key] = rcParams['savefig.%s'%key]
 
         transparent = kwargs.pop('transparent', False)

lib/matplotlib/font_manager.py

@@ -505,7 +505,7 @@ def createFontDict(fontfiles, fontext='ttf'):
     for fpath in fontfiles:
         verbose.report('createFontDict: %s' % (fpath), 'debug')
         fname = os.path.split(fpath)[1]
-        if seen.has_key(fname):  continue
+        if fname in seen:  continue
         else: seen[fname] = 1
         if fontext == 'afm':
             try:
@@ -552,33 +552,33 @@ def setWeights(font):
         for j in range(100, 1000, 100):
             font[j] = temp[wgt]
 
-    if temp.has_key(400):
+    if 400 in temp:
         for j in range(100, 1000, 100):
             font[j] = temp[400]
-    if temp.has_key(500):
-        if temp.has_key(400):
+    if 500 in temp:
+        if 400 in temp:
             for j in range(500, 1000, 100):
                 font[j] = temp[500]
         else:
             for j in range(100, 1000, 100):
                 font[j] = temp[500]
 
-    if temp.has_key(300):
+    if 300 in temp:
         for j in [100, 200, 300]:
             font[j] = temp[300]
-    if temp.has_key(200):
-        if temp.has_key(300):
+    if 200 in temp:
+        if 300 in temp:
             for j in [100, 200]:
                 font[j] = temp[200]
         else:
             for j in [100, 200, 300]:
                 font[j] = temp[200]
 
-    if temp.has_key(800):
+    if 800 in temp:
         for j in [600, 700, 800, 900]:
             font[j] = temp[800]
-    if temp.has_key(700):
-        if temp.has_key(800):
+    if 700 in temp:
+        if 800 in temp:
             for j in [600, 700]:
                 font[j] = temp[700]
         else:
@@ -872,7 +872,7 @@ def __init__(self, size=None, weight='normal'):
         #  Create list of font paths
 
         for pathname in ['TTFPATH', 'AFMPATH']:
-            if os.environ.has_key(pathname):
+            if pathname in os.environ:
                 ttfpath = os.environ[pathname]
                 if ttfpath.find(';') >= 0: #win32 style
                     paths.extend(ttfpath.split(';'))
@@ -983,50 +983,50 @@ def lookup_name(name):
 
             fname = None
             font = fontdict
-            if font.has_key(name):
+            if name in font:
                 font = font[name]
             else:
                 verbose.report('\tfindfont failed %(name)s'%locals(), 'debug')
                 return None
 
-            if font.has_key(style):
+            if style in font:
                 font = font[style]
-            elif style == 'italic' and font.has_key('oblique'):
+            elif style == 'italic' and 'oblique' in font:
                 font = font['oblique']
-            elif style == 'oblique' and font.has_key('italic'):
+            elif style == 'oblique' and 'italic' in font:
                 font = font['italic']
             else:
                 verbose.report('\tfindfont failed %(name)s, %(style)s'%locals(), 'debug')
                 return None
 
-            if font.has_key(variant):
+            if variant in font:
                 font = font[variant]
             else:
                 verbose.report('\tfindfont failed %(name)s, %(style)s, %(variant)s'%locals(), 'debug')
                 return None
 
-            if not font.has_key(weight):
+            if weight in font:
                 setWeights(font)
-            if not font.has_key(weight):
+            if weight not in font:
                 return None
             font = font[weight]
 
-            if font.has_key(stretch):
+            if stretch in font:
                 stretch_font = font[stretch]
-                if stretch_font.has_key('scalable'):
+                if 'scalable' in stretch_font:
                     fname = stretch_font['scalable']
-                elif stretch_font.has_key(size):
+                elif size in stretch_font:
                     fname = stretch_font[size]
 
             if fname is None:
                 for val in font.values():
-                    if val.has_key('scalable'):
+                    if 'scalable' in val:
                         fname = val['scalable']
                         break
 
             if fname is None:
                 for val in font.values():
-                    if val.has_key(size):
+                    if size in val:
                         fname = val[size]
                         break