diff -r 0e5421d679e7 -r ea526b78ee6c Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py --- a/Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py Tue Mar 07 18:53:18 2017 +0100 @@ -18,18 +18,18 @@ import UI.PixmapCache -def getImporterInfo(id): +def getImporterInfo(sourceId): """ Module function to get information for the given HTML source id. - @param id id of the browser ("chrome" or "chromium") + @param sourceId id of the browser ("chrome" or "chromium") @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 invalid browser ID """ - if id == "html": + if sourceId == "html": return ( UI.PixmapCache.getPixmap("html.png"), "HTML Netscape Bookmarks", @@ -47,21 +47,22 @@ "", ) else: - raise ValueError("Unsupported browser ID given ({0}).".format(id)) + raise ValueError( + "Unsupported browser ID given ({0}).".format(sourceId)) class HtmlImporter(BookmarksImporter): """ Class implementing the HTML bookmarks importer. """ - def __init__(self, id="", parent=None): + def __init__(self, sourceId="", parent=None): """ Constructor - @param id source ID (string) + @param sourceId source ID (string) @param parent reference to the parent object (QObject) """ - super(HtmlImporter, self).__init__(id, parent) + super(HtmlImporter, self).__init__(sourceId, parent) self.__fileName = "" self.__inFile = None