Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py

changeset 1725
d7a3430f7cbf
parent 1719
c65aefefa2ff
child 2302
f29e9405c851
diff -r 6e690a8f5971 -r d7a3430f7cbf Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py
--- a/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py	Tue Mar 20 19:47:18 2012 +0100
+++ b/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py	Wed Mar 21 12:02:57 2012 +0100
@@ -32,6 +32,9 @@
         if Globals.isWindowsPlatform():
             standardDir = os.path.expandvars(
                 "%USERPROFILE%\\AppData\\Local\\Google\\Chrome\\User Data\\Default")
+        elif Globals.isMacPlatform():
+            standardDir = os.path.expanduser(
+                "~/Library/Application Support/Google/Chrome/Default")
         else:
             standardDir = os.path.expanduser("~/.config/google-chrome/Default")
         return (
@@ -109,7 +112,7 @@
         @return imported bookmarks (BookmarkNode)
         """
         try:
-            f = open(self.__fileName, "r")
+            f = open(self.__fileName, "r", encoding="utf-8")
             contents = json.load(f)
             f.close()
         except IOError as err:

eric ide

mercurial