Diff of /trunk/gnuplot-py/PlotItems.py [r281] .. [r282]  Maximize  Restore

  Switch to side-by-side view

--- a/trunk/gnuplot-py/PlotItems.py
+++ b/trunk/gnuplot-py/PlotItems.py
@@ -1,4 +1,4 @@
-# $Id: PlotItems.py 281 2005-12-18 13:05:15Z mhagger $
+# $Id: PlotItems.py 282 2005-12-18 13:19:43Z mhagger $
 
 # Copyright (C) 1998-2003 Michael Haggerty <mhagger@alum.mit.edu>
 #
@@ -14,7 +14,7 @@
 
 """
 
-__cvs_version__ = '$Revision: 281 $'
+__cvs_version__ = '$Revision: 282 $'
 
 import os, string, tempfile, types
 
@@ -367,7 +367,7 @@
 
         # If the user hasn't specified a title, set it to None so
         # that the name of the temporary file is not used:
-        if self.temp and not keyw.has_key('title'):
+        if self.temp and 'title' not in keyw:
             keyw['title'] = None
 
         _FileItem.__init__(self, filename, **keyw)
@@ -385,7 +385,7 @@
     def __init__(self, content, **keyw):
         # If the user hasn't specified a title, set it to None so that
         # '-' is not used:
-        if not keyw.has_key('title'):
+        if 'title' not in keyw:
             keyw['title'] = None
 
         if keyw.get('binary', 0):
@@ -463,7 +463,7 @@
         def __init__(self, content, **keyw):
             # If the user hasn't specified a title, set it to None so that
             # the name of the temporary FIFO is not used:
-            if not keyw.has_key('title'):
+            if 'title' not in keyw:
                 keyw['title'] = None
 
             _FileItem.__init__(self, '', **keyw)
@@ -562,20 +562,20 @@
         dims = len(set.shape)
         # transpose so that the last index selects x vs. y:
         set = Numeric.transpose(set, (dims-1,) + tuple(range(dims-1)))
-    if keyw.has_key('cols'):
+    if 'cols' in keyw:
         cols = keyw['cols']
         del keyw['cols']
         if type(cols) is types.IntType:
             cols = (cols,)
         set = Numeric.take(set, cols, -1)
 
-    if keyw.has_key('filename'):
+    if 'filename' in keyw:
         filename = keyw['filename'] or None
         del keyw['filename']
     else:
         filename = None
 
-    if keyw.has_key('inline'):
+    if 'inline' in keyw:
         inline = keyw['inline']
         del keyw['inline']
         if inline and filename: