X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Storage%2Fbkmk_stflad.py;h=81a4e6dc38e025c36ab2981737504efdeac42311;hb=64b2e0c0275c1487574614bbfb0ca1ef50fae1df;hp=7f417b0b778aa953c8de1b8530b47b1edc7abe71;hpb=aaa16e28a73fcc01ff9fa5709c72970bb50629d7;p=bookmarks_db.git

diff --git a/Storage/bkmk_stflad.py b/Storage/bkmk_stflad.py
index 7f417b0..81a4e6d 100644
--- a/Storage/bkmk_stflad.py
+++ b/Storage/bkmk_stflad.py
@@ -12,7 +12,6 @@ __license__ = "GNU GPL"
 __all__ = ['storage_flad']
 
 
-import string
 from m_lib.flad import fladm
 from bkmk_objects import Folder, Bookmark, Ruler, Walker
 
@@ -24,9 +23,9 @@ class storage_flad(Walker):
         self.first_object = 1
 
     def root_folder(self, f):
-        header = string.replace(f.header, ".", ".\n")
-        header = string.replace(header, "<", "\n<", 3)[1:]
-        header_file = open("header", 'w')
+        header = f.header.replace(".", ".\n")
+        header = header.replace("<", "\n<", 3)[1:]
+        header_file = open("header", 'wt', encoding='utf-8')
         header_file.write(header + "\n")
         header_file.write('<H1>%s</H1>\n\n' % f.name)
         if f.comment: header_file.write('<DD>%s\n' % f.comment)
@@ -62,7 +61,7 @@ Charset: %s
         self.outfile.write("\nLevel: %s\nRuler: YES\n" % (level+1))
 
     def store(self, root_folder):
-        self.outfile = open(self.filename, 'w')
+        self.outfile = open(self.filename, 'wt', encoding='utf-8')
         root_folder.walk_depth(self)
         self.outfile.close()
 
@@ -84,14 +83,14 @@ Charset: %s
         self.folder_stack = [root_folder]
         self.current_folder = root_folder
 
-        header_file = open("header", 'r')
+        header_file = open("header", 'rt', encoding='utf-8')
         header = header_file.read()
         header_file.close()
 
-        header = string.split(header, "\n")
-        root_folder.header = string.join(header[:5], '')
-        root_folder.name = header[5][4:-5]
-        root_folder.comment = string.join(header[7:], '')[4:]
+        header = header.split("\n")
+        root_folder.header = ''.join(header[:5])
+        root_folder.name = ''.join(header[5:6])[4:-5]
+        root_folder.comment = ''.join(header[7:])[4:]
 
         save_level = 0
         got_folder = 1  # Start as if we already have one folder