From f484286f8a0eff4a63793ed474ae5c1304579bbb Mon Sep 17 00:00:00 2001
From: Jon Tibble <meths@btinternet.com>
Date: Wed, 26 Jan 2011 02:43:16 +0000
Subject: [PATCH] Few cleanups

---
 openlp/plugins/bibles/lib/manager.py         |  2 +-
 openlp/plugins/songs/lib/easislidesimport.py | 10 +++++-----
 openlp/plugins/songs/lib/importer.py         |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py
index 63c6954fb..85204ac7a 100644
--- a/openlp/plugins/bibles/lib/manager.py
+++ b/openlp/plugins/bibles/lib/manager.py
@@ -92,7 +92,7 @@ class BibleFormat(object):
             return None
 
     @staticmethod
-    def list():
+    def get_formats_list():
         """
         Return a list of the supported Bible formats.
         """
diff --git a/openlp/plugins/songs/lib/easislidesimport.py b/openlp/plugins/songs/lib/easislidesimport.py
index 64523fd3a..84e7a3841 100644
--- a/openlp/plugins/songs/lib/easislidesimport.py
+++ b/openlp/plugins/songs/lib/easislidesimport.py
@@ -314,11 +314,11 @@ class EasiSlidesImport(SongImport):
             pass
 
     def _listHas(self, lst, subitems):
-        for i in subitems:
-            if type(lst) == type({}) and lst.has_key(i):
-                lst = lst[i]
-            elif type(lst) == type([]) and i in lst:
-                lst = lst[i]
+        for subitem in subitems:
+            if isinstance(lst, dict) and lst.has_key(subitem):
+                lst = lst[subitem]
+            elif isinstance(lst, list) and subitem in lst:
+                lst = lst[subitem]
             else:
                 return False
         return True
diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index 91d3d7e6f..6f566ff4f 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -105,7 +105,7 @@ class SongFormat(object):
         return None
 
     @staticmethod
-    def list():
+    def get_formats_list():
         """
         Return a list of the supported song formats.
         """