upsream changeset 620a831d81 hg clone https://partiwm.googlecode.com/hg/ partiwm hg diff -c 620a831d81 diff -r 35cf8653d223 -r 620a831d81d1 wimpiggy/window.py --- a/wimpiggy/window.py Sun Jul 18 16:08:36 2010 -0700 +++ b/wimpiggy/window.py Sat Jul 31 08:36:22 2010 -0700 @@ -8,7 +8,13 @@ Most of the gunk required to be a valid window manager (reparenting, synthetic events, mucking about with properties, etc. etc.) is wrapped up in here.""" -import sets +# Maintain compatibility with old versions of Python, while avoiding a +# deprecation warning on new versions: +import sys +if sys.version_info < (2, 6): + from sets import ImmutableSet +else: + ImmutableSet = frozenset import gobject import gtk import gtk.gdk @@ -775,9 +781,9 @@ net_wm_state = prop_get(self.client_window, "_NET_WM_STATE", ["atom"]) if net_wm_state: - self._internal_set_property("state", sets.ImmutableSet(net_wm_state)) + self._internal_set_property("state", ImmutableSet(net_wm_state)) else: - self._internal_set_property("state", sets.ImmutableSet()) + self._internal_set_property("state", ImmutableSet()) for mutable in ["WM_HINTS", "WM_NORMAL_HINTS", "WM_NAME", "_NET_WM_NAME", diff -r 35cf8653d223 -r 620a831d81d1 wimpiggy/wm.py --- a/wimpiggy/wm.py Sun Jul 18 16:08:36 2010 -0700 +++ b/wimpiggy/wm.py Sat Jul 31 08:36:22 2010 -0700 @@ -6,7 +6,13 @@ import gtk import gobject -from sets import ImmutableSet +# Maintain compatibility with old versions of Python, while avoiding a +# deprecation warning on new versions: +import sys +if sys.version_info < (2, 6): + from sets import ImmutableSet +else: + ImmutableSet = frozenset from wimpiggy.error import * import wimpiggy.selection