[Python-modules-commits] r11327 - in packages/gamera/trunk/debian (2 files)
jwilk-guest at users.alioth.debian.org
jwilk-guest at users.alioth.debian.org
Tue Jan 26 11:28:18 UTC 2010
Date: Tuesday, January 26, 2010 @ 11:28:17
Author: jwilk-guest
Revision: 11327
The sets module is deprecated in Python 2.6. Use set objects, rather than
sets.Set objects (updated use-system-modules.diff).
Modified:
packages/gamera/trunk/debian/changelog
packages/gamera/trunk/debian/patches/use-system-python-modules.diff
Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog 2010-01-26 11:20:56 UTC (rev 11326)
+++ packages/gamera/trunk/debian/changelog 2010-01-26 11:28:17 UTC (rev 11327)
@@ -14,8 +14,10 @@
* Add Debian menu entry.
* Add freedesktop.org desktop entry.
* Make gamera.util.CallbackSet objects unpicklable (closes: #555089).
+ * The sets module is deprecated in Python 2.6. Use set objects, rather than
+ sets.Set objects (updated use-system-modules.diff).
- -- Jakub Wilk <ubanus at users.sf.net> Tue, 26 Jan 2010 12:17:11 +0100
+ -- Jakub Wilk <ubanus at users.sf.net> Tue, 26 Jan 2010 12:24:45 +0100
gamera (3.2.3-1) unstable; urgency=low
Modified: packages/gamera/trunk/debian/patches/use-system-python-modules.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-python-modules.diff 2010-01-26 11:20:56 UTC (rev 11326)
+++ packages/gamera/trunk/debian/patches/use-system-python-modules.diff 2010-01-26 11:28:17 UTC (rev 11327)
@@ -3,32 +3,120 @@
Index: gamera-3.2.3/gamera/plugin.py
===================================================================
---- gamera-3.2.3.orig/gamera/plugin.py 2010-01-26 12:11:44.000000000 +0100
-+++ gamera-3.2.3/gamera/plugin.py 2010-01-26 12:14:05.000000000 +0100
-@@ -23,7 +23,7 @@
+--- gamera-3.2.3.orig/gamera/plugin.py 2009-05-08 11:03:50.000000000 +0200
++++ gamera-3.2.3/gamera/plugin.py 2010-01-26 12:22:49.000000000 +0100
+@@ -23,7 +23,6 @@
from gamera import paths
from gamera import util
import new, os, os.path, imp, inspect, sys, copy
-from gamera.backport import sets
-+import sets
from types import *
from enums import *
+@@ -173,10 +172,10 @@
+
+ def methods_flat_category(category, pixel_type=None):
+ if pixel_type == None:
+- methods = sets.Set()
++ methods = set()
+ for pixel_type in ALL + [NONIMAGE]:
+ # We have to cast the lists to sets here to make Python 2.3.0 happy.
+- methods.update(sets.Set(methods_flat_category(category, pixel_type)))
++ methods.update(set(methods_flat_category(category, pixel_type)))
+ return list(methods)
+ elif plugin_methods.has_key(pixel_type):
+ methods = plugin_methods[pixel_type]
Index: gamera-3.2.3/gamera/util.py
===================================================================
---- gamera-3.2.3.orig/gamera/util.py 2010-01-26 12:13:54.000000000 +0100
-+++ gamera-3.2.3/gamera/util.py 2010-01-26 12:14:05.000000000 +0100
-@@ -27,7 +27,8 @@
+--- gamera-3.2.3.orig/gamera/util.py 2010-01-26 12:21:21.000000000 +0100
++++ gamera-3.2.3/gamera/util.py 2010-01-26 12:22:20.000000000 +0100
+@@ -27,7 +27,7 @@
from gamera.enums import *
from gamera.gui import has_gui
from gamera.config import config
-from gamera.backport import sets, textwrap
-+import sets
+import textwrap
config.add_option(
"-p", "--progress-bar", action="store_true",
-@@ -572,7 +573,6 @@
+@@ -469,9 +469,9 @@
+ list.extend(self, other)
+ self.trigger_callback('length_change', len(self))
+
+-class CallbackSet(sets.Set, CallbackObject):
++class CallbackSet(set, CallbackObject):
+ def __init__(self, initset=None):
+- sets.Set.__init__(self, initset)
++ set.__init__(self, initset)
+ CallbackObject.__init__(self)
+
+ def __del__(self):
+@@ -487,7 +487,7 @@
+
+ def add(self, element):
+ alert = element not in self
+- sets.Set.add(self, element)
++ set.add(self, element)
+ if alert:
+ self.trigger_callback('add', [element])
+ self.trigger_callback('length_change', len(self))
+@@ -495,25 +495,25 @@
+
+ def remove(self, element):
+ alert = element in self
+- sets.Set.remove(self, element)
++ set.remove(self, element)
+ if alert:
+ self.trigger_callback('remove', [element])
+ self.trigger_callback('length_change', len(self))
+
+ def discard(self, element):
+ if element in self:
+- sets.Set.remove(self, element)
++ set.remove(self, element)
+ self.trigger_callback('remove', [element])
+ self.trigger_callback('length_change', len(self))
+
+ def pop(self):
+- result = sets.Set.pop(self)
++ result = set.pop(self)
+ self.trigger_callback('remove', [result])
+ self.trigger_callback('length_change', len(self))
+
+ def clear(self):
+ self.trigger_callback('remove', self)
+- sets.Set.clear(self)
++ set.clear(self)
+ self.trigger_callback('length_change', len(self))
+
+ def update(self, iterable):
+@@ -522,7 +522,7 @@
+ if i not in self:
+ yield i
+ self.trigger_callback('add', iter())
+- sets.Set.update(self, iterable)
++ set.update(self, iterable)
+ self.trigger_callback('length_change', len(self))
+
+ def difference_update(self, iterable):
+@@ -531,7 +531,7 @@
+ if i in self:
+ yield i
+ self.trigger_callback('remove', iter())
+- sets.Set.difference_update(self, iterable)
++ set.difference_update(self, iterable)
+ self.trigger_callback('length_change', len(self))
+
+ def symmetric_difference_update(self, iterable):
+@@ -565,20 +565,19 @@
+ def __setstate__(self, data):
+ CallbackObject.__init__(self)
+ self.trigger_callback('remove', self)
+- sets.Set.__setstate__(self, data)
++ set.__setstate__(self, data)
+ self.trigger_callback('add', self)
+ self.trigger_callback('length_change', len(self))
+
def get_file_extensions(mode):
from gamera import plugin
import os.path
@@ -36,3 +124,37 @@
methods = plugin.methods_flat_category("File")
methods = [y for x, y in methods if x.startswith(mode) and not x.endswith("image")]
+ if len(methods) == 0:
+ raise RuntimeError("There don't seem to be any imported plugins that can %s files. Try running init_gamera() or explictly loading file i/o plugins such as tiff_support and png_support." % mode)
+- extensions = sets.Set()
++ extensions = set()
+ types = []
+ for method in methods:
+ wildcards = ";".join(["*.%s;*.%s" %
+@@ -586,8 +585,8 @@
+ type = "%s Files (%s)|%s" % (method.exts[0].upper(), wildcards, wildcards)
+ types.append(type)
+ # We have to cast the lists to sets here to make Python 2.3.0 happy.
+- extensions.update(sets.Set(method.exts))
+- extensions.update(sets.Set([x.upper() for x in method.exts]))
++ extensions.update(set(method.exts))
++ extensions.update(set([x.upper() for x in method.exts]))
+ all_extensions = ";".join(["*.%s" % x for x in extensions])
+ types.insert(0, "All images (%s)|%s" % (all_extensions, all_extensions))
+ types.append("All files (*.*)|*.*")
+Index: gamera-3.2.3/gamera/stats.py
+===================================================================
+--- gamera-3.2.3.orig/gamera/stats.py 2010-01-26 12:22:56.000000000 +0100
++++ gamera-3.2.3/gamera/stats.py 2010-01-26 12:24:04.000000000 +0100
+@@ -3063,9 +3063,8 @@
+
+ Usage: dices(x,y)
+ """
+- import sets
+- x = sets.Set(x)
+- y = sets.Set(y)
++ x = set(x)
++ y = set(y)
+ common = len(x.intersection(y))
+ total = float(len(x) + len(y))
+ return 2*common/total
More information about the Python-modules-commits
mailing list