meld r1261 - trunk

[vincele svn gnome org]

Author: vincele
Date: Sat Mar 14 13:52:05 2009
New Revision: 1261
URL: http://svn.gnome.org/viewvc/meld?rev=1261&view=rev

Log:
Remove undefined variable usage, and unused parameter


Modified:
   trunk/dirdiff.py

Modified: trunk/dirdiff.py
==============================================================================
--- trunk/dirdiff.py	(original)
+++ trunk/dirdiff.py	Sat Mar 14 13:52:05 2009
@@ -431,12 +431,12 @@
                                 % "\n".join( self.bad ), self.parent )
                         keys = self.items.keys()
                         keys.sort()
-                        def fixup(key, tuples): # replace None with a usable label
+                        def fixup(tuples): # replace None with a usable label
                             def first_nonempty(seq):
                                 for s in seq:
                                     if s: return s
-                            return tuple([ t or first_nonempty(tuples) or k for t in tuples ])
-                        return [ fixup(k, self.items[k]) for k in keys ]
+                            return tuple([t or first_nonempty(tuples) for t in tuples])
+                        return [fixup(self.items[k]) for k in keys]
             accumdirs = accum(self, roots)
             accumfiles = accum(self, roots)
             for pane, root in enumerate(roots):