Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyxdg/files/
Date: Wed, 28 Oct 2015 07:20:23
Message-Id: 1445984478.ee4570ca72c2be138f732d1507a706835a3e40fa.mgorny@gentoo
1 commit: ee4570ca72c2be138f732d1507a706835a3e40fa
2 Author: Anthony Ryan <anthonyryan1 <AT> gmail <DOT> com>
3 AuthorDate: Tue Oct 27 22:17:44 2015 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 27 22:21:18 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee4570ca
7
8 dev-python/pyxdg: Removed unused patch
9
10 files/pyxdg-subprocess.patch is no longer used
11
12 Fixes https://bugs.gentoo.org/540940
13
14 dev-python/pyxdg/files/pyxdg-subprocess.patch | 38 ---------------------------
15 1 file changed, 38 deletions(-)
16
17 diff --git a/dev-python/pyxdg/files/pyxdg-subprocess.patch b/dev-python/pyxdg/files/pyxdg-subprocess.patch
18 deleted file mode 100644
19 index 7b9a1ba..0000000
20 --- a/dev-python/pyxdg/files/pyxdg-subprocess.patch
21 +++ /dev/null
22 @@ -1,38 +0,0 @@
23 -#Patch sent to upstream on March 1st, 2009
24 -#Jesus Rivero (Neurogeek)
25 -#Replaced deprecated os.popen3 for subprocess
26 -
27 -diff -uNr xdg.orig/Menu.py xdg/Menu.py
28 ---- xdg.orig/Menu.py 2009-03-01 04:34:38.000000000 -0430
29 -+++ xdg/Menu.py 2009-03-01 04:41:27.000000000 -0430
30 -@@ -12,6 +12,7 @@
31 -
32 - import xdg.Locale
33 - import xdg.Config
34 -+from subprocess import Popen, PIPE
35 -
36 - ELEMENT_NODE = xml.dom.Node.ELEMENT_NODE
37 -
38 -@@ -841,13 +842,16 @@
39 - return m
40 -
41 - def __parseKDELegacyDirs(filename, parent):
42 -- f=os.popen3("kde-config --path apps")
43 -- output = f[1].readlines()
44 - try:
45 -- for dir in output[0].split(":"):
46 -- __parseLegacyDir(dir,"kde", filename, parent)
47 -- except IndexError:
48 -- pass
49 -+ f=Popen("kde-config --path apps", shell=True, stdout=PIPE).stdout
50 -+ output = f.readlines()
51 -+ try:
52 -+ for dir in output[0].split(":"):
53 -+ __parseLegacyDir(dir,"kde", filename, parent)
54 -+ except IndexError:
55 -+ pass
56 -+ except:
57 -+ raise Exception, "kde-config failed"
58 -
59 - # remove duplicate entries from a list
60 - def __removeDuplicates(list):