diff --git a/dirdiff.py b/dirdiff.py
index 00d4d5f..e681665 100644
--- a/dirdiff.py
+++ b/dirdiff.py
@@ -506,7 +506,7 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
         self.actiongroup.get_action("Hide").set_sensitive(True)
 
     def launch_comparison(self, it, pane, force=1):
-        """Launch comparison at 'it'. 
+        """Launch comparison at 'it'.
            If it is a file we launch a diff.
            If it is a folder we recursively open diffs for each non equal file.
         """
diff --git a/filediff.py b/filediff.py
index 5e9441b..528446b 100644
--- a/filediff.py
+++ b/filediff.py
@@ -209,7 +209,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             def __getslice__(self, lo, hi):
                 b = self.buf
                 txt = b.get_text(get_iter_at_line_or_eof(b, lo), get_iter_at_line_or_eof(b, hi), 0)
-                if hi >= b.get_line_count(): 
+                if hi >= b.get_line_count():
                     return self.textfilter(txt).split("\n")
                 else:
                     return self.textfilter(txt).split("\n")[:-1]
@@ -711,7 +711,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
             context.set_source_rgba(1,1,0,.25)
             context.rectangle(0,ypos-visible.y, width, height)
             context.fill()
-        
+
     def _get_filename_for_saving(self, title ):
         dialog = gtk.FileChooserDialog(title,
             parent=self.widget.get_toplevel(),
diff --git a/gnomeglade.py b/gnomeglade.py
index 459733d..a7a815a 100644
--- a/gnomeglade.py
+++ b/gnomeglade.py
@@ -65,7 +65,7 @@ class Component(object):
 
     def map_widgets_into_lists(self, widgetnames):
         """Put sequentially numbered widgets into lists.
-        
+
         e.g. If an object had widgets self.button0, self.button1, ...,
         then after a call to object._map_widgets_into_lists(["button"])
         object has an attribute self.button == [self.button0, self.button1, ...]."
diff --git a/meldapp.py b/meldapp.py
index f6ce0ab..983a72a 100644
--- a/meldapp.py
+++ b/meldapp.py
@@ -184,7 +184,7 @@ class ListWidget(gnomeglade.Component):
         for filtstring in getattr( self.prefs, self.key).split("\n"):
             filt = misc.ListItem(filtstring)
             model.append([filt.name, filt.active, filt.value])
-   
+
 ################################################################################
 #
 # PreferencesDialog
@@ -659,7 +659,7 @@ class MeldApp(gnomeglade.Component):
 
     def on_menu_reload_activate(self, *extra):
         self.current_doc().on_reload_activate()
-  
+
     def on_menu_find_activate(self, *extra):
         self.current_doc().on_find_activate()
 
@@ -895,7 +895,7 @@ class MeldApp(gnomeglade.Component):
                 self._single_file_open(a)
             else:
                 tab = self.append_vcview([a], auto_compare)
-                    
+
         elif len(paths) in (2,3):
             tab = self.append_diff(paths, auto_compare)
         return tab
diff --git a/misc.py b/misc.py
index 8b1dee8..731515f 100644
--- a/misc.py
+++ b/misc.py
@@ -162,13 +162,13 @@ def all_equal(alist):
             if n != first:
                 return 0
     return 1
-    
+
 def shorten_names(*names):
     """Remove redunant parts of a list of names (e.g. /tmp/foo{1,2} -> foo{1,2}
     """
     prefix = os.path.commonprefix( names )
     prefixslash = prefix.rfind("/") + 1
-    
+
     names = map(lambda x: x[prefixslash:], names) # remove common prefix
     paths = map(lambda x: x.split("/"), names) # split on /
 
diff --git a/task.py b/task.py
index 06f86e7..cd9678c 100644
--- a/task.py
+++ b/task.py
@@ -112,7 +112,7 @@ class SchedulerBase(object):
         """
         while self.tasks_pending():
             self.iteration()
-        
+
     def tasks_pending(self):
         return len(self.tasks) != 0
 
diff --git a/undo.py b/undo.py
index f4f2d11..6657d23 100644
--- a/undo.py
+++ b/undo.py
@@ -128,7 +128,7 @@ class UndoSequence(gobject.GObject):
 
     def redo(self):
         """Redo an action.
-        
+
         Raises and AssertionError if the sequence is not undoable.
         """
         assert self.next_redo < len(self.actions)
@@ -151,13 +151,13 @@ class UndoSequence(gobject.GObject):
         undoing should undo both of them.
         """
         if self.group:
-            self.group.begin_group() 
+            self.group.begin_group()
         else:
             self.group = UndoSequence()
 
     def end_group(self):
         """End a logical group action. See also begin_group().
-        
+
         Raises an AssertionError if there was not a matching call to
         begin_group().
         """
@@ -167,14 +167,14 @@ class UndoSequence(gobject.GObject):
         else:
             group = self.group
             self.group = None
-            if len(group.actions) == 1: # collapse 
+            if len(group.actions) == 1: # collapse
                 self.add_action( group.actions[0] )
             elif len(group.actions) > 1:
                 self.add_action( GroupAction(group) )
 
     def abort_group(self):
         """Revert the sequence to the state before begin_group() was called.
-        
+
         Raises an AssertionError if there was no a matching call to begin_group().
         """
         assert self.group != None
diff --git a/vc/__init__.py b/vc/__init__.py
index 3b39f25..4616fce 100644
--- a/vc/__init__.py
+++ b/vc/__init__.py
@@ -3,7 +3,7 @@
 ### Redistribution and use in source and binary forms, with or without
 ### modification, are permitted provided that the following conditions
 ### are met:
-### 
+###
 ### 1. Redistributions of source code must retain the above copyright
 ###    notice, this list of conditions and the following disclaimer.
 ### 2. Redistributions in binary form must reproduce the above copyright
@@ -47,7 +47,7 @@ def get_plugins_metadata():
 
 def get_vcs(location):
     """Pick only the Vcs with the longest repo root
-    
+
        Some VC plugins search their repository root
        by walking the filesystem upwards its root
        and now that we display multiple VCs in the
diff --git a/vc/_null.py b/vc/_null.py
index 0478fb9..7de1600 100644
--- a/vc/_null.py
+++ b/vc/_null.py
@@ -3,7 +3,7 @@
 ### Redistribution and use in source and binary forms, with or without
 ### modification, are permitted provided that the following conditions
 ### are met:
-### 
+###
 ### 1. Redistributions of source code must retain the above copyright
 ###    notice, this list of conditions and the following disclaimer.
 ### 2. Redistributions in binary form must reproduce the above copyright
diff --git a/vc/_vc.py b/vc/_vc.py
index 68e5160..072dda2 100644
--- a/vc/_vc.py
+++ b/vc/_vc.py
@@ -3,7 +3,7 @@
 ### Redistribution and use in source and binary forms, with or without
 ### modification, are permitted provided that the following conditions
 ### are met:
-### 
+###
 ### 1. Redistributions of source code must retain the above copyright
 ###    notice, this list of conditions and the following disclaimer.
 ### 2. Redistributions in binary form must reproduce the above copyright
diff --git a/vc/bzr.py b/vc/bzr.py
index ff6c8da..5a625c6 100644
--- a/vc/bzr.py
+++ b/vc/bzr.py
@@ -4,7 +4,7 @@
 ### Redistribution and use in source and binary forms, with or without
 ### modification, are permitted provided that the following conditions
 ### are met:
-### 
+###
 ### 1. Redistributions of source code must retain the above copyright
 ###    notice, this list of conditions and the following disclaimer.
 ### 2. Redistributions in binary form must reproduce the above copyright
diff --git a/vc/cdv.py b/vc/cdv.py
index a9f8847..ab57c1a 100644
--- a/vc/cdv.py
+++ b/vc/cdv.py
@@ -3,7 +3,7 @@
 ### Redistribution and use in source and binary forms, with or without
 ### modification, are permitted provided that the following conditions
 ### are met:
-### 
+###
 ### 1. Redistributions of source code must retain the above copyright
 ###    notice, this list of conditions and the following disclaimer.
 ### 2. Redistributions in binary form must reproduce the above copyright
diff --git a/vc/cvs.py b/vc/cvs.py
index cab2fe6..20b5cbc 100644
--- a/vc/cvs.py
+++ b/vc/cvs.py
@@ -3,7 +3,7 @@
 ### Redistribution and use in source and binary forms, with or without
 ### modification, are permitted provided that the following conditions
 ### are met:
-### 
+###
 ### 1. Redistributions of source code must retain the above copyright
 ###    notice, this list of conditions and the following disclaimer.
 ### 2. Redistributions in binary form must reproduce the above copyright
diff --git a/vc/darcs.py b/vc/darcs.py
index fcc9321..224e576 100644
--- a/vc/darcs.py
+++ b/vc/darcs.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*- 
+# -*- coding: utf-8 -*-
 
 # vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 #Copyright (c) 2005 Ali Afshar <aafshar@gmail.com>
@@ -61,7 +61,7 @@ class Vc(_vc.CachedVc):
 
     def remove_command(self, force=0):
         return [self.CMD, "remove"]
- 
+
     def revert_command(self):
         # will not work, since darcs needs interaction it seems
         return [self.CMD, "revert", "-a"]
diff --git a/vc/git.py b/vc/git.py
index 3f51e22..9084b07 100644
--- a/vc/git.py
+++ b/vc/git.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*- 
+# -*- coding: utf-8 -*-
 
 # vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 
@@ -9,7 +9,7 @@
 ### Redistribution and use in source and binary forms, with or without
 ### modification, are permitted provided that the following conditions
 ### are met:
-### 
+###
 ### 1. Redistributions of source code must retain the above copyright
 ###    notice, this list of conditions and the following disclaimer.
 ### 2. Redistributions in binary form must reproduce the above copyright
diff --git a/vc/mercurial.py b/vc/mercurial.py
index 1d7aa55..7732102 100644
--- a/vc/mercurial.py
+++ b/vc/mercurial.py
@@ -3,7 +3,7 @@
 ### Redistribution and use in source and binary forms, with or without
 ### modification, are permitted provided that the following conditions
 ### are met:
-### 
+###
 ### 1. Redistributions of source code must retain the above copyright
 ###    notice, this list of conditions and the following disclaimer.
 ### 2. Redistributions in binary form must reproduce the above copyright
diff --git a/vc/rcs.py b/vc/rcs.py
index 9bb6726..cb8e880 100644
--- a/vc/rcs.py
+++ b/vc/rcs.py
@@ -4,7 +4,7 @@
 ### Redistribution and use in source and binary forms, with or without
 ### modification, are permitted provided that the following conditions
 ### are met:
-### 
+###
 ### 1. Redistributions of source code must retain the above copyright
 ###    notice, this list of conditions and the following disclaimer.
 ### 2. Redistributions in binary form must reproduce the above copyright
diff --git a/vc/svk.py b/vc/svk.py
index a62b057..635874a 100644
--- a/vc/svk.py
+++ b/vc/svk.py
@@ -3,7 +3,7 @@
 ### Redistribution and use in source and binary forms, with or without
 ### modification, are permitted provided that the following conditions
 ### are met:
-### 
+###
 ### 1. Redistributions of source code must retain the above copyright
 ###    notice, this list of conditions and the following disclaimer.
 ### 2. Redistributions in binary form must reproduce the above copyright
diff --git a/vc/svn.py b/vc/svn.py
index 5091578..0e3798b 100644
--- a/vc/svn.py
+++ b/vc/svn.py
@@ -3,7 +3,7 @@
 ### Redistribution and use in source and binary forms, with or without
 ### modification, are permitted provided that the following conditions
 ### are met:
-### 
+###
 ### 1. Redistributions of source code must retain the above copyright
 ###    notice, this list of conditions and the following disclaimer.
 ### 2. Redistributions in binary form must reproduce the above copyright
diff --git a/vc/tla.py b/vc/tla.py
index f66fdac..8bccd39 100644
--- a/vc/tla.py
+++ b/vc/tla.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*- 
+# -*- coding: utf-8 -*-
 
 # vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
 #Copyright (c) 2005 Ali Afshar <aafshar@gmail.com>
diff --git a/vcview.py b/vcview.py
index b4c6070..c7604f4 100644
--- a/vcview.py
+++ b/vcview.py
@@ -241,7 +241,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
         self.combobox_vcs.set_sensitive(len(vcs) > 1)
         self.combobox_vcs.lock = False
         self.combobox_vcs.set_active(default_active)
-  
+
     def on_vc_change(self, cb):
         if not cb.lock:
             self.vc = cb.get_model()[cb.get_active_iter()][1]
@@ -299,7 +299,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
                 root = name
             yield _("[%s] Scanning %s") % (self.label_text, root[prefixlen:])
             #import time; time.sleep(1.0)
-            
+
             entries = filter(showable, self.vc.listdir(root))
             differences = 0
             for e in entries:
@@ -430,7 +430,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
         """Run 'command' on 'files'.
         """
         self.scheduler.add_task( self._command_iter(command, files, refresh).next )
-        
+
     def _command_on_selected(self, command, refresh=1):
         files = self._get_selected_files()
         if len(files):
