Fix(Py3): Stop encoding unicode to bytes

[bookmarks_db.git] / Writers / bkmk_wflad.py

diff --git a/Writers/bkmk_wflad.py b/Writers/bkmk_wflad.py
index ad84a53ac0566054b0e2036495badf9bd42f8ae3..cae46bb44554c1e79a54a32bd1d1ac72e80ab307 100644 (file)
--- a/Writers/bkmk_wflad.py
+++ b/Writers/bkmk_wflad.py
@@ -12,12 +12,13 @@ __all__ = ['writer_flad']
 
 import time
 from bkmk_objects import Writer
+from compat import unicode
 
 
 def strftime(s):
     try:
         return time.strftime("%a %d %b %Y %T", time.localtime(int(s)))
-    except (TypeError, ValueError): # s is None or is already formatted
+    except (TypeError, ValueError):  # s is None or is already formatted
         return s
 
 
@@ -35,7 +36,10 @@ Folder: %s
 AddDate: %s
 Comment: %s
 LastModified: %s
-""" % (level, f.name, strftime(f.add_date), f.comment, strftime(f.last_modified)))
+""" % (
+            level, f.name, strftime(f.add_date), f.comment,
+            strftime(f.last_modified))
+        )
 
     def bookmark(self, b, level):
         self.outfile.write("""
@@ -46,7 +50,11 @@ AddDate: %s
 LastVisit: %s
 LastModified: %s
 Keyword: %s
-Comment: %s""" % (level+1, b.name, b.href, strftime(b.add_date), strftime(b.last_visit), strftime(b.last_modified), b.keyword, b.comment))
+Comment: %s""" % (
+            level+1, b.name, b.href, strftime(b.add_date),
+            strftime(b.last_visit), strftime(b.last_modified),
+            b.keyword, b.comment)
+        )
 
         for attr_name, attr_out in (
             ("error", "Error"), ("no_error", "NoError"),
@@ -56,12 +64,12 @@ Comment: %s""" % (level+1, b.name, b.href, strftime(b.add_date), strftime(b.last
         ):
             if hasattr(b, attr_name):
                 value = getattr(b, attr_name)
-                if isinstance(value, unicode):
-                    value = value.encode('utf-8')
+                #if isinstance(value, unicode):
+                #    value = value.encode('utf-8')
                 self.outfile.write("\n%s: %s" % (attr_out, value))
 
         if hasattr(b, "last_tested"):
-            self.outfile.write("\n%s: %s" % ("LastTested", strftime(getattr(b, "last_tested"))))
+            self.outfile.write("\nLastTested: %s" % strftime(b.last_tested))
 
         self.outfile.write("\n")