X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=db2bkmk.py;h=7d1d9aa19f1c46fdebd47e45f859ab7a7c7e2ba7;hb=8e4df3830e6f68b691cb833415d30ab5d37338c9;hp=897aabcafa922ee64a7c22f3aa92571d544c9a6d;hpb=b2b302b348f0b711557961c70744c818cff664f0;p=bookmarks_db.git

diff --git a/db2bkmk.py b/db2bkmk.py
index 897aabc..7d1d9aa 100755
--- a/db2bkmk.py
+++ b/db2bkmk.py
@@ -1,5 +1,6 @@
-#! /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.
 """
@@ -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
@@ -61,12 +63,12 @@ def run():
         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:
@@ -90,12 +92,12 @@ def run():
                 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()