From 297c84bbc32afbd926b7359571a8c14c29b62027 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 5 May 2010 16:16:15 -0400
Subject: [PATCH] Clean up pylint

---
 src/virtManager/createpool.py    | 5 ++---
 src/virtManager/storagebrowse.py | 2 +-
 tests/pylint-virt-manager.sh     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/virtManager/createpool.py b/src/virtManager/createpool.py
index 10ba1c5ab..8b359182a 100644
--- a/src/virtManager/createpool.py
+++ b/src/virtManager/createpool.py
@@ -193,10 +193,9 @@ class vmmCreatePool(gobject.GObject):
         for typ in types:
             model.append([typ, "%s: %s" % (typ, Storage.StoragePool.get_pool_type_desc(typ))])
 
-    def populate_pool_format(self):
+    def populate_pool_format(self, formats):
         model = self.window.get_widget("pool-format").get_model()
         model.clear()
-        formats = self._pool.formats
         for f in formats:
             model.append([f, f])
 
@@ -292,7 +291,7 @@ class vmmCreatePool(gobject.GObject):
         self.window.get_widget("pool-format").set_active(-1)
 
         if fmt:
-            self.populate_pool_format()
+            self.populate_pool_format(getattr(self._pool, "formats"))
             self.window.get_widget("pool-format").set_active(0)
 
         self.populate_pool_sources()
diff --git a/src/virtManager/storagebrowse.py b/src/virtManager/storagebrowse.py
index 2f02387b8..2dd8b25dd 100644
--- a/src/virtManager/storagebrowse.py
+++ b/src/virtManager/storagebrowse.py
@@ -319,6 +319,6 @@ class vmmStorageBrowser(gobject.GObject):
                           vol.get_format() or "", namestr])
 
     def show_err(self, info, details):
-        self.show_err(info, details, async=False)
+        self.err.show_err(info, details, async=False)
 
 gobject.type_register(vmmStorageBrowser)
diff --git a/tests/pylint-virt-manager.sh b/tests/pylint-virt-manager.sh
index 6602c1c8d..23cd439c3 100755
--- a/tests/pylint-virt-manager.sh
+++ b/tests/pylint-virt-manager.sh
@@ -23,7 +23,7 @@ ERROR_VBOX="Class 'vbox' has no 'pack_start' member"
 EXCEPTHOOK="no '__excepthook__' member"
 CONNECT_VAR="no 'connect' member"
 DISCONNECT_VAR="no 'disconnect' member"
-UNABLE_IMPORT="Unable to import 'gtk.gdk.*|Unable to import 'sparkline"
+UNABLE_IMPORT="Unable to import '(gtk.gdk.*|sparkline|appindicator)"
 
 # os._exit is needed for forked processes.
 OS_EXIT="protected member _exit of a client class"