X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=Storage%2Fbkmk_stjson.py;h=077f89cfa6cceb1e7575cde3f2d5a154759dca8c;hb=742ce372d408094cf0e5cc6b0a11c93afda3e08b;hp=1194aed0743167fc796724fbab3784d001fb7f29;hpb=3de6c8f6da84fdc757f3b4a3355ed502c4a75318;p=bookmarks_db.git

diff --git a/Storage/bkmk_stjson.py b/Storage/bkmk_stjson.py
index 1194aed..077f89c 100644
--- a/Storage/bkmk_stjson.py
+++ b/Storage/bkmk_stjson.py
@@ -108,6 +108,7 @@ class storage_json(Walker):
         # Work around a bug in Mozilla - remove the trailing comma
         bkmk_s = bkmk_s.strip().replace(',]', ']')
         bookmarks_dict = json.loads(bkmk_s)
+        del bkmk_s
 
         root_folder = Folder()
         root_folder.header = ''
@@ -125,7 +126,7 @@ class storage_json(Walker):
 
     def load_folder(self, folder, fdict):
         if fdict["type"] != "text/x-moz-place-container":
-            raise ValueError("Root object is not a Mozilla container")
+            raise ValueError("The object is not a Mozilla container")
 
         folder.id = fdict["id"]
         folder.index = fdict.get("index")
@@ -183,14 +184,14 @@ def encode(title):
 
 def get_comment(annos):
     if not annos:
-        return None
+        return ''
 
     for a in annos:
         if a["name"] == "bookmarkProperties/description" and \
                 a["type"] == 3:
             return a["value"].encode('utf-8')
 
-    return None
+    return ''
 
 def make_annos(value, name="bookmarkProperties/description"):
     return [{