]> git.phdru.name Git - bookmarks_db.git/blobdiff - Storage/bkmk_stflad.py
Fix(Storage/bkmk_stjson.py): open file in text mode
[bookmarks_db.git] / Storage / bkmk_stflad.py
index 56397727b9c8a4dbd4dab80feefecfd7f6bfcbf3..156e956f7244fdc09809646917d12a707d6821d7 100644 (file)
@@ -77,7 +77,8 @@ Charset: %s
             self.current_folder = None
 
     def load(self):
-        bookmarks_db = fladm.load_from_file(self.filename, fladm.check_record, ["Level"])
+        bookmarks_db = fladm.load_from_file(
+            self.filename, fladm.check_record, ["Level"])
 
         root_folder = Folder()
         self.folder_stack = [root_folder]
@@ -93,7 +94,7 @@ Charset: %s
         root_folder.comment = string.join(header[7:], '')[4:]
 
         save_level = 0
-        got_folder = 1 # Start as if we already have one folder
+        got_folder = 1  # Start as if we already have one folder
 
         for record in bookmarks_db:
             level = int(record["Level"])
@@ -106,21 +107,27 @@ Charset: %s
             elif level <= save_level - 1:
                 self.unindent(save_level, level)
             else:
-                raise ValueError("new level (%d) too big; must be %d - %d" % (level, save_level-1, save_level+1))
+                raise ValueError("new level (%d) too big; must be %d - %d"
+                                 % (level, save_level-1, save_level+1))
 
             save_level = level
-            got_folder = record.has_key("Folder") # Test here to save got_folder for next loop
+            # Test here to save got_folder for next loop
+            got_folder = record.has_key("Folder")
 
             if record.has_key("URL"):
                 comment = record["Comment"].replace("\\n", '\n')
-                bookmark = Bookmark(record["URL"], record["AddDate"],
-                   record["LastVisit"], record["LastModified"],
-                   record["Keyword"], comment)
+                bookmark = Bookmark(
+                    record["URL"], record["AddDate"],
+                    record["LastVisit"], record["LastModified"],
+                    record["Keyword"], comment)
                 bookmark.name = record["Title"]
                 self.current_folder.append(bookmark)
 
             elif record.has_key("Folder"):
-                folder = Folder(record["AddDate"], record["Comment"], record["LastModified"])
+                folder = Folder(
+                    record["AddDate"], record["Comment"],
+                    record["LastModified"]
+                )
                 folder.name = record["Folder"]
                 self.current_folder.append(folder)
                 self.folder_stack.append(folder)
@@ -130,11 +137,15 @@ Charset: %s
                 self.current_folder.append(Ruler())
 
             else:
-                raise KeyError("neither \"URL\" nor \"Folder\" nor \"Ruler\" in record " + str(record))
+                raise KeyError(
+                    'neither "URL" nor "Folder" nor "Ruler" in record '
+                    + str(record)
+                )
 
         if save_level >= 0:
             self.unindent(save_level, 0)
         else:
-            raise ValueError("new level (%d) too little - must be >= 0" % save_level)
+            raise ValueError("new level (%d) too little - must be >= 0"
+                             % save_level)
 
         return root_folder