Mercurial Repositories > eric / file diff

--- a/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py	Tue Oct 15 22:03:54 2013 +0200
+++ b/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py	Fri Oct 18 23:00:41 2013 +0200
@@ -24,14 +24,18 @@
     """
     Module function to get information for the given source id.
     
+    @param id 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)
+        a prompt (string) and the default directory of the bookmarks file
+        (string)
+    @exception ValueError raised to indicate an invalid browser ID
     """
     if id == "chrome":
         if Globals.isWindowsPlatform():
             standardDir = os.path.expandvars(
-                "%USERPROFILE%\\AppData\\Local\\Google\\Chrome\\User Data\\Default")
+                "%USERPROFILE%\\AppData\\Local\\Google\\Chrome\\"
+                "User Data\\Default")
         elif Globals.isMacPlatform():
             standardDir = os.path.expanduser(
                 "~/Library/Application Support/Google/Chrome/Default")
@@ -41,9 +45,11 @@
             UI.PixmapCache.getPixmap("chrome.png"),
             "Google Chrome",
             "Bookmarks",
-            QCoreApplication.translate("ChromeImporter",
-                """Google Chrome stores its bookmarks in the <b>Bookmarks</b> """
-                """text file. This file is usually located in"""),
+            QCoreApplication.translate(
+                "ChromeImporter",
+                """Google Chrome stores its bookmarks in the"""
+                """ <b>Bookmarks</b> text file. This file is usually"""
+                """ located in"""),
             QCoreApplication.translate("ChromeImporter",
                 """Please choose the file to begin importing bookmarks."""),
             standardDir,
@@ -51,16 +57,18 @@
     elif id == "chromium":
         if Globals.isWindowsPlatform():
             standardDir = os.path.expandvars(
-                "%USERPROFILE%\\AppData\\Local\\Google\\Chrome\\User Data\\Default")
+                "%USERPROFILE%\\AppData\\Local\\Google\\Chrome\\"
+                "User Data\\Default")
         else:
             standardDir = os.path.expanduser("~/.config/chromium/Default")
         return (
             UI.PixmapCache.getPixmap("chromium.png"),
             "Chromium",
             "Bookmarks",
-            QCoreApplication.translate("ChromeImporter",
-                """Chromium stores its bookmarks in the <b>Bookmarks</b> text file. """
-                """This file is usually located in"""),
+            QCoreApplication.translate(
+                "ChromeImporter",
+                """Chromium stores its bookmarks in the <b>Bookmarks</b>"""
+                """ text file. This file is usually located in"""),
             QCoreApplication.translate("ChromeImporter",
                 """Please choose the file to begin importing bookmarks."""),
             standardDir,
@@ -100,8 +108,8 @@
         """
         if not os.path.exists(self.__fileName):
             self._error = True
-            self._errorString = self.trUtf8("File '{0}' does not exist.")\
-                .format(self.__fileName)
+            self._errorString = self.trUtf8(
+                "File '{0}' does not exist.").format(self.__fileName)
             return False
         return True
     
@@ -117,7 +125,8 @@
             f.close()
         except IOError as err:
             self._error = True
-            self._errorString = self.trUtf8("File '{0}' cannot be read.\nReason: {1}")\
+            self._errorString = self.trUtf8(
+                "File '{0}' cannot be read.\nReason: {1}")\
                 .format(self.__fileName, str(err))
             return None