[Python-modules-commits] r11332 - in packages/gamera/trunk/debian/patches (1 file)

[jwilk-guest at users.alioth.debian.org]

    Date: Tuesday, January 26, 2010 @ 19:23:00
  Author: jwilk-guest
Revision: 11332

Kill even more references for the sets module.

Modified:
  packages/gamera/trunk/debian/patches/use-system-python-modules.diff

Modified: packages/gamera/trunk/debian/patches/use-system-python-modules.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2010-01-26 17:29:08 UTC (rev 11331)
+++ packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2010-01-26 19:23:00 UTC (rev 11332)
@@ -4,7 +4,7 @@
 Index: gamera-3.2.3/gamera/plugin.py
 ===================================================================
 --- 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 18:27:00.000000000 +0100
++++ gamera-3.2.3/gamera/plugin.py	2010-01-26 20:21:29.000000000 +0100
 @@ -23,7 +23,6 @@
  from gamera import paths
  from gamera import util
@@ -28,8 +28,8 @@
        methods = plugin_methods[pixel_type]
 Index: gamera-3.2.3/gamera/util.py
 ===================================================================
---- gamera-3.2.3.orig/gamera/util.py	2010-01-26 18:26:59.000000000 +0100
-+++ gamera-3.2.3/gamera/util.py	2010-01-26 18:27:10.000000000 +0100
+--- gamera-3.2.3.orig/gamera/util.py	2010-01-26 20:21:29.000000000 +0100
++++ gamera-3.2.3/gamera/util.py	2010-01-26 20:21:29.000000000 +0100
 @@ -27,7 +27,7 @@
  from gamera.enums import *
  from gamera.gui import has_gui
@@ -145,7 +145,7 @@
 Index: gamera-3.2.3/gamera/stats.py
 ===================================================================
 --- gamera-3.2.3.orig/gamera/stats.py	2009-06-17 09:15:15.000000000 +0200
-+++ gamera-3.2.3/gamera/stats.py	2010-01-26 18:27:00.000000000 +0100
++++ gamera-3.2.3/gamera/stats.py	2010-01-26 20:21:29.000000000 +0100
 @@ -3063,9 +3063,8 @@
  
  Usage:  dices(x,y)
@@ -158,3 +158,56 @@
      common = len(x.intersection(y))
      total = float(len(x) + len(y))
      return 2*common/total
+Index: gamera-3.2.3/gamera/classify.py
+===================================================================
+--- gamera-3.2.3.orig/gamera/classify.py	2010-01-26 20:21:37.000000000 +0100
++++ gamera-3.2.3/gamera/classify.py	2010-01-26 20:21:43.000000000 +0100
+@@ -733,7 +733,7 @@
+          return added, removed
+ 
+       added = []
+-      removed = util.sets.Set()
++      removed = set()
+       for glyph in glyphs:
+          for child in glyph.children_images:
+             removed.add(child)
+Index: gamera-3.2.3/gamera/gui/classifier_display.py
+===================================================================
+--- gamera-3.2.3.orig/gamera/gui/classifier_display.py	2010-01-26 20:21:50.000000000 +0100
++++ gamera-3.2.3/gamera/gui/classifier_display.py	2010-01-26 20:22:09.000000000 +0100
+@@ -318,7 +318,7 @@
+                     (-1,0), (0,-1), (1,0), (0,1),   # +
+                     (-1,-1), (-1,1), (1,-1), (1,1)) # x
+    def find_glyphs_in_rect(self, x1, y1, x2, y2, shift):
+-      matches = util.sets.Set()
++      matches = set()
+       if x1 == x2 or y1 == y2:
+          point = Point(x1, y1)
+          for i, g in enumerate(self.sorted_glyphs):
+@@ -336,7 +336,7 @@
+                   matches.add(i)
+       first = True
+       if shift:
+-         selected = util.sets.Set()
++         selected = set()
+          for i in self.GetSelectedIndices():
+             selected.add(i)
+          new_matches = matches.symmetric_difference(selected)
+@@ -988,7 +988,7 @@
+       if directory == None:
+          gui_util.message("You must provide a directory to load.")
+          return
+-      error_messages = util.sets.Set()
++      error_messages = set()
+       if settings:
+          try:
+             self._SaveClassifierSettings(
+@@ -1087,7 +1087,7 @@
+ 
+       self._save_by_criteria_dialog = results
+ 
+-      glyphs = util.sets.Set()
++      glyphs = set()
+       if classifier:
+          glyphs.update(self._classifier.get_glyphs())
+       if page: