1 |
xmw 10/08/31 09:04:56 |
2 |
|
3 |
Added: parti-0.0.6-python-2.6-sets-deprecation.patch |
4 |
parti-0.0.6-python-import.patch |
5 |
Log: |
6 |
Initial import |
7 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 x11-wm/parti/files/parti-0.0.6-python-2.6-sets-deprecation.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/parti/files/parti-0.0.6-python-2.6-sets-deprecation.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/parti/files/parti-0.0.6-python-2.6-sets-deprecation.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: parti-0.0.6-python-2.6-sets-deprecation.patch |
16 |
=================================================================== |
17 |
upsream changeset 620a831d81 |
18 |
hg clone https://partiwm.googlecode.com/hg/ partiwm |
19 |
hg diff -c 620a831d81 |
20 |
|
21 |
diff -r 35cf8653d223 -r 620a831d81d1 wimpiggy/window.py |
22 |
--- a/wimpiggy/window.py Sun Jul 18 16:08:36 2010 -0700 |
23 |
+++ b/wimpiggy/window.py Sat Jul 31 08:36:22 2010 -0700 |
24 |
@@ -8,7 +8,13 @@ |
25 |
Most of the gunk required to be a valid window manager (reparenting, synthetic |
26 |
events, mucking about with properties, etc. etc.) is wrapped up in here.""" |
27 |
|
28 |
-import sets |
29 |
+# Maintain compatibility with old versions of Python, while avoiding a |
30 |
+# deprecation warning on new versions: |
31 |
+import sys |
32 |
+if sys.version_info < (2, 6): |
33 |
+ from sets import ImmutableSet |
34 |
+else: |
35 |
+ ImmutableSet = frozenset |
36 |
import gobject |
37 |
import gtk |
38 |
import gtk.gdk |
39 |
@@ -775,9 +781,9 @@ |
40 |
net_wm_state = prop_get(self.client_window, |
41 |
"_NET_WM_STATE", ["atom"]) |
42 |
if net_wm_state: |
43 |
- self._internal_set_property("state", sets.ImmutableSet(net_wm_state)) |
44 |
+ self._internal_set_property("state", ImmutableSet(net_wm_state)) |
45 |
else: |
46 |
- self._internal_set_property("state", sets.ImmutableSet()) |
47 |
+ self._internal_set_property("state", ImmutableSet()) |
48 |
|
49 |
for mutable in ["WM_HINTS", "WM_NORMAL_HINTS", |
50 |
"WM_NAME", "_NET_WM_NAME", |
51 |
diff -r 35cf8653d223 -r 620a831d81d1 wimpiggy/wm.py |
52 |
--- a/wimpiggy/wm.py Sun Jul 18 16:08:36 2010 -0700 |
53 |
+++ b/wimpiggy/wm.py Sat Jul 31 08:36:22 2010 -0700 |
54 |
@@ -6,7 +6,13 @@ |
55 |
import gtk |
56 |
import gobject |
57 |
|
58 |
-from sets import ImmutableSet |
59 |
+# Maintain compatibility with old versions of Python, while avoiding a |
60 |
+# deprecation warning on new versions: |
61 |
+import sys |
62 |
+if sys.version_info < (2, 6): |
63 |
+ from sets import ImmutableSet |
64 |
+else: |
65 |
+ ImmutableSet = frozenset |
66 |
|
67 |
from wimpiggy.error import * |
68 |
import wimpiggy.selection |
69 |
|
70 |
|
71 |
|
72 |
1.1 x11-wm/parti/files/parti-0.0.6-python-import.patch |
73 |
|
74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/parti/files/parti-0.0.6-python-import.patch?rev=1.1&view=markup |
75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/parti/files/parti-0.0.6-python-import.patch?rev=1.1&content-type=text/plain |
76 |
|
77 |
Index: parti-0.0.6-python-import.patch |
78 |
=================================================================== |
79 |
upsream changeset fedd8b2841 |
80 |
hg clone https://partiwm.googlecode.com/hg/ partiwm |
81 |
hg diff -c fedd8b2841 |
82 |
|
83 |
diff -r d35431b2028f -r fedd8b284197 xpra/server.py |
84 |
--- a/xpra/server.py Tue May 05 21:49:16 2009 +0000 |
85 |
+++ b/xpra/server.py Sun May 10 22:15:46 2009 +0000 |
86 |
@@ -14,6 +14,7 @@ |
87 |
import cairo |
88 |
import os |
89 |
import os.path |
90 |
+import sys |
91 |
import subprocess |
92 |
|
93 |
from wimpiggy.wm import Wm |