[Pkg-bazaar-commits] ./bzr-gtk/unstable r557: Merge Jasper's cosmetics patch.

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 557
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Sun 2008-07-20 16:29:32 +0200
message:
  Merge Jasper's cosmetics patch.
modified:
  olive/__init__.py
    ------------------------------------------------------------
    revno: 552.1.1
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: cosmetics
    timestamp: Fri 2008-07-18 17:00:20 +0200
    message:
      Tweaks to olive/__init__.py:
      Remove #!
      Change deprecated wt.revert([]) to proper wt.revert(None)
      Remove unneeded else: pass
      Remove trailing whitespace
    modified:
      olive/__init__.py
-------------- next part --------------
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2008-07-18 18:25:39 +0000
+++ b/olive/__init__.py	2008-07-20 14:29:32 +0000
@@ -1,5 +1,3 @@
- #!/usr/bin/python
-
 # Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas at gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -660,7 +658,7 @@
     @show_bzr_error
     def on_menuitem_branch_revert_activate(self, widget):
         """ Branch/Revert all changes menu handler. """
-        ret = self.wt.revert([])
+        ret = self.wt.revert(None)
         if ret:
             warning_dialog(_i18n('Conflicts detected'),
                            _i18n('Please have a look at the working tree before continuing.'))
@@ -1512,8 +1510,6 @@
             if sys.platform == 'win32':
                 print "pyWin32 modules needed to run Olive on Win32."
                 sys.exit(1)
-            else:
-                pass
         
         driveletters = []
         for drive in string.ascii_uppercase:
@@ -1757,4 +1753,3 @@
                 return self._get_default(option)
             except KeyError:
                 return None
-