From: Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spam@spamtrap.com>
Date: Sat, 3 Mar 2012 15:59:43 +0000 (-0500)
Subject: Fix `be import_xml` bugs.
X-Git-Tag: 1.1.0~150
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=187bface721aec16800e612cc292c1fec4ee966b;p=be.git

Fix `be import_xml` bugs.
---

diff --git a/libbe/bug.py b/libbe/bug.py
index 3b9be59..f562836 100644
--- a/libbe/bug.py
+++ b/libbe/bug.py
@@ -410,8 +410,9 @@ class Bug (settings_object.SavedSettingsObject):
                     uuid = text
                     continue # don't set the bug's uuid tag.
                 elif child.tag == 'created':
-                    self.time = utility.str_to_time(text)
-                    self.explicit_attrs.append('time')
+                    if text is not settings_object.EMPTY:
+                        self.time = utility.str_to_time(text)
+                        self.explicit_attrs.append('time')
                     continue
                 elif child.tag == 'extra-string':
                     estrs.append(text)
diff --git a/libbe/comment.py b/libbe/comment.py
index 082a46f..cfb951d 100644
--- a/libbe/comment.py
+++ b/libbe/comment.py
@@ -377,7 +377,10 @@ class Comment (Tree, settings_object.SavedSettingsObject):
                     text = settings_object.EMPTY
                 else:
                     text = xml.sax.saxutils.unescape(child.text)
-                    text = text.decode('unicode_escape').strip()
+                    # Sometimes saxutils returns unicode
+                    if not isinstance(text, unicode):
+                        text = text.decode('unicode_escape')
+                    text = text.strip()
                 if child.tag == 'uuid' and not preserve_uuids:
                     uuid = text
                     continue # don't set the comment's uuid tag.