--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/__init__.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/__init__.py Wed Jul 13 14:55:47 2022 +0200 @@ -16,47 +16,48 @@ def getImporters(): """ Module function to get a list of supported importers. - + @return list of tuples with an icon (QIcon), readable name (string) and internal name (string) """ importers = [] importers.append( - (UI.PixmapCache.getIcon("ericWeb48"), "eric Web Browser", - "e5browser")) - importers.append( - (UI.PixmapCache.getIcon("firefox"), "Mozilla Firefox", "firefox")) - importers.append( - (UI.PixmapCache.getIcon("chrome"), "Google Chrome", "chrome")) + (UI.PixmapCache.getIcon("ericWeb48"), "eric Web Browser", "e5browser") + ) + importers.append((UI.PixmapCache.getIcon("firefox"), "Mozilla Firefox", "firefox")) + importers.append((UI.PixmapCache.getIcon("chrome"), "Google Chrome", "chrome")) if Globals.isLinuxPlatform(): + importers.append((UI.PixmapCache.getIcon("chromium"), "Chromium", "chromium")) importers.append( - (UI.PixmapCache.getIcon("chromium"), "Chromium", "chromium")) - importers.append( - (UI.PixmapCache.getIcon("konqueror"), "Konqueror", - "konqueror")) - importers.append( - (UI.PixmapCache.getIcon("opera"), "Opera", "opera")) - importers.append( - (UI.PixmapCache.getIcon("safari"), "Apple Safari", "safari")) + (UI.PixmapCache.getIcon("konqueror"), "Konqueror", "konqueror") + ) + importers.append((UI.PixmapCache.getIcon("opera"), "Opera", "opera")) + importers.append((UI.PixmapCache.getIcon("safari"), "Apple Safari", "safari")) if Globals.isWindowsPlatform(): importers.append( - (UI.PixmapCache.getIcon("internet_explorer"), - "Internet Explorer", "ie")) + (UI.PixmapCache.getIcon("internet_explorer"), "Internet Explorer", "ie") + ) importers.append( - (UI.PixmapCache.getIcon("xbel"), - QCoreApplication.translate("BookmarksImporters", "XBEL File"), - "xbel")) + ( + UI.PixmapCache.getIcon("xbel"), + QCoreApplication.translate("BookmarksImporters", "XBEL File"), + "xbel", + ) + ) importers.append( - (UI.PixmapCache.getIcon("html"), - QCoreApplication.translate("BookmarksImporters", "HTML File"), - "html")) + ( + UI.PixmapCache.getIcon("html"), + QCoreApplication.translate("BookmarksImporters", "HTML File"), + "html", + ) + ) return importers def getImporterInfo(sourceId): """ Module function to get information for the given source id. - + @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), @@ -66,24 +67,31 @@ """ if sourceId in ["e5browser", "xbel", "konqueror"]: from . import XbelImporter + return XbelImporter.getImporterInfo(sourceId) elif sourceId == "html": from . import HtmlImporter + return HtmlImporter.getImporterInfo(sourceId) elif sourceId in ["chrome", "chromium"]: from . import ChromeImporter + return ChromeImporter.getImporterInfo(sourceId) elif sourceId == "opera": from . import OperaImporter + return OperaImporter.getImporterInfo(sourceId) elif sourceId == "firefox": from . import FirefoxImporter + return FirefoxImporter.getImporterInfo(sourceId) elif sourceId == "ie": from . import IExplorerImporter + return IExplorerImporter.getImporterInfo(sourceId) elif sourceId == "safari": from . import SafariImporter + return SafariImporter.getImporterInfo(sourceId) else: raise ValueError("Invalid importer ID given ({0}).".format(sourceId)) @@ -92,7 +100,7 @@ def getImporter(sourceId, parent=None): """ Module function to get an importer for the given source id. - + @param sourceId source id to get an importer for (string) @param parent reference to the parent object (QObject) @return bookmarks importer (BookmarksImporter) @@ -100,24 +108,31 @@ """ if sourceId in ["e5browser", "xbel", "konqueror"]: from . import XbelImporter + return XbelImporter.XbelImporter(sourceId, parent) elif sourceId == "html": from . import HtmlImporter + return HtmlImporter.HtmlImporter(sourceId, parent) elif sourceId in ["chrome", "chromium"]: from . import ChromeImporter + return ChromeImporter.ChromeImporter(sourceId, parent) elif sourceId == "opera": from . import OperaImporter + return OperaImporter.OperaImporter(sourceId, parent) elif sourceId == "firefox": from . import FirefoxImporter + return FirefoxImporter.FirefoxImporter(sourceId, parent) elif sourceId == "ie": from . import IExplorerImporter + return IExplorerImporter.IExplorerImporter(sourceId, parent) elif sourceId == "safari": from . import SafariImporter + return SafariImporter.SafariImporter(sourceId, parent) else: raise ValueError("No importer for ID {0}.".format(sourceId))