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)