Mercurial Repositories > eric / file diff

--- a/WebBrowser/Bookmarks/BookmarksImporters/__init__.py	Sat Mar 11 18:08:42 2017 +0100
+++ b/WebBrowser/Bookmarks/BookmarksImporters/__init__.py	Sat Mar 11 19:17:59 2017 +0100
@@ -55,71 +55,71 @@
     return importers
 
 
-def getImporterInfo(id):
+def getImporterInfo(sourceId):
     """
     Module function to get information for the given source id.
     
-    @param id source id to get info for (string)
+    @param sourceId source id to get info for (string)
     @return tuple with an icon (QPixmap), readable name (string), name of
         the default bookmarks file (string), an info text (string),
         a prompt (string) and the default directory of the bookmarks
         file (string)
     @exception ValueError raised to indicate an unsupported importer
     """
-    if id in ["e5browser", "xbel", "konqueror"]:
+    if sourceId in ["e5browser", "xbel", "konqueror"]:
         from . import XbelImporter
-        return XbelImporter.getImporterInfo(id)
-    elif id == "html":
+        return XbelImporter.getImporterInfo(sourceId)
+    elif sourceId == "html":
         from . import HtmlImporter
-        return HtmlImporter.getImporterInfo(id)
-    elif id in ["chrome", "chromium"]:
+        return HtmlImporter.getImporterInfo(sourceId)
+    elif sourceId in ["chrome", "chromium"]:
         from . import ChromeImporter
-        return ChromeImporter.getImporterInfo(id)
-    elif id == "opera":
+        return ChromeImporter.getImporterInfo(sourceId)
+    elif sourceId == "opera":
         from . import OperaImporter
-        return OperaImporter.getImporterInfo(id)
-    elif id == "firefox":
+        return OperaImporter.getImporterInfo(sourceId)
+    elif sourceId == "firefox":
         from . import FirefoxImporter
-        return FirefoxImporter.getImporterInfo(id)
-    elif id == "ie":
+        return FirefoxImporter.getImporterInfo(sourceId)
+    elif sourceId == "ie":
         from . import IExplorerImporter
-        return IExplorerImporter.getImporterInfo(id)
-    elif id == "safari":
+        return IExplorerImporter.getImporterInfo(sourceId)
+    elif sourceId == "safari":
         from . import SafariImporter
-        return SafariImporter.getImporterInfo(id)
+        return SafariImporter.getImporterInfo(sourceId)
     else:
-        raise ValueError("Invalid importer ID given ({0}).".format(id))
+        raise ValueError("Invalid importer ID given ({0}).".format(sourceId))
 
 
-def getImporter(id, parent=None):
+def getImporter(sourceId, parent=None):
     """
     Module function to get an importer for the given source id.
     
-    @param id source id to get an importer for (string)
+    @param sourceId source id to get an importer for (string)
     @param parent reference to the parent object (QObject)
     @return bookmarks importer (BookmarksImporter)
     @exception ValueError raised to indicate an unsupported importer
     """
-    if id in ["e5browser", "xbel", "konqueror"]:
+    if sourceId in ["e5browser", "xbel", "konqueror"]:
         from . import XbelImporter
-        return XbelImporter.XbelImporter(id, parent)
-    elif id == "html":
+        return XbelImporter.XbelImporter(sourceId, parent)
+    elif sourceId == "html":
         from . import HtmlImporter
-        return HtmlImporter.HtmlImporter(id, parent)
-    elif id in ["chrome", "chromium"]:
+        return HtmlImporter.HtmlImporter(sourceId, parent)
+    elif sourceId in ["chrome", "chromium"]:
         from . import ChromeImporter
-        return ChromeImporter.ChromeImporter(id, parent)
-    elif id == "opera":
+        return ChromeImporter.ChromeImporter(sourceId, parent)
+    elif sourceId == "opera":
         from . import OperaImporter
-        return OperaImporter.OperaImporter(id, parent)
-    elif id == "firefox":
+        return OperaImporter.OperaImporter(sourceId, parent)
+    elif sourceId == "firefox":
         from . import FirefoxImporter
-        return FirefoxImporter.FirefoxImporter(id, parent)
-    elif id == "ie":
+        return FirefoxImporter.FirefoxImporter(sourceId, parent)
+    elif sourceId == "ie":
         from . import IExplorerImporter
-        return IExplorerImporter.IExplorerImporter(id, parent)
-    elif id == "safari":
+        return IExplorerImporter.IExplorerImporter(sourceId, parent)
+    elif sourceId == "safari":
         from . import SafariImporter
-        return SafariImporter.SafariImporter(id, parent)
+        return SafariImporter.SafariImporter(sourceId, parent)
     else:
-        raise ValueError("No importer for ID {0}.".format(id))
+        raise ValueError("No importer for ID {0}.".format(sourceId))