NFU: OS X, Powerpoint, Webapps

svn path=/; revision=1347

1 files changed, 6 insertions, 4 deletions

diff --git a/bin/check-todo-issues b/bin/check-todo-issues
index 64d88ae..46b1cb9 100755
--- a/bin/check-todo-issues
+++ b/bin/check-todo-issues
@@ -12,6 +12,7 @@ import string
 import sys
 import os
 import re
+import subprocess
 
 DEFAULT_ISSUE_REGEX = '^CVE-200[3-9]'
 DEFAULT_TODO_REGEX = '^\s+TODO: check$'
@@ -416,25 +417,26 @@ class EntryEditor:
 
     def get_best_results(self, query):
         ''' Do not call with unfiltered strings '''
-        searchresults = os.popen2(['eix', '--only-names'] + query.split())[1].readlines()
+        
+        searchresults = subprocess.Popen(['eix', '--only-names'] + query.split(), stdout=subprocess.PIPE).stdout.readlines()
 
         if searchresults and len(searchresults) > 0:
             return searchresults
         words = query.split()
         words.reverse()
         for word in words:
-            searchresults = os.popen2(['eix', '--only-names', word])[1].readlines()
+            searchresults = subprocess.Popen(['eix', '--only-names', word], stdout=subprocess.PIPE).stdout.readlines()
             if searchresults and len(searchresults) > 0 and len(searchresults) < 20:
                 return searchresults
 
-        searchresults = os.popen2(['eix', '--only-names', '-S'] + query.split())[1].readlines()
+        searchresults = subprocess.Popen(['eix', '--only-names', '-S'] + query.split(), stdout=subprocess.PIPE).stdout.readlines()
 
         if searchresults and len(searchresults) > 0:
             return searchresults
         words = query.split()
         words.reverse()
         for word in words:
-            searchresults = os.popen2(['eix', '--only-names', '-S', word])[1].readlines()
+            searchresults = subprocess.Popen(['eix', '--only-names', '-S', word], stdout=subprocess.PIPE).stdout.readlines()
             if searchresults and len(searchresults) > 0 and len(searchresults) < 20:
                 return searchresults