[Ocfs2-tools-commits] manish commits r871 - trunk/ocfs2console/ocfs2interface

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-04-29 22:01:17 -0500 (Fri, 29 Apr 2005)
New Revision: 871

Modified:
   trunk/ocfs2console/ocfs2interface/o2cb_ctl.py
   trunk/ocfs2console/ocfs2interface/process.py
Log:
Use basestring instead of types.StringTypes


Modified: trunk/ocfs2console/ocfs2interface/o2cb_ctl.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/o2cb_ctl.py	2005-04-30 03:00:45 UTC (rev 870)
+++ trunk/ocfs2console/ocfs2interface/o2cb_ctl.py	2005-04-30 03:01:17 UTC (rev 871)
@@ -15,8 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA.
 
-import types
-
 from cStringIO import StringIO
 
 from process import Process
@@ -32,7 +30,7 @@
 
 class O2CBProcess(Process):
     def __init__(self, args, desc, parent=None):
-        if isinstance(args, types.StringTypes):
+        if isinstance(args, basestring):
             command = '%s %s' % (self.program, args)
         else:
             command = (self.program,) + tuple(args)

Modified: trunk/ocfs2console/ocfs2interface/process.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/process.py	2005-04-30 03:00:45 UTC (rev 870)
+++ trunk/ocfs2console/ocfs2interface/process.py	2005-04-30 03:01:17 UTC (rev 871)
@@ -16,7 +16,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 021110-1307, USA.
 
 import os
-import types
 import fcntl
 import popen2
 
@@ -30,7 +29,7 @@
 
 class Process:
     def __init__(self, command, title, desc, parent=None, spin_now=False):
-        if isinstance(command, types.StringTypes):
+        if isinstance(command, basestring):
             if len(command.split(None, 1)) < 2:
                 command = (command,)