X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Writers%2Fbkmk_wflad.py;h=ace4e735d20946d00cdb145a6cfb72d2b4f70a67;hb=e7035a2a59f6a2cb55aa7ca852e2cff3b66b59d9;hp=2d261586058796e2a3a160b1859731a179036d02;hpb=bcf579e3311f0d9f968338dc419e9a43b48414ba;p=bookmarks_db.git

diff --git a/Writers/bkmk_wflad.py b/Writers/bkmk_wflad.py
index 2d26158..ace4e73 100644
--- a/Writers/bkmk_wflad.py
+++ b/Writers/bkmk_wflad.py
@@ -1,7 +1,7 @@
 """
    Dump bookmarks db to a more readable FLAD after check_urls
 
-   Written by BroytMann, Apr 2000 - Aug 2004. Copyright (C) 2000-2004 PhiloSoft Design
+   Written by BroytMann. Copyright (C) 2000-2007 PhiloSoft Design.
 """
 
 
@@ -12,7 +12,7 @@ from bkmk_objects import Writer
 def strftime(s):
    try:
       return time.strftime("%a %d %b %Y %T", time.localtime(int(s)))
-   except ValueError: # s is already formatted
+   except (TypeError, ValueError): # s is None or is already formatted
       return s
 
 
@@ -47,7 +47,8 @@ Comment: %s""" % (level+1, b.name, b.href, strftime(b.add_date), strftime(b.last
 
       for attr_name, attr_out in (("error", "Error"), ("no_error", "NoError"),
             ("moved", "Moved"), ("size", "Size"), ("md5", "Md5"),
-            ("real_title", "RealTitle"), ("test_time", "TestTime")):
+            ("real_title", "RealTitle"), ("test_time", "TestTime"),
+            ("icon", "Icon"), ("charset", "Charset")):
          if hasattr(b, attr_name):
             self.outfile.write("\n%s: %s" % (attr_out, getattr(b, attr_name)))