[gentoo-commits] gentoo-x86 commit in dev-python/pyxdg/files: pyxdg-subprocess.patch

[Jesus Rivero (neurogeek)]

neurogeek    09/03/01 09:30:18

  Added:                pyxdg-subprocess.patch
  Log:
  Revision bump. Fixes bug #246997. Removed old version
  (Portage version: 2.2_rc20/cvs/Linux 2.6.27-gentoo-r7 i686)

Revision  Changes    Path
1.1                  dev-python/pyxdg/files/pyxdg-subprocess.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxdg/files/pyxdg-subprocess.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxdg/files/pyxdg-subprocess.patch?rev=1.1&content-type=text/plain

Index: pyxdg-subprocess.patch
===================================================================
#Patch sent to upstream on March 1st, 2009
#Jesus Rivero (Neurogeek)
#Replaced deprecated os.popen3 for subprocess

diff -uNr xdg.orig/Menu.py xdg/Menu.py
--- xdg.orig/Menu.py	2009-03-01 04:34:38.000000000 -0430
+++ xdg/Menu.py	2009-03-01 04:41:27.000000000 -0430
@@ -12,6 +12,7 @@
 
 import xdg.Locale
 import xdg.Config
+from subprocess import Popen, PIPE
 
 ELEMENT_NODE = xml.dom.Node.ELEMENT_NODE
 
@@ -841,13 +842,16 @@
         return m
 
 def __parseKDELegacyDirs(filename, parent):
-    f=os.popen3("kde-config --path apps")
-    output = f[1].readlines()
     try:
-        for dir in output[0].split(":"):
-            __parseLegacyDir(dir,"kde", filename, parent)
-    except IndexError:
-        pass
+        f=Popen("kde-config --path apps", shell=True, stdout=PIPE).stdout
+        output = f.readlines()
+        try:
+            for dir in output[0].split(":"):
+                __parseLegacyDir(dir,"kde", filename, parent)
+        except IndexError:
+            pass
+    except:
+        raise Exception, "kde-config failed"
 
 # remove duplicate entries from a list
 def __removeDuplicates(list):