Chore: Explicitly open text files in text mode

[bookmarks_db.git] / Storage / bkmk_stflad.py

diff --git a/Storage/bkmk_stflad.py b/Storage/bkmk_stflad.py
index 7f417b0b778aa953c8de1b8530b47b1edc7abe71..7a29b83cd1c76b5f03faefa2decb0897a06d6efb 100644 (file)
--- 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')
         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')
         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')
         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