Version 4.3.0 (2011-01-01).

[bookmarks_db.git] / Writers / bkmk_wflad.py

diff --git a/Writers/bkmk_wflad.py b/Writers/bkmk_wflad.py
index 0ba70751cfa7693c26f5b965f4f2ef4dbfa9d40f..0a94fd8e93652d9727ddc270dcaf787093fad591 100644 (file)
--- 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
+   Dump bookmarks db to a more readable FLat Ascii Database
 
-   Written by BroytMann, Apr 2000 - Sep 2007. Copyright (C) 2000-2007 PhiloSoft Design
+   Written by Broytman. Copyright (C) 2000-2010 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
 
 
@@ -48,7 +48,7 @@ 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"),
-            ("icon", "Icon"), ("charset", "Charset")):
+            ("icon_href", "IconURI"), ("icon", "Icon"), ("charset", "Charset")):
          if hasattr(b, attr_name):
             self.outfile.write("\n%s: %s" % (attr_out, getattr(b, attr_name)))