Feat(Python3): `raise Error, value` -> `raise Error(value)`

[bookmarks_db.git] / Storage / bkmk_stflad.py

diff --git a/Storage/bkmk_stflad.py b/Storage/bkmk_stflad.py
index 86c42b379273f59633b8c7ce40ab4b201204fd1b..b936c4a723b5485295ace7ed958706d23fabaa84 100644 (file)
--- a/Storage/bkmk_stflad.py
+++ b/Storage/bkmk_stflad.py
@@ -5,13 +5,13 @@ Special version for compatibility with old (version 1) bkmk2db.
 This file is a part of Bookmarks database and Internet robot.
 """
 
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2011 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2017 PhiloSoft Design"
 __license__ = "GNU GPL"
 
+__all__ = ['storage_flad']
+
+
 import string
 from m_lib.flad import fladm
 from bkmk_objects import Folder, Bookmark, Ruler, Walker
@@ -58,17 +58,14 @@ Charset: %s
          b.keyword, b.comment.replace('\n', "\\n"),
          b.icon_href or '', b.icon or '', b.charset or ''))
 
-
    def ruler(self, r, level):
       self.outfile.write("\nLevel: %s\nRuler: YES\n" % (level+1))
 
-
    def store(self, root_folder):
       self.outfile = open(self.filename, 'w')
       root_folder.walk_depth(self)
       self.outfile.close()
 
-
    def unindent(self, old_level, new_level):
       while old_level > new_level:
          old_level = old_level - 1
@@ -105,11 +102,11 @@ Charset: %s
             pass
          elif level == save_level + 1:
             if not got_folder:
-               raise ValueError, "indent without folder"
+               raise ValueError("indent without folder")
          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
@@ -133,11 +130,11 @@ 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