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

[bookmarks_db.git] / set-title-list.py

diff --git a/set-title-list.py b/set-title-list.py
index e5d6f22ca39ffbb33bc92ec8dc86f6f2e509820a..bd0da40c897660bb918c7e27bc670a3eeb5d835f 100755 (executable)
--- a/set-title-list.py
+++ b/set-title-list.py
@@ -1,14 +1,18 @@
-#! /usr/local/bin/python -O
-"""
-   Run through the bookmarks database and set names to titles from an external file
+#! /usr/bin/env python
+"""Run through the bookmarks database and set names to titles from an external file
 
-   Written by BroytMann, May 2003 - May 2003. Copyright (C) 2003 PhiloSoft Design
+This file is a part of Bookmarks database and Internet robot.
 """
 
-
+from __future__ import print_function
 import sys
 
 
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__copyright__ = "Copyright (C) 2003-2017 PhiloSoft Design"
+__license__ = "GNU GPL"
+
+
 def run():
    from getopt import getopt
    optlist, args = getopt(sys.argv[1:], "s")
@@ -24,7 +28,7 @@ def run():
       pass
 
    if report_stats:
-      print "BroytMann set-title-list, Copyright (C) 2003 PhiloSoft Design"
+      print("Broytman set-title-list, Copyright (C) 2003-2017 PhiloSoft Design")
 
    if len(args) <> 1:
       sys.stderr.write("Usage: set-title-list [-s] title_list_file\n")
@@ -46,12 +50,12 @@ def run():
          title = line
 
       elif line: # the third line in every 3 lines must be empty
-         raise ValueError, "line is not empty for URL `%s', title `%s': line `%s'" % (URL, title, line)
+         raise ValueError("line is not empty for URL `%s', title `%s': line `%s'" % (URL, title, line))
 
       else: # We've got 3 lines - add new entry to the mapping
          if titles_dict.has_key(URL):
             if title <> titles_dict[URL]:
-               raise ValueError, "titles are not identical for URL `%s': `%s' <> `%s'" % (URL, title, titles_dict[URL])
+               raise ValueError("titles are not identical for URL `%s': `%s' <> `%s'" % (URL, title, titles_dict[URL]))
 
          else:
             titles_dict[URL] = title
@@ -71,12 +75,12 @@ def run():
       sys.stdout.flush()
 
    root_folder = storage.load()
-   from bkmk_objects import make_linear
+   from bkmk_objects import make_linear, break_tree
    make_linear(root_folder)
    objects = len(root_folder.linear)
 
    if report_stats:
-      print "Ok"
+      print("Ok")
 
 
    # Run through the list of objects and check URLs/titles
@@ -102,12 +106,13 @@ def run():
       sys.stdout.flush()
 
    if changed:
+      break_tree(root_folder.linear)
       storage.store(root_folder)
 
    if changed and report_stats:
-      print "Ok"
-      print objects, "objects passed"
-      print changed, "objects changed"
+      print("Ok")
+      print(objects, "objects passed")
+      print(changed, "objects changed")
 
 
 if __name__ == '__main__':