X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=db2bkmk.py;h=7d1d9aa19f1c46fdebd47e45f859ab7a7c7e2ba7;hb=08ec9479b05db7a2d40cc58f3a39256dfaf9ff30;hp=e0ac1c1bcb6b76c6247f7680421a2e66765b34a4;hpb=c88cb7a75e7caf1d67466cfa107981d95115fa0c;p=bookmarks_db.git

diff --git a/db2bkmk.py b/db2bkmk.py
index e0ac1c1..7d1d9aa 100755
--- a/db2bkmk.py
+++ b/db2bkmk.py
@@ -1,11 +1,12 @@
-#! /usr/bin/env python
-"""Convert a bkmk database back to bookmarks.html (or other format defined by writer)
+#! /usr/bin/env python3
+"""Convert a bkmk database back to bookmarks.html
+(or other format defined by writer)
 
 This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 import sys
@@ -22,7 +23,7 @@ def run():
     output_filename = writer.filename
 
     transl = 0
-    transl_name = "" # dictionary translation; default is no translation
+    transl_name = ""  # dictionary translation; default is no translation
 
     for _opt, _arg in optlist:
         if _opt == '-s':
@@ -43,7 +44,8 @@ def run():
 
     if args:
         sys.stderr.write("db2bkmk: too many arguments\n")
-        sys.stderr.write("Usage: db2bkmk [-s] [-p prune_folder] [-o filename] [-t trans] [-r]\n")
+        sys.stderr.write("Usage: db2bkmk [-s] [-p prune_folder]"
+                         " [-o filename] [-t trans] [-r]\n")
         sys.exit(1)
 
     from storage import storage
@@ -60,14 +62,13 @@ def run():
         sys.stdout.write("Writing %s: " % output_filename)
         sys.stdout.flush()
 
-
     if transl:
-        new_ext = str(transl)
         transl_d = {}
 
         from m_lib.flad import fladm
-        transl_db = fladm.load_from_file(transl_name, fladm.check_record, ["URL1", "URL2"], [""])
-                                        # This prevents any other key to appear in transl_db ^
+        transl_db = fladm.load_from_file(
+            transl_name, fladm.check_record, ["URL1", "URL2"], [""])
+        #    This prevents any other key to appear in transl_db ^
 
         # Generate translation dictionary (hash table)
         if transl == 1:
@@ -79,24 +80,24 @@ def run():
         else:
             raise ValueError("transl (%d) must be 1 or 2" % transl)
 
-        del transl_db # Save few bytes of memory
+        del transl_db  # Save few bytes of memory
 
         from bkmk_objects import Walker
+
         class Transl(Walker):
-            def __init__(self, transl_d):
+            def __init__(self, transl_d):  # noqa: E306 expected 1 blank line
                 self.transl_d = transl_d
 
             def bookmark(self, b, level):
                 href = b.href
                 transl_d = self.transl_d
 
-                if transl_d.has_key(href):
+                if href in transl_d:
                     b.href = transl_d[href]
 
         root_folder.walk_depth(Transl(transl_d))
 
-
-    outfile = open(output_filename, 'w')
+    outfile = open(output_filename, 'wt', encoding='utf-8')
     root_folder.walk_depth(writer(outfile, prune))
     outfile.close()