[Zope-Checkins] CVS: Zope/lib/python/Products/PluginIndexes/TextIndexNG/converters - doc.py:1.1.2.3 pdf.py:1.1.2.3 ppt.py:1.1.2.2 ps.py:1.1.2.2

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/Products/PluginIndexes/TextIndexNG/converters
In directory cvs.zope.org:/tmp/cvs-serv28583/converters

Modified Files:
      Tag: ajung-textindexng-branch
	doc.py pdf.py ppt.py ps.py 
Log Message:
moved popen() into base class

=== Zope/lib/python/Products/PluginIndexes/TextIndexNG/converters/doc.py 1.1.2.2 => 1.1.2.3 ===
         tmp_name = tempfile.mktemp()
         open(tmp_name,'w').write(doc)
-        text = os.popen('wvWare -x %s %s 2> /dev/null' % (wvConf_file, tmp_name)).read()
+        text = self.execute('wvWare -x %s %s 2> /dev/null' % (wvConf_file, tmp_name))
         os.remove(tmp_name)
         
         return text


=== Zope/lib/python/Products/PluginIndexes/TextIndexNG/converters/pdf.py 1.1.2.2 => 1.1.2.3 ===
         tmp_name = tempfile.mktemp()
         open(tmp_name,'w').write(doc)
-        text = popen('pdftotext %s -' % tmp_name).read()
+        text = self.execute('pdftotext %s -' % tmp_name)
         remove(tmp_name)
         
         return text


=== Zope/lib/python/Products/PluginIndexes/TextIndexNG/converters/ppt.py 1.1.2.1 => 1.1.2.2 ===
         tmp_name = tempfile.mktemp()
         open(tmp_name,'w').write(doc)
-        text = os.popen('pptHtml %s 2> /dev/null' % (tmp_name)).read()
+        text = self.execute('pptHtml %s 2> /dev/null' % tmp_name)
         os.remove(tmp_name)
 
         p = _StripTagParser()


=== Zope/lib/python/Products/PluginIndexes/TextIndexNG/converters/ps.py 1.1.2.1 => 1.1.2.2 ===
         tmp_name = tempfile.mktemp()
         open(tmp_name,'w').write(doc)
-        text = popen('ps2ascii %s -' % tmp_name).read()
+        text = self.execute('ps2ascii %s -' % tmp_name)
         remove(tmp_name)
         
         return text